From be3b0fe92ccf37a26e1d45a9fc66d9af582de7df Mon Sep 17 00:00:00 2001 From: beville Date: Mon, 21 Jan 2013 01:45:51 +0000 Subject: [PATCH] Tweaked the comictagger note text Fixed a transformer bug git-svn-id: http://comictagger.googlecode.com/svn/trunk@319 6c5673fe-1810-88d6-992b-cd32ca31540c --- cbltransformer.py | 18 ++++++++++++++---- comicvinetalker.py | 7 ++++++- 2 files changed, 20 insertions(+), 5 deletions(-) diff --git a/cbltransformer.py b/cbltransformer.py index ac54698..ad7c601 100644 --- a/cbltransformer.py +++ b/cbltransformer.py @@ -76,12 +76,22 @@ class CBLTransformer: add_string_list_to_tags( self.metadata.locations ) if self.settings.copy_notes_to_comments: - if self.metadata.notes is not None and self.metadata.notes not in self.metadata.comments: - self.metadata.comments += "\n\n" + self.metadata.notes + if self.metadata.notes is not None: + if self.metadata.comments is None: + self.metadata.comments = "" + else: + self.metadata.comments += "\n\n" + if self.metadata.notes not in self.metadata.comments: + self.metadata.comments += self.metadata.notes if self.settings.copy_weblink_to_comments: - if self.metadata.webLink is not None and self.metadata.webLink not in self.metadata.comments: - self.metadata.comments += "\n\n" + self.metadata.webLink + if self.metadata.webLink is not None: + if self.metadata.comments is None: + self.metadata.comments = "" + else: + self.metadata.comments += "\n\n" + if self.metadata.webLink not in self.metadata.comments: + self.metadata.comments += self.metadata.webLink return self.metadata diff --git a/comicvinetalker.py b/comicvinetalker.py index 2fbec7b..07890c7 100644 --- a/comicvinetalker.py +++ b/comicvinetalker.py @@ -24,6 +24,8 @@ from pprint import pprint import urllib2, urllib import math import re +import datetime +import ctversion try: from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest @@ -243,7 +245,10 @@ class ComicVineTalker(QObject): if settings.use_series_start_as_volume: metadata.volume = volume_results['start_year'] - metadata.notes = "Tagged with ComicTagger app using info from Comic Vine." + metadata.notes = "Tagged with ComicTagger {0} using info from Comic Vine on {1}. [Issue ID {2}]".format( + ctversion.version, + datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"), + issue_results['id']) #metadata.notes += issue_results['site_detail_url'] metadata.webLink = issue_results['site_detail_url']