From 76e6666a79820e0450dd2ff0eabbe7eb6263c8a7 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Sat, 30 Mar 2013 16:31:56 +0000 Subject: [PATCH] Tweaks for dealing with unicode issue "number" Updated release_notes git-svn-id: http://comictagger.googlecode.com/svn/trunk@563 6c5673fe-1810-88d6-992b-cd32ca31540c --- comictaggerlib/comicvinetalker.py | 7 +++---- comictaggerlib/issueidentifier.py | 4 ++-- comictaggerlib/taggerwindow.py | 2 +- release_notes.txt | 6 ++++++ todo.txt | 9 +++++++++ 5 files changed, 21 insertions(+), 7 deletions(-) diff --git a/comictaggerlib/comicvinetalker.py b/comictaggerlib/comicvinetalker.py index 27139a2..ad334e9 100644 --- a/comictaggerlib/comicvinetalker.py +++ b/comictaggerlib/comicvinetalker.py @@ -258,7 +258,7 @@ class ComicVineTalker(QObject): found = False for record in issues_list_results: - if IssueString(issue_number).asFloat() is None: + if IssueString(issue_number).asString() is None: issue_number = 1 if IssueString(record['issue_number']).asString().lower() == IssueString(issue_number).asString().lower(): found = True @@ -306,7 +306,6 @@ class ComicVineTalker(QObject): metadata.series = issue_results['volume']['name'] num_s = IssueString(issue_results['issue_number']).asString() - metadata.issue = num_s metadata.title = issue_results['name'] @@ -374,6 +373,8 @@ class ComicVineTalker(QObject): def cleanup_html( self, string): + if string is None: + return "" # remove all newlines first string = string.replace("\n", "") @@ -391,8 +392,6 @@ class ComicVineTalker(QObject): newstring = newstring.replace('&','&') newstring = newstring.strip() - - return newstring def fetchIssueDate( self, issue_id ): diff --git a/comictaggerlib/issueidentifier.py b/comictaggerlib/issueidentifier.py index 9de70a5..18f8746 100644 --- a/comictaggerlib/issueidentifier.py +++ b/comictaggerlib/issueidentifier.py @@ -463,9 +463,9 @@ class IssueIdentifier: shortlist.append( (series, cv_series_results, issue) ) if keys['year'] is None: - self.log_msg( "Found {0} series that have an issue #{1}".format(len(shortlist), keys['issue_number']) ) + self.log_msg( u"Found {0} series that have an issue #{1}".format(len(shortlist), keys['issue_number']) ) else: - self.log_msg( "Found {0} series that have an issue #{1} from {2}".format(len(shortlist), keys['issue_number'], keys['year'] )) + self.log_msg( u"Found {0} series that have an issue #{1} from {2}".format(len(shortlist), keys['issue_number'], keys['year'] )) # now we have a shortlist of volumes with the desired issue number diff --git a/comictaggerlib/taggerwindow.py b/comictaggerlib/taggerwindow.py index 839254f..2ae59a2 100644 --- a/comictaggerlib/taggerwindow.py +++ b/comictaggerlib/taggerwindow.py @@ -897,7 +897,7 @@ class TaggerWindow( QtGui.QMainWindow): def queryOnline(self, autoselect=False): - issue_number = str(self.leIssueNum.text()).strip() + issue_number = unicode(self.leIssueNum.text()).strip() if autoselect and issue_number == "": QtGui.QMessageBox.information(self,"Automatic Identify Search", "Can't auto-identify without an issue number (yet!)") diff --git a/release_notes.txt b/release_notes.txt index 62495ee..118b53a 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,3 +1,9 @@ +--------------------------------- +1.1.5-beta - 30-Mar-2013 +--------------------------------- + * More updates for handling changes to ComicVine API and result sets + * Even better handling of non-numeric issue "numbers" ("½", "X") + --------------------------------- 1.1.4-beta - 27-Mar-2013 --------------------------------- diff --git a/todo.txt b/todo.txt index 8a7cf61..7953a7e 100644 --- a/todo.txt +++ b/todo.txt @@ -9,10 +9,19 @@ Docs: Auto-Tagging Tips: Multiple Passes with different options +Feature Requests: + Remember last sorted column in file list + Re-zip (to remove compression) + Move CBR to other folder after conversion to ZIP + AUto-rename on auto-tag + ----------------------------------------------------- Bugs ----------------------------------------------------- +Non-numeric issues?? Filename parsing... can we only rely on '#'?? +Unicode search on mac doesn't work + Zip flakes out when filename differs from index (or whatever) i.e "\" vs "/". Python issue -----------------------------------------------------