From a4649e5e31cd5da2421b6d6184da53adbd7c8d23 Mon Sep 17 00:00:00 2001 From: GRiker Date: Tue, 30 Nov 2010 15:42:40 -0700 Subject: [PATCH] GwR fixes for read tag code --- src/calibre/gui2/catalog/catalog_epub_mobi.py | 1 - src/calibre/library/catalog.py | 10 +--------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/src/calibre/gui2/catalog/catalog_epub_mobi.py b/src/calibre/gui2/catalog/catalog_epub_mobi.py index 7ac6010896..4a330900b1 100644 --- a/src/calibre/gui2/catalog/catalog_epub_mobi.py +++ b/src/calibre/gui2/catalog/catalog_epub_mobi.py @@ -82,7 +82,6 @@ class PluginWidget(QWidget,Ui_Form): elif opt[0] in ['read_source_field_cb']: # Look for last-stored combo box value index = self.read_source_field_cb.findText(opt_value) - print "last index: %d" % index if index == -1: index = self.read_source_field_cb.findText('Tag') self.read_source_field_cb.setCurrentIndex(index) diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py index b7dbd3c35f..631e635937 100644 --- a/src/calibre/library/catalog.py +++ b/src/calibre/library/catalog.py @@ -2676,14 +2676,7 @@ class EPUB_MOBI(CatalogPlugin): pBookTag = Tag(soup, "p") ptc = 0 - # THIS SHOULDN'T BE NECESSARY - # book with read/reading/unread symbol -# for tag in book['tags']: -# if tag == self.opts.read_tag: -# book['read'] = True -# break -# else: -# book['read'] = False + book['read'] = self.discoverReadStatus(book) # book with read|reading|unread symbol or wishlist item if self.opts.wishlist_tag in book.get('tags', []): @@ -4552,7 +4545,6 @@ class EPUB_MOBI(CatalogPlugin): markerTags = [] markerTags.extend(self.opts.exclude_tags.split(',')) markerTags.extend(self.opts.note_tag.split(',')) - markerTags.extend(self.opts.read_tag.split(',')) return markerTags def letter_or_symbol(self,char):