changed build checklist

git-svn-id: http://comictagger.googlecode.com/svn/trunk@688 6c5673fe-1810-88d6-992b-cd32ca31540c

Makefile

@@ -1,4 +1,4 @@
-TAGGER_BASE ?:= $(HOME)/Dropbox/tagger/comictagger
+TAGGER_BASE ?= $(HOME)/Dropbox/tagger/comictagger
 TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib
 VERSION_STR := $(shell grep version $(TAGGER_SRC)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
 PASSWORD    := $(shell cat $(TAGGER_BASE)/project_password.txt)  
@@ -49,9 +49,9 @@ remove_test_install:
 #		#-d 'python-qt4 >= 4.8' 
 		
 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"
+	#$(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
  
 svn_tag:

README.txt

@@ -1,4 +1,4 @@
-ComicTagger is a multi-platform app for writing metadata to comic archives, written in Python and PyQt.
+ComicTagger is a multi-platform app for writing metadata to digital comics, written in Python and PyQt.
 
 Features:
 

comictaggerlib/UnRAR2/__init__.py

@@ -33,7 +33,7 @@ similar to the C interface provided by UnRAR. There is also a
 higher level interface which makes some common operations easier.
 """
 
-__version__ = '0.99.2'
+__version__ = '0.99.3'
 
 try:
     WindowsError

comictaggerlib/UnRAR2/test_UnRAR2.py

@@ -12,13 +12,11 @@ def cleanup(dir='test'):
             os.removedirs(os.path.join(path, dir))
 
 
-
-
-
-# reuse RarArchive object, en
+# basic test
 cleanup()
 rarc = UnRAR2.RarFile('test.rar')
 rarc.infolist()
+assert rarc.comment == "This is a test."
 for info in rarc.infoiter():
     saveinfo = info
     assert (str(info)=="""<RarInfo "test" in "test.rar">""")
@@ -98,7 +96,8 @@ list(UnRAR2.RarFile('test_nulls.rar').infoiter())
 
 # extract files from an archive with protected files
 cleanup()
-UnRAR2.RarFile('test_protected_files.rar', password="protected").extract()
+rarc = UnRAR2.RarFile('test_protected_files.rar', password="protected")
+rarc.extract()
 assert os.path.exists('test'+os.sep+'top_secret_xxx_file.txt')
 cleanup()
 errored = False

comictaggerlib/UnRAR2/unix.py

@@ -33,6 +33,7 @@ from rar_exceptions import *
 class UnpackerNotInstalled(Exception): pass
 
 rar_executable_cached = None
+rar_executable_version = None
 
 def call_unrar(params):
     "Calls rar/unrar command line executable, returns stdout pipe"
@@ -59,10 +60,10 @@ def call_unrar(params):
 class RarFileImplementation(object):
 
     def init(self, password=None):
+        global rar_executable_version
         self.password = password
         
         
-
         stdoutdata, stderrdata = self.call('v', []).communicate()
         
         for line in stderrdata.splitlines():
@@ -73,18 +74,42 @@ class RarFileImplementation(object):
         accum = []
         source = iter(stdoutdata.splitlines())
         line = ''
-        while not (line.startswith('Comment:') or line.startswith('Pathname/Comment')):
-            if line.strip().endswith('is not RAR archive'):
-                raise InvalidRARArchive
+        while not (line.startswith('UNRAR')):
             line = source.next()
-        while not line.startswith('Pathname/Comment'):
-            accum.append(line.rstrip('\n'))
+        signature = line
+        # The code below is mighty flaky
+        # and will probably crash on localized versions of RAR
+        # but I see no safe way to rewrite it using a CLI tool
+        if signature.startswith("UNRAR 4"):
+            rar_executable_version = 4
+            while not (line.startswith('Comment:') or line.startswith('Pathname/Comment')):
+                if line.strip().endswith('is not RAR archive'):
+                    raise InvalidRARArchive
+                line = source.next()
+            while not line.startswith('Pathname/Comment'):
+                accum.append(line.rstrip('\n'))
+                line = source.next()
+            if len(accum):
+                accum[0] = accum[0][9:] # strip out "Comment:" part
+                self.comment = '\n'.join(accum[:-1])
+            else:
+                self.comment = None
+        elif signature.startswith("UNRAR 5"):
+            rar_executable_version = 5
             line = source.next()
-        if len(accum):
-            accum[0] = accum[0][9:]
-            self.comment = '\n'.join(accum[:-1])
+            while not line.startswith('Archive:'):
+                if line.strip().endswith('is not RAR archive'):
+                    raise InvalidRARArchive
+                accum.append(line.rstrip('\n'))
+                line = source.next()
+            if len(accum):
+                self.comment = '\n'.join(accum[:-1]).strip()
+            else:
+                self.comment = None
         else:
-            self.comment = None
+            raise UnpackerNotInstalled("Unsupported RAR version, expected 4.x or 5.x, found: " 
+                    + signature.split(" ")[1])
+                
                 
     def escaped_password(self):
         return '-' if self.password == None else self.password
@@ -97,7 +122,8 @@ class RarFileImplementation(object):
 
     def infoiter(self):
         
-        stdoutdata, stderrdata = self.call('v', ['c-']).communicate()
+        command = "v" if rar_executable_version == 4 else "l"
+        stdoutdata, stderrdata = self.call(command, ['c-']).communicate()
         
         for line in stderrdata.splitlines():
             if line.strip().startswith("Cannot open"):
@@ -106,33 +132,48 @@ class RarFileImplementation(object):
         accum = []
         source = iter(stdoutdata.splitlines())
         line = ''
-        while not line.startswith('--------------'):
+        while not line.startswith('-----------'):
             if line.strip().endswith('is not RAR archive'):
                 raise InvalidRARArchive
-            if line.find("CRC failed")>=0:
+            if line.startswith("CRC failed") or line.startswith("Checksum error"):
                 raise IncorrectRARPassword  
             line = source.next()
         line = source.next()
         i = 0
         re_spaces = re.compile(r"\s+")
-        while not line.startswith('--------------'):
-            accum.append(line)
-            if len(accum)==2:
+        if rar_executable_version == 4:
+            while not line.startswith('-----------'):
+                accum.append(line)
+                if len(accum)==2:
+                    data = {}
+                    data['index'] = i
+                    # asterisks mark password-encrypted files
+                    data['filename'] = accum[0].strip().lstrip("*") # asterisks marks password-encrypted files
+                    fields = re_spaces.split(accum[1].strip())
+                    data['size'] = int(fields[0])
+                    attr = fields[5]
+                    data['isdir'] = 'd' in attr.lower()
+                    data['datetime'] = time.strptime(fields[3]+" "+fields[4], '%d-%m-%y %H:%M')
+                    data['comment'] = None
+                    yield data
+                    accum = []
+                    i += 1
+                line = source.next()
+        elif rar_executable_version == 5:
+            while not line.startswith('-----------'):
+                fields = line.strip().lstrip("*").split()
                 data = {}
                 data['index'] = i
-                #!!!ATB - changed this because it was choking when a folder or file started with a space.
-                #!!!      now, just strip off the first char in the string
-                data['filename'] = accum[0].rstrip()[1:]
-                info = re_spaces.split(accum[1].strip())
-                data['size'] = int(info[0])
-                attr = info[5]
+                data['filename'] = " ".join(fields[4:])
+                data['size'] = int(fields[1])
+                attr = fields[0]
                 data['isdir'] = 'd' in attr.lower()
-                data['datetime'] = time.strptime(info[3]+" "+info[4], '%d-%m-%y %H:%M')
+                data['datetime'] = time.strptime(fields[2]+" "+fields[3], '%d-%m-%y %H:%M')
                 data['comment'] = None
                 yield data
-                accum = []
                 i += 1
-            line = source.next()
+                line = source.next()
+            
 
     def read_files(self, checker):
         res = []
@@ -153,7 +194,7 @@ class RarFileImplementation(object):
         if overwrite:
             options.append('o+')
         else:
-			options.append('o-')
+            options.append('o-')
         if not path.endswith(os.sep):
             path += os.sep
         names = []
@@ -167,7 +208,7 @@ class RarFileImplementation(object):
         names.append(path)
         proc = self.call(command, options, names)
         stdoutdata, stderrdata = proc.communicate()
-        if stderrdata.find("CRC failed")>=0:
+        if stderrdata.find("CRC failed")>=0 or stderrdata.find("Checksum error")>=0:
             raise IncorrectRARPassword  
         return res            
             

comictaggerlib/autotagmatchwindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to select from automated issue matches
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/autotagprogresswindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to show ID log and progress
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/autotagstartwindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to confirm and set options for auto-tag
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/cbltransformer.py

@@ -3,7 +3,7 @@ Class to manage modifying metadata specifically for CBL/CBI
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/comet.py

@@ -3,7 +3,7 @@ A python class to encapsulate CoMet data
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/comicarchive.py

@@ -3,7 +3,7 @@ A python class to represent a single comic, be it file or folder of images
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -72,15 +72,16 @@ class ZipArchiver:
 	def readArchiveFile( self, archive_file ):
 		data = ""
 		zf = zipfile.ZipFile( self.path, 'r' )
+
 		try:
 			data = zf.read( archive_file )
 		except zipfile.BadZipfile as e:
-			print >> sys.stderr, "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
+			print >> sys.stderr, u"bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
 			zf.close()	
 			raise IOError
 		except Exception as e:
 			zf.close()	
-			print >> sys.stderr, "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
+			print >> sys.stderr, u"bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
 			raise IOError
 		finally:
 			zf.close()
@@ -109,12 +110,16 @@ class ZipArchiver:
 		except:
 			return False
 			
-	def getArchiveFilenameList( self ):		
-		zf = zipfile.ZipFile( self.path, 'r' )
-		namelist = zf.namelist()
-		zf.close()
-		return namelist
-	
+	def getArchiveFilenameList( self ):
+		try:
+			zf = zipfile.ZipFile( self.path, 'r' )
+			namelist = zf.namelist()
+			zf.close()
+			return namelist
+		except Exception as e:
+			print >> sys.stderr, u"Unable to get zipfile list [{0}]: {1}".format(e, self.path)
+			return []
+			
 	# zip helper func
 	def rebuildZipFile( self, exclude_list ):
 		
@@ -222,7 +227,7 @@ class ZipArchiver:
 				if not self.writeZipComment( self.path, comment ):
 					return False
 		except  Exception as e:
-			print >> sys.stderr, "Error while copying to {0}: {1}".format(self.path, e)
+			print >> sys.stderr, u"Error while copying to {0}: {1}".format(self.path, e)
 			return False
 		else:
 			return True
@@ -301,22 +306,22 @@ class RarArchiver:
 				entries = rarc.read_files( archive_file )
 
 				if entries[0][0].size != len(entries[0][1]):
-					print >> sys.stderr, "readArchiveFile(): [file is not expected size: {0} vs {1}]  {2}:{3} [attempt # {4}]".format(
+					print >> sys.stderr, u"readArchiveFile(): [file is not expected size: {0} vs {1}]  {2}:{3} [attempt # {4}]".format(
 								entries[0][0].size,len(entries[0][1]), self.path, archive_file, tries)
 					continue
 				
 			except (OSError, IOError) as e:
-				print >> sys.stderr, "readArchiveFile(): [{0}]  {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
+				print >> sys.stderr, u"readArchiveFile(): [{0}]  {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
 				time.sleep(1)
 			except Exception as e:
-				print >> sys.stderr, "Unexpected exception in readArchiveFile(): [{0}] for {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
+				print >> sys.stderr, u"Unexpected exception in readArchiveFile(): [{0}] for {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
 				break
 
 			else:
 				#Success"
 				#entries is a list of of tuples:  ( rarinfo, filedata)
 				if tries > 1:
-					print >> sys.stderr, "Attempted read_files() {0} times".format(tries)
+					print >> sys.stderr, u"Attempted read_files() {0} times".format(tries)
 				if (len(entries) == 1):
 					return entries[0][1]
 				else:
@@ -392,7 +397,7 @@ class RarArchiver:
 						namelist.append( item.filename )
 			
 			except (OSError, IOError) as e:
-				print >> sys.stderr, "getArchiveFilenameList(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
+				print >> sys.stderr, u"getArchiveFilenameList(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
 				time.sleep(1)
 
 			else:
@@ -410,7 +415,7 @@ class RarArchiver:
 				rarc = UnRAR2.RarFile( self.path )
 			
 			except (OSError, IOError) as e:
-				print >> sys.stderr, "getRARObj(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
+				print >> sys.stderr, u"getRARObj(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
 				time.sleep(1)
 
 			else:
@@ -512,6 +517,7 @@ class ComicArchive:
     
 	def __init__( self, path, settings ):
 		self.path = path
+		
 		self.ci_xml_filename = 'ComicInfo.xml'
 		self.comet_default_filename = 'CoMet.xml'
 		self.resetCache()
@@ -670,7 +676,7 @@ class ComicArchive:
 			try:
 				image_data = self.archiver.readArchiveFile( filename )
 			except IOError:
-				print >> sys.stderr, "Error reading in page.  Substituting logo page."
+				print >> sys.stderr, u"Error reading in page.  Substituting logo page."
 				image_data = ComicArchive.logo_data				
 
 		return image_data
@@ -921,7 +927,7 @@ class ComicArchive:
 		try:
 			raw_comet = self.archiver.readArchiveFile( self.comet_filename )
 		except IOError:
-			print >> sys.stderr, "Error reading in raw CoMet!"
+			print >> sys.stderr, u"Error reading in raw CoMet!"
 			raw_comet = ""
 		return  raw_comet
 		
@@ -972,7 +978,7 @@ class ComicArchive:
 						data = self.archiver.readArchiveFile( n )
 					except:
 						data = ""
-						print >> sys.stderr, "Error reading in Comet XML for validation!"
+						print >> sys.stderr, u"Error reading in Comet XML for validation!"
 					if CoMet().validateString( data ):
 						# since we found it, save it!
 						self.comet_filename = n

comictaggerlib/comicbookinfo.py

@@ -3,7 +3,7 @@ A python class to encapsulate the ComicBookInfo data
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/comicinfoxml.py

@@ -3,7 +3,7 @@ A python class to encapsulate ComicRack's ComicInfo.xml data
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/comicvinecacher.py

@@ -3,7 +3,7 @@ A python class to manage caching of data from Comic Vine
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/comicvinetalker.py

@@ -3,7 +3,7 @@ A python class to manage communication with Comic Vine's REST API
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/coverimagewidget.py

@@ -5,7 +5,7 @@ A PyQt4 widget display cover images from either local archive, or from ComicVine
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/crediteditorwindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to edit credits
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

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.10-beta"
+version="1.1.12-beta"

comictaggerlib/exportwindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to confirm and set options for export to zip
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/filenameparser.py

@@ -6,7 +6,7 @@ This should probably be re-written, but, well, it mostly works!
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -170,8 +170,11 @@ class FileNameParser:
 		series = tmpstr	
 		volume = ""
 
-		#save the last word		
-		last_word = series.split()[-1]
+		#save the last word
+		try: 
+			last_word = series.split()[-1]
+		except:
+			last_word = ""			
 		
 		# remove any parenthetical phrases
 		series = re.sub( "\(.*?\)", "", series)
@@ -197,10 +200,13 @@ class FileNameParser:
 		# be removed to help search online		
 		if issue_start == 0:
 			one_shot_words = [ "tpb", "os", "one-shot", "ogn", "gn" ]
-			last_word = series.split()[-1]
-			if last_word.lower() in one_shot_words:
-				series = series.rsplit(' ', 1)[0]
-				
+			try:
+				last_word = series.split()[-1]
+				if last_word.lower() in one_shot_words:
+					series = series.rsplit(' ', 1)[0]
+			except:
+				pass
+							
 		return series, volume.strip()
 
 	def getYear( self,filename, issue_end):
@@ -269,4 +275,3 @@ class FileNameParser:
 				self.issue = "0"
 			if self.issue[0] == ".":
 				self.issue = "0" + self.issue
-

comictaggerlib/filerenamer.py

@@ -3,7 +3,7 @@ Functions for renaming files based on metadata
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/fileselectionlist.py

@@ -4,7 +4,7 @@ A PyQt4 widget for managing list of comic archive files
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/genericmetadata.py

@@ -8,7 +8,7 @@
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -31,7 +31,7 @@ class PageType:
 	InnerCover   = "InnerCover"
 	Roundup      = "Roundup"
 	Story        = "Story"
-	Advertisment = "Advertisment"
+	Advertisment = "Advertisement"
 	Editorial    = "Editorial"
 	Letters      = "Letters"
 	Preview      = "Preview"

comictaggerlib/imagefetcher.py

@@ -3,7 +3,7 @@ A python class to manage fetching and caching of images by URL
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/imagepopup.py

@@ -3,7 +3,7 @@ A PyQT4 widget to display a popup image
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/issueidentifier.py

@@ -3,7 +3,7 @@ A python class to automatically identify a comic archive
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/issueselectionwindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to select specific issue from list
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/issuestring.py

@@ -13,7 +13,7 @@ e.g.:
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -52,35 +52,39 @@ class IssueString:
 		else:
 			start  = 0
 
-		# walk through the string, look for split point (the first non-numeric)
-		decimal_count = 0
-		for idx in range( start, len(text) ):
-			if text[idx] not in "0123456789.":
-				break
-			# special case: also split on second "."
-			if text[idx] == ".":
-				decimal_count += 1
-				if decimal_count > 1:
+		# if it's still not numeric at start skip it
+		if text[start].isdigit() or text[start] == ".":
+			# walk through the string, look for split point (the first non-numeric)
+			decimal_count = 0
+			for idx in range( start, len(text) ):
+				if text[idx] not in "0123456789.":
 					break
+				# special case: also split on second "."
+				if text[idx] == ".":
+					decimal_count += 1
+					if decimal_count > 1:
+						break
+			else:
+				idx = len(text)
+	
+			# move trailing numeric decimal to suffix
+			# (only if there is other junk after )
+			if text[idx-1] == "." and len(text) != idx:
+				idx = idx -1
+			
+			# if there is no numeric after the minus, make the minus part of the suffix
+			if idx == 1 and start == 1:
+				idx = 0
+			
+			part1 = text[0:idx]
+			part2 = text[idx:len(text)]
+			
+			if part1 != "":
+				self.num = float( part1 )
+			self.suffix = part2
 		else:
-			idx = len(text)
-
-		# move trailing numeric decimal to suffix
-		# (only if there is other junk after )
-		if text[idx-1] == "." and len(text) != idx:
-			idx = idx -1
-		
-		# if there is no numeric after the minus, make the minus part of the suffix
-		if idx == 1 and start == 1:
-			idx = 0
-		
-		part1 = text[0:idx]
-		part2 = text[idx:len(text)]
-		
-		if part1 != "":
-			self.num = float( part1 )
-		self.suffix = part2
-		
+			self.suffix = text
+					
 		#print "num: {0} suf: {1}".format(self.num, self.suffix)
 
 	def asString( self, pad = 0 ):

comictaggerlib/logwindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to a text file or log
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/main.py

@@ -3,7 +3,7 @@ A python app to (automatically) tag comic archives
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/matchselectionwindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to select from automated issue matches
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/optionalmsgdialog.py

@@ -3,7 +3,7 @@ A PyQt4 dialog to show a message and let the user check a box
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/options.py

@@ -3,7 +3,7 @@ CLI options class for comictagger app
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -304,7 +304,7 @@ For more help visit the wiki at: http://code.google.com/p/comictagger/
 			if o  == "--nooverwrite":
 				self.no_overwrite = True
 			if o  == "--version":
-				print "ComicTagger {0}:  Copyright (c) 2012-2013 Anthony Beville".format(ctversion.version)
+				print "ComicTagger {0}:  Copyright (c) 2012-2014 Anthony Beville".format(ctversion.version)
 				print "Distributed under Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)"
 				new_version = VersionChecker().getLatestVersion("", False)
 				if new_version is not None and new_version != ctversion.version:

comictaggerlib/pagebrowser.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to show pages of a comic archive
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/pagelisteditor.py

@@ -3,7 +3,7 @@ A PyQt4 widget for editing the page list info
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/pageloader.py

@@ -3,7 +3,7 @@ A PyQT4 class to load a page image from a ComicArchive in a background thread
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/progresswindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to show ID log and progress
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/renamewindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to confirm rename
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/settings.py

@@ -3,7 +3,7 @@ Settings class for comictagger app
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/settingswindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to enter app settings
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/taggerwindow.py

@@ -4,7 +4,7 @@ The main window of the ComicTagger app
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.
@@ -473,7 +473,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		msgBox.setIconPixmap( QtGui.QPixmap(ComicTaggerSettings.getGraphic('about.png')) )
 		msgBox.setText( "<br><br><br>" 
 		               + self.appName + " v" + self.version + "<br>" 
-		               + "(c)2012 Anthony Beville<br><br>"
+		               + "(c)2014 Anthony Beville<br><br>"
 		               + "<a href='{0}'>{0}</a><br><br>".format(website)
 		               + "<a href='mailto:{0}'>{0}</a><br><br>".format(email) 
 		               + "License: <a href='{0}'>{1}</a>".format(license_link, license_name) )

comictaggerlib/utils.py

@@ -5,7 +5,7 @@ Some generic utilities
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

comictaggerlib/versionchecker.py

@@ -24,7 +24,7 @@ import urllib,urllib2
 import ctversion
 
 try:
-	from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
+	from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest, QNetworkReply
 	from PyQt4.QtCore import QUrl, pyqtSignal, QObject, QByteArray
 except ImportError:
 	# No Qt, so define a few dummy QObjects to help us compile
@@ -82,6 +82,9 @@ class VersionChecker(QObject):
 		self.nam.get(QNetworkRequest(QUrl(str(url))))
 		
 	def asyncGetLatestVersionComplete( self, reply ):
+		if (reply.error() != QNetworkReply.NoError):
+			return
+			
 		# read in the response
 		new_version = str(reply.readAll())
 

comictaggerlib/volumeselectionwindow.py

@@ -3,7 +3,7 @@ A PyQT4 dialog to select specific series/volume from list
 """
 
 """
-Copyright 2012  Anthony Beville
+Copyright 2012-2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.

release_notes.txt

@@ -1,3 +1,14 @@
+---------------------------------  
+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
 ---------------------------------

setup.py

@@ -9,7 +9,8 @@ setup(name = "comictagger",
     author = "Anthony Beville",
     author_email = "comictagger@gmail.com",
     url = "http://code.google.com/p/comictagger/",
-    download_url = "http://comictagger.googlecode.com/files/comictagger-{0}.zip".format(comictaggerlib.ctversion.version),
+    #download_url = "http://comictagger.googlecode.com/files/comictagger-{0}.zip".format(comictaggerlib.ctversion.version),
+    download_url = "https://drive.google.com/uc?export=download&id=0Bw4IursaqWhhTjZ6UDB1aEx1am8",
     packages =  [ "comictaggerlib", "comictaggerlib/UnRAR2" ] ,
     package_data = {
       'comictaggerlib': ['ui/*.ui', 'graphics/*'] ,

todo.txt

@@ -16,6 +16,7 @@ Feature Requests:
 	(GC #18 ) Option for handling colon in rename
 	(GC #31 ) Specify CV Series ID for auto-tag
 	Re-org - move to new folder based on template
+	repair incorrect extension
 	
 	Denied Requests (for now):
 		Auto-rename on auto-tag
@@ -86,7 +87,10 @@ Release Process
 		Make dmg on Mac
 		Make zip on Mac or Linux
     Tag the repository
-	Upload packages
+	Manually upload release packages to Google Drive
+	Update the Downloads wiki page with direct links
+		Edit setup.py to add direct link to zip
+		"make upload"	 
 	Announce on Forum and Main Page and Twitter
 	MacUpdate
 	Update appspot value

windows/nsis/license.txt

@@ -1,4 +1,4 @@
-ComicTagger - Copyright 2012  Anthony Beville
+ComicTagger - Copyright 2014  Anthony Beville
 
 Licensed under the Apache License, Version 2.0 (the "License");
 you may not use this file except in compliance with the License.