From 1dbbd470a0b3e92485c9f6da2c48f8e772ffaac3 Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 18 Feb 2010 10:15:09 -0700 Subject: [PATCH 1/3] GwR catalog comments --- src/calibre/library/catalog.py | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py index 2032785ae9..a5062de5db 100644 --- a/src/calibre/library/catalog.py +++ b/src/calibre/library/catalog.py @@ -3404,6 +3404,19 @@ class EPUB_MOBI(CatalogPlugin): tag_list.append(tag) return tag_list + def updateCatalogMetadata(self, comments): + ''' Store comments to library entry's comments metadata ''' + self.db.search('title:"%s" author:calibre' % self.title) + data = self.db.get_data_as_dict() + if data: + catalog_id = data[0]['id'] + cm = self.db.get_metadata(catalog_id, index_is_id=True) + cm.comments = comments + self.db.set_metadata(catalog_id, cm) + else: + self.opts.log(u"updateCatalogMetadata(): No library entry found for catalog '%s'" % self.title) + return + def updateProgressFullStep(self, description): self.currentStep += 1 self.progressString = description @@ -3516,6 +3529,9 @@ class EPUB_MOBI(CatalogPlugin): recommendations = [] # recommendations.append(('cover', I('catalog.svg'), OptionRecommendation.HIGH)) + recommendations.append(('comments', 'I added this comment in library.cli:run()', + OptionRecommendation.HIGH)) + dp = getattr(opts, 'debug_pipeline', None) if dp is not None: recommendations.append(('debug_pipeline', dp, @@ -3537,6 +3553,7 @@ class EPUB_MOBI(CatalogPlugin): plumber.merge_ui_recommendations(recommendations) plumber.run() + catalog.updateCatalogMetadata("I added this comment from library.catalog:run()") return 0 else: return 1 From 0df82cc222b666f160c933b3f5bdd4f2c6cd17ef Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 18 Feb 2010 16:08:12 -0700 Subject: [PATCH 2/3] GwR remove updateCatalogMetadata(), redundant --- src/calibre/library/catalog.py | 14 -------------- 1 file changed, 14 deletions(-) diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py index 8c27bf883b..7b6f6f92c1 100644 --- a/src/calibre/library/catalog.py +++ b/src/calibre/library/catalog.py @@ -3399,19 +3399,6 @@ class EPUB_MOBI(CatalogPlugin): tag_list.append(tag) return tag_list - def updateCatalogMetadata(self, comments): - ''' Store comments to library entry's comments metadata ''' - self.db.search('title:"%s" author:calibre' % self.title) - data = self.db.get_data_as_dict() - if data: - catalog_id = data[0]['id'] - cm = self.db.get_metadata(catalog_id, index_is_id=True) - cm.comments = comments - self.db.set_metadata(catalog_id, cm) - else: - self.opts.log(u"updateCatalogMetadata(): No library entry found for catalog '%s'" % self.title) - return - def updateProgressFullStep(self, description): self.currentStep += 1 self.progressString = description @@ -3549,7 +3536,6 @@ class EPUB_MOBI(CatalogPlugin): plumber.merge_ui_recommendations(recommendations) plumber.run() - catalog.updateCatalogMetadata('\n'.join(line for line in build_log)) return 0 else: return 1 From d0e4d394b8dd86d9f7be0397356b9b3f2a979491 Mon Sep 17 00:00:00 2001 From: GRiker Date: Thu, 18 Feb 2010 16:10:08 -0700 Subject: [PATCH 3/3] GwR remove updateCatalogMetadata(), redundant --- src/calibre/library/catalog.py | 1 - 1 file changed, 1 deletion(-) diff --git a/src/calibre/library/catalog.py b/src/calibre/library/catalog.py index 7b6f6f92c1..dc474b2a6f 100644 --- a/src/calibre/library/catalog.py +++ b/src/calibre/library/catalog.py @@ -3534,7 +3534,6 @@ class EPUB_MOBI(CatalogPlugin): opts.basename + '.opf'), path_to_output, log, report_progress=notification, abort_after_input_dump=False) plumber.merge_ui_recommendations(recommendations) - plumber.run() return 0 else: