From 469d0430e254199f6a40d947b729a8a6c576f6f7 Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 5 May 2011 08:33:57 -0600 Subject: [PATCH 1/2] GwR wip --- src/calibre/devices/apple/driver.py | 7 ++++--- src/calibre/library/catalog.py | 1 + 2 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/calibre/devices/apple/driver.py b/src/calibre/devices/apple/driver.py index 7c34e4912f..cd0bbe2ace 100644 --- a/src/calibre/devices/apple/driver.py +++ b/src/calibre/devices/apple/driver.py @@ -506,7 +506,7 @@ class ITUNES(DriverBase): if self.iTunes: # Check for connected book-capable device self.sources = self._get_sources() - if 'iPod' in self.sources: + if 'iPod' in self.sources and not self.ejected: #if DEBUG: #sys.stdout.write('.') #sys.stdout.flush() @@ -2036,16 +2036,17 @@ class ITUNES(DriverBase): if 'iPod' in self.sources: connected_device = self.sources['iPod'] device = self.iTunes.sources[connected_device] + dev_books = None for pl in device.playlists(): if pl.special_kind() == appscript.k.Books: if DEBUG: self.log.info(" Book playlist: '%s'" % (pl.name())) - books = pl.file_tracks() + dev_books = pl.file_tracks() break else: self.log.error(" book_playlist not found") - for book in books: + for book in dev_books: # This may need additional entries for international iTunes users if book.kind() in self.Audiobooks: if DEBUG: diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py index 717e8e2c6b..19382811c1 100644 --- a/src/calibre/library/catalog.py +++ b/src/calibre/library/catalog.py @@ -941,6 +941,7 @@ class EPUB_MOBI(CatalogPlugin): catalog.createDirectoryStructure() catalog.copyResources() catalog.buildSources() + Options managed in gui2.catalog.catalog_epub_mobi.py ''' # A single number creates 'Last x days' only. From 250e2a4a0659c4e8fa0068c7e32a7cb25a6985de Mon Sep 17 00:00:00 2001 From: Kovid Goyal Date: Fri, 6 May 2011 08:33:39 -0600 Subject: [PATCH 2/2] ... --- src/calibre/gui2/dialogs/edit_authors_dialog.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/calibre/gui2/dialogs/edit_authors_dialog.py b/src/calibre/gui2/dialogs/edit_authors_dialog.py index ea16a863e9..be0c5d484c 100644 --- a/src/calibre/gui2/dialogs/edit_authors_dialog.py +++ b/src/calibre/gui2/dialogs/edit_authors_dialog.py @@ -4,12 +4,12 @@ __docformat__ = 'restructuredtext en' __license__ = 'GPL v3' from PyQt4.Qt import (Qt, QDialog, QTableWidgetItem, QAbstractItemView, QIcon, - QString, QDialogButtonBox, QFrame, QLabel, QTimer) + QDialogButtonBox, QFrame, QLabel, QTimer) from calibre.ebooks.metadata import author_to_author_sort from calibre.gui2 import error_dialog from calibre.gui2.dialogs.edit_authors_dialog_ui import Ui_EditAuthorsDialog -from calibre.utils.icu import sort_key, strcmp +from calibre.utils.icu import sort_key class tableItem(QTableWidgetItem): def __ge__(self, other):