From d9dbab301a8ab7b1266ec615cf1df189f249fd6b Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Fri, 18 Apr 2014 15:42:05 +0000 Subject: [PATCH] prep for release git-svn-id: http://comictagger.googlecode.com/svn/trunk@727 6c5673fe-1810-88d6-992b-cd32ca31540c --- Makefile | 2 +- comictaggerlib/ctversion.py | 2 +- comictaggerlib/fileselectionlist.py | 7 +- comictaggerlib/optionalmsgdialog.py | 2 +- comictaggerlib/taggerwindow.py | 53 +++- release_notes.txt | 405 ++++++++++++++-------------- requirements.txt | 1 - 7 files changed, 258 insertions(+), 214 deletions(-) diff --git a/Makefile b/Makefile index 5312a7c..a394055 100644 --- a/Makefile +++ b/Makefile @@ -52,7 +52,7 @@ upload: #$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR) Source" -l Featured,Type-Source -u beville -w $(PASSWORD) "release/comictagger-$(VERSION_STR).zip" #$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR) Mac OS X" -l Featured,Type-Archive -u beville -w $(PASSWORD) "release/ComicTagger-$(VERSION_STR).dmg" #$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR) Windows" -l Featured,Type-Installer -u beville -w $(PASSWORD) "release/ComicTagger v$(VERSION_STR).exe" - #python setup.py register + python setup.py register python setup.py sdist --formats=zip upload svn_tag: diff --git a/comictaggerlib/ctversion.py b/comictaggerlib/ctversion.py index 7acad7b..a0b2511 100644 --- a/comictaggerlib/ctversion.py +++ b/comictaggerlib/ctversion.py @@ -1,3 +1,3 @@ # This file should contan only these comments, and the line below. # Used by packaging makefiles and app -version="1.1.13-beta" +version="1.1.14-beta" diff --git a/comictaggerlib/fileselectionlist.py b/comictaggerlib/fileselectionlist.py index 5c35aaf..813d25c 100644 --- a/comictaggerlib/fileselectionlist.py +++ b/comictaggerlib/fileselectionlist.py @@ -198,13 +198,16 @@ class FileSelectionList(QWidget): firstAdded = row progdialog.close() - if self.settings.show_no_unrar_warning and self.settings.unrar_exe_path == "" and platform.system() != "Windows": + if ( self.settings.show_no_unrar_warning and + self.settings.unrar_exe_path == "" and + self.settings.rar_exe_path == "" and + platform.system() != "Windows"): for f in filelist: ext = os.path.splitext(f)[1].lower() if ext == ".rar" or ext ==".cbr": checked = OptionalMessageDialog.msg( self, "No unrar tool", """ - It looks like you've tried to load at least one CBR or RAR file.

+ It looks like you've tried to open at least one CBR or RAR file.

In order for ComicTagger to read this kind of file, you will have to configure the location of the unrar tool in the settings. Until then, ComicTagger will not be able recognize these kind of files. diff --git a/comictaggerlib/optionalmsgdialog.py b/comictaggerlib/optionalmsgdialog.py index 7e4a388..8d0f0d3 100644 --- a/comictaggerlib/optionalmsgdialog.py +++ b/comictaggerlib/optionalmsgdialog.py @@ -60,7 +60,7 @@ class OptionalMessageDialog(QDialog): if style == StyleQuestion: check_text = "Remember this answer" else: - check_text = "Don't show this dialog again" + check_text = "Don't show this message again" self.theCheckBox = QCheckBox(check_text) diff --git a/comictaggerlib/taggerwindow.py b/comictaggerlib/taggerwindow.py index 00dfecc..4680b3d 100644 --- a/comictaggerlib/taggerwindow.py +++ b/comictaggerlib/taggerwindow.py @@ -1923,12 +1923,47 @@ class TaggerWindow( QtGui.QMainWindow): # read in the file list if they're giving it, # and add to our own list localSocket = self.socketServer.nextPendingConnection() - if not localSocket.waitForReadyRead(3000): - print localSocket.errorString().toLatin1() - return - byteArray = localSocket.readAll() - if len(byteArray) > 0: - obj = pickle.loads(byteArray) - localSocket.disconnectFromServer() - if type(obj) is list: - self.fileSelectionList.addPathList( obj ) + if localSocket.waitForReadyRead(3000): + byteArray = localSocket.readAll() + if len(byteArray) > 0: + obj = pickle.loads(byteArray) + localSocket.disconnectFromServer() + if type(obj) is list: + self.fileSelectionList.addPathList( obj ) + else: + #print localSocket.errorString().toLatin1() + pass + + self.bringToTop() + + def bringToTop(self): + if platform.system() == "Windows": + self.showNormal() + self.raise_() + self.activateWindow() + try: + import win32con + import win32gui + hwnd = self.effectiveWinId() + rect = win32gui.GetWindowRect(hwnd) + x = rect[0] + y = rect[1] + w = rect[2] - x + h = rect[3] - y + # mark it "always on top", just for a moment, to force it to the top + win32gui.SetWindowPos(hwnd,win32con.HWND_TOPMOST, x, y, w, h, 0) + win32gui.SetWindowPos(hwnd,win32con.HWND_NOTOPMOST, x, y, w, h, 0) + except Exception as e: + print "Whoops", e + elif platform.system() == "Darwin": + self.raise_() + self.showNormal() + self.activateWindow() + else: + flags = self.windowFlags() + self.setWindowFlags( flags | QtCore.Qt.WindowStaysOnTopHint | QtCore.Qt.X11BypassWindowManagerHint) + QtCore.QCoreApplication.processEvents() + #self.show() + self.setWindowFlags( flags ) + self.show() + \ No newline at end of file diff --git a/release_notes.txt b/release_notes.txt index 0655976..013a0b9 100644 --- a/release_notes.txt +++ b/release_notes.txt @@ -1,202 +1,209 @@ ---------------------------------- -1.1.13-beta - 9-Apr-2014 ---------------------------------- - * Handle non-ascii usernames properly - * better parsing of html table in summary text, and optional removal - * Python package should auto-install requirements - * Specify default GUI tag style on command-line +--------------------------------- +1.1.14-beta - 13-Apr-2014 +--------------------------------- + * Make sure app gets raised when enforcing single instance + * Added warning dialog for when opening rar files, and no (un)rar tool + * remove pil from python package requirements + +--------------------------------- +1.1.13-beta - 9-Apr-2014 +--------------------------------- + * Handle non-ascii usernames properly + * better parsing of html table in summary text, and optional removal + * Python package should auto-install requirements + * Specify default GUI tag style on command-line * enforce single GUI instance * new CBL tranform to copy story arcs to generic tags * Persist some auto-tag settings - ---------------------------------- -1.1.12-beta - 23-Mar-2014 ---------------------------------- - * Fixed noisy version update error - ---------------------------------- -1.1.11-beta - 23-Mar-2014 ---------------------------------- - * Updated unrar library to hand Rar tools 5.0 and greater - * Other misc bug fixes - ---------------------------------- -1.1.10-beta - 30-Jan-2014 ---------------------------------- - * Updated series query to match changes on Comic Vine side - * Added a message when not able to open a file or folder - * Fixed an issue where series names with periods would fail on search - * Other misc bug fixes - ---------------------------------- -1.1.9-beta - 8-May-2013 ---------------------------------- - * Filename parser and identification enhancements - * Misc bug fixes - ---------------------------------- -1.1.8-beta - 21-Apr-2013 ---------------------------------- - * Handle occasional error 500 from Comic Vine by retrying a few times - * Nicer handling of colon (":") in file rename - * Fixed command-line option parsing issue for add-on scripts - * Misc bug fixes - ---------------------------------- -1.1.7-beta - 12-Apr-2013 ---------------------------------- - * Added description and cover date to issue selection dialogs - * Added notification of new version - * Added setting to attempt to parse scan info from file name - * Last sorted column in the file list is now remembered - * Added CLI option ('-1') to assume issue #1 if not found/parsed - * Misc bug fixes - ---------------------------------- -1.1.6-beta - 3-Apr-2013 ---------------------------------- - * More ComicVine API-related fixes - * More efficient automated search using new CV API issue filters - * Minor bug fixes - ---------------------------------- -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 ---------------------------------- - * Updated to match the changes to the ComicVine API and result sets - * Better handling of weird issue numbers ("0.1", "6au") - ---------------------------------- -1.1.3-beta - 25-Feb-2013 ---------------------------------- -Bug Fixes: - * Fixed a bug when renaming on non-English systems - * Fixed issue when saving settings on non-English systems - * Fixed a bug when comic contains non-RGB images - * Fixed a rare crash when comic image is not-RGB format - * Fixed sequence order of ComicInfo.xml items - -Note: - New requirement for users of the python package: "configparser" - ---------------------------------- -1.1.2-beta - 14-Feb-2013 ---------------------------------- -Changes: - * Source is now packaged using Python distutils - * Recursive mode for CLI - * Run custom add-on scripts from CLI - * Minor UI tweaks - * Misc bug fixes - ---------------------------------- -1.1.0-beta - 06-Feb-2013 ---------------------------------- -Changes: - * Enhanced identification process to use alternative covers from ComicVine - * Post auto-tag manual matching now includes single low-confidence matches (CLI & GUI) - * Page and cover view mini-browser available throughout app. Most images can be - double-clicked for embiggened view - * Export-to-zip in CLI (very handy in scripts!) - * More rename template variables - * Misc GUI & CLI Tweaks - ---------------------------------- -1.0.3-beta - 31-Jan-2013 ---------------------------------- -Changes: - Misc bug fixes and enhancements - ---------------------------------- -1.0.2-beta - 25-Jan-2013 ---------------------------------- -Changes: - More verbose logging during auto-tag - Added %month% and %month_name% for renaming - Better parsing of volume numbers in file name -Bugs: - Better exception handling with corrupted image data - Fixed issues with RAR reading on OS X - Other minor bug fixes - ---------------------------------- -1.0.1-beta - 24-Jan-2013 ---------------------------------- -Bug Fix: - Fixed an issue where unicode strings can't be printed to OS X Console - ---------------------------------- -1.0.0-beta - 23-Jan-2013 ---------------------------------- -Version 1! New multi-file processing in GUI! - -GUI Changes: - Open multiple files and/or folders via drag/drop or file dialog - File management list for easy viewing and selection - Batch tag remove - Batch export as zip - Batch rename - Batch tag copy - Batch auto-tag (automatic identification and save!) - ---------------------------------- -0.9.5-beta - 16-Jan-2013 ---------------------------------- -Changes: - Added CLI option to search by comicvine issue ID - Some image loading optimizations - Bug Fix: Some CBL fields that should have been ints were written as strings - ---------------------------------- -0.9.4-beta - 7-Jan-2013 ---------------------------------- -Changes: - Better handling of non-ascii characters in filenames and data - Add CBL Transform to copy Web Link and Notes to comments - Minor bug fixes - ---------------------------------- -0.9.3-beta - 19-Dec-2012 ---------------------------------- -Changes: - File rename in GUI - Setting for file rename - Option to use series start year as volume - Added "CBL Transform" to handle primary credits copying data into the generic tags field - Bug Fix: unicode characters in credits caused crash - Bug Fix: bad or non-image data in file caused crash - -Note: - The user should clear the cache and delete the existing settings when first running this version. - ---------------------------------- -0.9.2-beta - 13-Dec-2012 ---------------------------------- - Page List/Type editing in GUI - File globbing for windows CLI (i.e. use of wildcards like '*.cbz') - Fixed RAR writing bug on windows - Minor bug and crash fixes - ---------------------------------- -0.9.1-beta - 07-Dec-2012 ---------------------------------- - Export as ZIP Archive - Added help menu option for websites - Added Primary Credit Flag editing - Menu enhancements - CLI Enhancements: - Interactive selection of matches - Tag copy - Better output - CoMet support - Minor bug and crash fixes - ---------------------------------- -0.9.0-beta - 30-Nov-2012 ---------------------------------- -Initial beta release + +--------------------------------- +1.1.12-beta - 23-Mar-2014 +--------------------------------- + * Fixed noisy version update error + +--------------------------------- +1.1.11-beta - 23-Mar-2014 +--------------------------------- + * Updated unrar library to hand Rar tools 5.0 and greater + * Other misc bug fixes + +--------------------------------- +1.1.10-beta - 30-Jan-2014 +--------------------------------- + * Updated series query to match changes on Comic Vine side + * Added a message when not able to open a file or folder + * Fixed an issue where series names with periods would fail on search + * Other misc bug fixes + +--------------------------------- +1.1.9-beta - 8-May-2013 +--------------------------------- + * Filename parser and identification enhancements + * Misc bug fixes + +--------------------------------- +1.1.8-beta - 21-Apr-2013 +--------------------------------- + * Handle occasional error 500 from Comic Vine by retrying a few times + * Nicer handling of colon (":") in file rename + * Fixed command-line option parsing issue for add-on scripts + * Misc bug fixes + +--------------------------------- +1.1.7-beta - 12-Apr-2013 +--------------------------------- + * Added description and cover date to issue selection dialogs + * Added notification of new version + * Added setting to attempt to parse scan info from file name + * Last sorted column in the file list is now remembered + * Added CLI option ('-1') to assume issue #1 if not found/parsed + * Misc bug fixes + +--------------------------------- +1.1.6-beta - 3-Apr-2013 +--------------------------------- + * More ComicVine API-related fixes + * More efficient automated search using new CV API issue filters + * Minor bug fixes + +--------------------------------- +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 +--------------------------------- + * Updated to match the changes to the ComicVine API and result sets + * Better handling of weird issue numbers ("0.1", "6au") + +--------------------------------- +1.1.3-beta - 25-Feb-2013 +--------------------------------- +Bug Fixes: + * Fixed a bug when renaming on non-English systems + * Fixed issue when saving settings on non-English systems + * Fixed a bug when comic contains non-RGB images + * Fixed a rare crash when comic image is not-RGB format + * Fixed sequence order of ComicInfo.xml items + +Note: + New requirement for users of the python package: "configparser" + +--------------------------------- +1.1.2-beta - 14-Feb-2013 +--------------------------------- +Changes: + * Source is now packaged using Python distutils + * Recursive mode for CLI + * Run custom add-on scripts from CLI + * Minor UI tweaks + * Misc bug fixes + +--------------------------------- +1.1.0-beta - 06-Feb-2013 +--------------------------------- +Changes: + * Enhanced identification process to use alternative covers from ComicVine + * Post auto-tag manual matching now includes single low-confidence matches (CLI & GUI) + * Page and cover view mini-browser available throughout app. Most images can be + double-clicked for embiggened view + * Export-to-zip in CLI (very handy in scripts!) + * More rename template variables + * Misc GUI & CLI Tweaks + +--------------------------------- +1.0.3-beta - 31-Jan-2013 +--------------------------------- +Changes: + Misc bug fixes and enhancements + +--------------------------------- +1.0.2-beta - 25-Jan-2013 +--------------------------------- +Changes: + More verbose logging during auto-tag + Added %month% and %month_name% for renaming + Better parsing of volume numbers in file name +Bugs: + Better exception handling with corrupted image data + Fixed issues with RAR reading on OS X + Other minor bug fixes + +--------------------------------- +1.0.1-beta - 24-Jan-2013 +--------------------------------- +Bug Fix: + Fixed an issue where unicode strings can't be printed to OS X Console + +--------------------------------- +1.0.0-beta - 23-Jan-2013 +--------------------------------- +Version 1! New multi-file processing in GUI! + +GUI Changes: + Open multiple files and/or folders via drag/drop or file dialog + File management list for easy viewing and selection + Batch tag remove + Batch export as zip + Batch rename + Batch tag copy + Batch auto-tag (automatic identification and save!) + +--------------------------------- +0.9.5-beta - 16-Jan-2013 +--------------------------------- +Changes: + Added CLI option to search by comicvine issue ID + Some image loading optimizations + Bug Fix: Some CBL fields that should have been ints were written as strings + +--------------------------------- +0.9.4-beta - 7-Jan-2013 +--------------------------------- +Changes: + Better handling of non-ascii characters in filenames and data + Add CBL Transform to copy Web Link and Notes to comments + Minor bug fixes + +--------------------------------- +0.9.3-beta - 19-Dec-2012 +--------------------------------- +Changes: + File rename in GUI + Setting for file rename + Option to use series start year as volume + Added "CBL Transform" to handle primary credits copying data into the generic tags field + Bug Fix: unicode characters in credits caused crash + Bug Fix: bad or non-image data in file caused crash + +Note: + The user should clear the cache and delete the existing settings when first running this version. + +--------------------------------- +0.9.2-beta - 13-Dec-2012 +--------------------------------- + Page List/Type editing in GUI + File globbing for windows CLI (i.e. use of wildcards like '*.cbz') + Fixed RAR writing bug on windows + Minor bug and crash fixes + +--------------------------------- +0.9.1-beta - 07-Dec-2012 +--------------------------------- + Export as ZIP Archive + Added help menu option for websites + Added Primary Credit Flag editing + Menu enhancements + CLI Enhancements: + Interactive selection of matches + Tag copy + Better output + CoMet support + Minor bug and crash fixes + +--------------------------------- +0.9.0-beta - 30-Nov-2012 +--------------------------------- +Initial beta release diff --git a/requirements.txt b/requirements.txt index 3371cce..2d95f59 100644 --- a/requirements.txt +++ b/requirements.txt @@ -1,3 +1,2 @@ configparser beautifulsoup4 >= 4.1 -PIL >= 1.1.6