Cutlery/calibre
1
0
Fork 0
mirror of https://github.com/kovidgoyal/calibre.git synced 2025-07-09 03:04:10 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fix bugs in metadata fetching code

Browse Source
This commit is contained in:
Kovid Goyal 2007-10-25 17:23:00 +00:00
parent fbd0b6003e
commit ccbf4db926
2 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/libprs500/gui2/dialogs/fetch_metadata.py
View File

@ -16,6 +16,8 @@
GUI for fetching metadata from servers. GUI for fetching metadata from servers.
''' '''
import logging, cStringIO
from PyQt4.QtCore import Qt, QObject, SIGNAL, QSettings, QVariant, \ from PyQt4.QtCore import Qt, QObject, SIGNAL, QSettings, QVariant, \
QAbstractTableModel, QCoreApplication QAbstractTableModel, QCoreApplication
from PyQt4.QtGui import QDialog, QItemSelectionModel from PyQt4.QtGui import QDialog, QItemSelectionModel
@ -86,7 +88,7 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
self.tlabel.setText(self.tlabel.text().arg(title if title else 'Unknown')) self.tlabel.setText(self.tlabel.text().arg(title if title else 'Unknown'))
self.isbn = isbn self.isbn = isbn
self.title = title self.title = title
self.author = author self.author = author.strip()
self.publisher = publisher self.publisher = publisher
def fetch_metadata(self): def fetch_metadata(self):
@ -103,7 +105,7 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
args.extend(('--isbn', self.isbn)) args.extend(('--isbn', self.isbn))
if self.title: if self.title:
args.extend(('--title', self.title)) args.extend(('--title', self.title))
if self.author: if self.author and not self.author == 'Unknown':
args.extend(('--author', self.author)) args.extend(('--author', self.author))
#if self.publisher: #if self.publisher:
# args.extend(('--publisher', self.publisher)) # args.extend(('--publisher', self.publisher))
@ -116,7 +118,15 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
parser = option_parser() parser = option_parser()
opts, args = parser.parse_args(args) opts, args = parser.parse_args(args)
books = create_books(opts, args) self.logger = logging.getLogger('Job #'+str(id))
self.logger.setLevel(logging.DEBUG)
self.log_dest = cStringIO.StringIO()
handler = logging.StreamHandler(self.log_dest)
handler.setLevel(logging.DEBUG)
handler.setFormatter(logging.Formatter('[%(levelname)s] %(filename)s:%(lineno)s: %(message)s'))
self.logger.addHandler(handler)
books = create_books(opts, args, self.logger)
self.model = Matches(books) self.model = Matches(books)
@ -124,12 +134,15 @@ class FetchMetadata(QDialog, Ui_FetchMetadata):
self.model.reset() self.model.reset()
self.matches.selectionModel().select(self.model.index(0, 0), self.matches.selectionModel().select(self.model.index(0, 0),
QItemSelectionModel.Select | QItemSelectionModel.Rows) QItemSelectionModel.Select | QItemSelectionModel.Rows)
self.matches.setCurrentIndex(self.model.index(0, 0))
self.fetch.setEnabled(True) self.fetch.setEnabled(True)
self.unsetCursor() self.unsetCursor()
self.matches.resizeColumnsToContents()
def selected_book(self): def selected_book(self):
try: try:
print self.matches.currentIndex().row()
return self.matches.model().matches[self.matches.currentIndex().row()] return self.matches.model().matches[self.matches.currentIndex().row()]
except: except:
return None return None

4
src/libprs500/gui2/dialogs/metadata_single.py
View File

@ -219,8 +219,8 @@ class MetadataSingleDialog(QDialog, Ui_MetadataSingleDialog):
self.cover.setPixmap(pix) self.cover.setPixmap(pix)
self.cover_changed = True self.cover_changed = True
self.cpixmap = pix self.cpixmap = pix
except Exception, err: except Exception:
error_dialog(self, 'Could not fetch cover', 'Could not fetch cover. Error %s'%(err,)).exec_() error_dialog(self, 'Could not fetch cover', 'Could not fetch cover.').exec_()
finally: finally:
self.fetch_cover_button.setEnabled(True) self.fetch_cover_button.setEnabled(True)
self.unsetCursor() self.unsetCursor()