update todo

git-svn-id: http://comictagger.googlecode.com/svn/trunk@651 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)  

comictaggerlib/autotagmatchwindow.py

@@ -38,7 +38,7 @@ class AutoTagMatchWindow(QtGui.QDialog):
 	def __init__(self, parent, match_set_list, style, fetch_func):
 		super(AutoTagMatchWindow, self).__init__(parent)
 		
-		uic.loadUi(ComicTaggerSettings.getUIFile('autotagmatchwindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('matchselectionwindow.ui' ), self)
 
 		self.altCoverWidget = CoverImageWidget( self.altCoverContainer, CoverImageWidget.AltCoverMode )
 		gridlayout = QtGui.QGridLayout( self.altCoverContainer )
@@ -51,6 +51,7 @@ class AutoTagMatchWindow(QtGui.QDialog):
 		gridlayout.setContentsMargins(0,0,0,0)
 
 		utils.reduceWidgetFontSize( self.twList )		
+		utils.reduceWidgetFontSize( self.teDescription, 1 )
 
 		self.setWindowFlags(self.windowFlags() |
 									  QtCore.Qt.WindowSystemMenuHint |
@@ -132,7 +133,9 @@ class AutoTagMatchWindow(QtGui.QDialog):
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 2, item)
 
-			item_text = match['issue_title']  
+			item_text = match['issue_title']
+			if item_text is None:
+				item_text = ""
 			item = QtGui.QTableWidgetItem(item_text)			
 			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
@@ -159,6 +162,10 @@ class AutoTagMatchWindow(QtGui.QDialog):
 				return
 		
 		self.altCoverWidget.setIssueID( self.currentMatch()['issue_id'] )
+		if self.currentMatch()['description'] is None:
+			self.teDescription.setText ( "" )
+		else:	
+			self.teDescription.setText ( self.currentMatch()['description'] )
 		
 	def setCoverImage( self ):
 		ca = self.current_match_set.ca

comictaggerlib/autotagprogresswindow.py

@@ -22,6 +22,7 @@ import sys
 from PyQt4 import QtCore, QtGui, uic
 import os
 from settings import ComicTaggerSettings
+from coverimagewidget import CoverImageWidget
 import utils
 
 class AutoTagProgressWindow(QtGui.QDialog):
@@ -31,8 +32,17 @@ class AutoTagProgressWindow(QtGui.QDialog):
 		super(AutoTagProgressWindow, self).__init__(parent)
 		
 		uic.loadUi(ComicTaggerSettings.getUIFile('autotagprogresswindow.ui' ), self)
-		self.lblTest.setPixmap(QtGui.QPixmap(ComicTaggerSettings.getGraphic('nocover.png')))
-		self.lblArchive.setPixmap(QtGui.QPixmap(ComicTaggerSettings.getGraphic('nocover.png')))
+		
+		self.archiveCoverWidget = CoverImageWidget( self.archiveCoverContainer, CoverImageWidget.DataMode, False )
+		gridlayout = QtGui.QGridLayout( self.archiveCoverContainer )
+		gridlayout.addWidget( self.archiveCoverWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+
+		self.testCoverWidget = CoverImageWidget( self.testCoverContainer, CoverImageWidget.DataMode, False )
+		gridlayout = QtGui.QGridLayout( self.testCoverContainer )
+		gridlayout.addWidget( self.testCoverWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+				
 		self.isdone = False
 
 		self.setWindowFlags(self.windowFlags() |
@@ -42,23 +52,16 @@ class AutoTagProgressWindow(QtGui.QDialog):
 		utils.reduceWidgetFontSize( self.textEdit )	
 		
 	def setArchiveImage( self, img_data):
-		self.setCoverImage( img_data, self.lblArchive )
+		self.setCoverImage( img_data, self.archiveCoverWidget)
 
 	def setTestImage( self, img_data):
-		self.setCoverImage( img_data, self.lblTest )
+		self.setCoverImage( img_data, self.testCoverWidget)
 
-	def setCoverImage( self, img_data , label):
-		if img_data is not None:
-			img = QtGui.QImage()
-			img.loadFromData( img_data )
-			label.setPixmap(QtGui.QPixmap(img))
-			label.setScaledContents(True)
-		else:
-			label.setPixmap(QtGui.QPixmap(ComicTaggerSettings.getGraphic('nocover.png')))
-			label.setScaledContents(True)
+	def setCoverImage( self, img_data , widget):
+		widget.setImageData( img_data )
 		QtCore.QCoreApplication.processEvents()
 		QtCore.QCoreApplication.processEvents()
-			
+	
 	def reject(self):
 		QtGui.QDialog.reject(self)		
 		self.isdone = True

comictaggerlib/cli.py

@@ -92,7 +92,7 @@ def actual_metadata_save( ca, opts, md ):
 	return True
 
 def display_match_set_for_choice( label, match_set, opts, settings ):
-	print "{0} -- {1}:".format(match_set.filename, label )
+	print u"{0} -- {1}:".format(match_set.filename, label )
 
 	# sort match list by year
 	match_set.matches.sort(key=lambda k: k['year'])			
@@ -292,21 +292,21 @@ def process_file_cli( filename, opts, settings, match_results ):
 		if has[ opts.data_style ]:
 			if not opts.dryrun:
 				if not ca.removeMetadata( opts.data_style ):
-					print "{0}: Tag removal seemed to fail!".format( filename )
+					print u"{0}: Tag removal seemed to fail!".format( filename )
 				else:
-					print "{0}: Removed {1} tags.".format( filename, style_name )
+					print u"{0}: Removed {1} tags.".format( filename, style_name )
 			else:
-				print "{0}: dry-run.  {1} tags not removed".format( filename, style_name )		
+				print u"{0}: dry-run.  {1} tags not removed".format( filename, style_name )		
 		else:
-			print "{0}: This archive doesn't have {1} tags to remove.".format( filename, style_name )
+			print u"{0}: This archive doesn't have {1} tags to remove.".format( filename, style_name )
 
 	elif opts.copy_tags:
 		dst_style_name = MetaDataStyle.name[ opts.data_style ]
 		if opts.no_overwrite and has[ opts.data_style ]:
-			print "{0}: Already has {1} tags.  Not overwriting.".format(filename, dst_style_name)
+			print u"{0}: Already has {1} tags.  Not overwriting.".format(filename, dst_style_name)
 			return
 		if opts.copy_source == opts.data_style:
-			print "{0}: Destination and source are same: {1}.  Nothing to do.".format(filename, dst_style_name)
+			print u"{0}: Destination and source are same: {1}.  Nothing to do.".format(filename, dst_style_name)
 			return
 			
 		src_style_name = MetaDataStyle.name[ opts.copy_source ]
@@ -337,7 +337,10 @@ def process_file_cli( filename, opts, settings, match_results ):
 			print u"Processing {0}...".format(filename)
 			
 		md = create_local_metadata( opts, ca, has[ opts.data_style ] )
-
+		if md.issue is None or md.issue == "":
+			if opts.assume_issue_is_one_if_not_set:
+				md.issue = "1"
+		
 		# now, search online
 		if opts.search_online:
 			if opts.issue_id is not None:

comictaggerlib/comicarchive.py

@@ -517,14 +517,14 @@ class ComicArchive:
 		self.resetCache()
 		self.settings = settings
 		
-		if self.zipTest():
-			self.archive_type =  self.ArchiveType.Zip
-			self.archiver = ZipArchiver( self.path )
-			
-		elif self.rarTest(): 
+		if self.rarTest(): 
 			self.archive_type =  self.ArchiveType.Rar
 			self.archiver = RarArchiver( self.path, settings )
 			
+		elif self.zipTest():
+			self.archive_type =  self.ArchiveType.Zip
+			self.archiver = ZipArchiver( self.path )
+			
 		elif os.path.isdir( self.path ):
 			self.archive_type =  self.ArchiveType.Folder
 			self.archiver = FolderArchiver( self.path )			
@@ -609,7 +609,7 @@ class ComicArchive:
 		if ( 
 		      ( self.isZip() or  self.isRar() ) #or self.isFolder() )
 		      and
-		      ( self.getNumberOfPages() > 2)
+		      ( self.getNumberOfPages() > 0)
 
 			):
 			return True
@@ -1027,6 +1027,9 @@ class ComicArchive:
 			metadata.year = fnp.year
 		if fnp.issue_count != "":
 			metadata.issueCount = fnp.issue_count
+		if self.settings.parse_scan_info:
+			if fnp.remainder != "":
+				metadata.scanInfo = fnp.remainder
 
 		metadata.isEmpty = False
 

comictaggerlib/comicinfoxml.py

@@ -260,12 +260,14 @@ class ComicInfoXml:
 				n.tag == 'Letterer' or
 				n.tag == 'Editor' 
 			):
-				for name in n.text.split(','):
-					metadata.addCredit( name.strip(), n.tag )
+				if n.text is not None:
+					for name in n.text.split(','):
+						metadata.addCredit( name.strip(), n.tag )
 
 			if n.tag == 'CoverArtist':
-				for name in n.text.split(','):
-					metadata.addCredit( name.strip(), "Cover" )
+				if n.text is not None:
+					for name in n.text.split(','):
+						metadata.addCredit( name.strip(), "Cover" )
 
 		# parse page data now	
 		pages_node = root.find( "Pages" )

comictaggerlib/comicvinecacher.py

@@ -110,13 +110,11 @@ class ComicVineCacher:
 							"volume_id INT," +
 							"name TEXT," +
 							"issue_number TEXT," +
-							"image_url TEXT," +
-							"image_hash TEXT," +
-							"thumb_image_url TEXT," +
-							"thumb_image_hash TEXT," +
-							"publish_month TEXT," +
-							"publish_year TEXT," +
+							"super_url TEXT," +
+							"thumb_url TEXT," +
+							"cover_date TEXT," +
 							"site_detail_url TEXT," +
+							"description TEXT," +
 							"timestamp DATE DEFAULT (datetime('now','localtime')), " + 
 							"PRIMARY KEY (id ) )" 
 						)
@@ -263,18 +261,34 @@ class ComicVineCacher:
 					}
 			self.upsert( cur, "volumes", "id", cv_volume_record['id'], data)
 
-			# now add in issues
 
-			for issue in cv_volume_record['issues']:
+	def add_volume_issues_info( self, volume_id, cv_volume_issues ):
+		
+		con = lite.connect( self.db_file )
+
+		with con:
+			
+			cur = con.cursor()    
+			
+			timestamp = datetime.datetime.now()
+
+			# add in issues
+
+			for issue in cv_volume_issues:
 				
 				data = { 
-				         "volume_id":    cv_volume_record['id'], 
-				         "name":         issue['name'], 
-				         "issue_number": issue['issue_number'], 
-				         "timestamp":    timestamp 
+						"volume_id":       volume_id,
+						"name":            issue['name'], 
+						"issue_number":    issue['issue_number'],
+						"site_detail_url": issue['site_detail_url'],
+						"cover_date":      issue['cover_date'],
+						"super_url":       issue['image']['super_url'],
+						"thumb_url":       issue['image']['thumb_url'],
+						"description":     issue['description'],
+						"timestamp":    timestamp 
 				       }
 				self.upsert( cur, "issues" , "id", issue['id'], data)
-			
+							
 
 	def get_volume_info( self, volume_id ):
 		
@@ -288,10 +302,6 @@ class ComicVineCacher:
 			# purge stale volume info
 			a_week_ago = datetime.datetime.today()-datetime.timedelta(days=7)
 			cur.execute( "DELETE FROM Volumes WHERE timestamp  < ?", [ str(a_week_ago) ] )	
-
-			# purge stale issue info - probably issue data won't change much....
-			a_month_ago = datetime.datetime.today()-datetime.timedelta(days=30)
-			cur.execute( "DELETE FROM Issues WHERE timestamp  < ?", [ str(a_month_ago) ] )	
 			
 			# fetch
 			cur.execute("SELECT id,name,publisher,count_of_issues,start_year FROM Volumes WHERE id = ?", [ volume_id ] )
@@ -311,25 +321,51 @@ class ComicVineCacher:
 			result['count_of_issues'] =   row[3]
 			result['start_year'] =   row[4]
 			result['issues'] = list()
+		
+		return result
 
-			cur.execute("SELECT id,name,issue_number,image_url,image_hash FROM Issues WHERE volume_id = ?", [ volume_id ] )
+	def get_volume_issues_info( self, volume_id ):
+	
+		result = None
+
+		con = lite.connect( self.db_file )
+		with con:
+			cur = con.cursor() 
+			con.text_factory = unicode					
+			
+			# purge stale issue info - probably issue data won't change much....
+			a_week_ago = datetime.datetime.today()-datetime.timedelta(days=7)
+			cur.execute( "DELETE FROM Issues WHERE timestamp  < ?", [ str(a_week_ago) ] )	
+			
+			# fetch			
+			results = list()
+			
+			cur.execute("SELECT id,name,issue_number,site_detail_url,cover_date,super_url,thumb_url,description FROM Issues WHERE volume_id = ?", [ volume_id ] )
 			rows = cur.fetchall()
 			
 			# now process the results
 			for row in rows:
 				record = dict()
-				record['id'] =           row[0]
-				record['name'] =         row[1]
-				record['issue_number'] = row[2]
-				record['image_url'] =    row[3]
-				record['image_hash'] =   row[4]
 				
-				result['issues'].append(record)
+				record['id'] =                  row[0]
+				record['name'] =                row[1]
+				record['issue_number'] =        row[2]
+				record['site_detail_url'] =	    row[3]
+				record['cover_date'] =          row[4]
+				record['image'] = dict()
+				record['image']['super_url'] =  row[5]
+				record['image']['thumb_url'] =  row[6]
+				record['description'] =         row[7]
+				
+				results.append(record)
 		
-		return result
+		if len(results) == 0:
+			return None
+			
+		return results
+	
 
-
-	def add_issue_select_details( self, issue_id, image_url, thumb_image_url, publish_month, publish_year, site_detail_url ):
+	def add_issue_select_details( self, issue_id, image_url, thumb_image_url, cover_date, site_detail_url ):
 		
 		con = lite.connect( self.db_file )
 
@@ -339,10 +375,9 @@ class ComicVineCacher:
 			timestamp = datetime.datetime.now()
 			
 			data = { 
-			          "image_url": image_url, 
-			          "thumb_image_url": thumb_image_url, 
-			          "publish_month": publish_month, 
-			          "publish_year": publish_year, 
+			          "super_url": image_url, 
+			          "thumb_url": thumb_image_url, 
+			          "cover_date": cover_date, 
 			          "site_detail_url": site_detail_url, 
 			          "timestamp": timestamp 
 			       }
@@ -357,23 +392,21 @@ class ComicVineCacher:
 			cur = con.cursor() 
 			con.text_factory = unicode					
 			
-			cur.execute("SELECT image_url,thumb_image_url,publish_month,publish_year,site_detail_url FROM Issues WHERE id=?", [ issue_id ])
+			cur.execute("SELECT super_url,thumb_url,cover_date,site_detail_url FROM Issues WHERE id=?", [ issue_id ])
 			row = cur.fetchone()
 
 			details = dict()
 			if row is None or row[0] is None :
 				details['image_url'] = None
 				details['thumb_image_url'] = None
-				details['publish_month'] = None
-				details['publish_year'] = None
+				details['cover_date'] = None
 				details['site_detail_url'] = None
 
 			else:
 				details['image_url'] = row[0]
 				details['thumb_image_url'] = row[1]
-				details['publish_month'] = row[2]
-				details['publish_year'] = row[3]
-				details['site_detail_url'] = row[4]
+				details['cover_date'] = row[2]
+				details['site_detail_url'] = row[3]
 				
 			return details
 			

comictaggerlib/comicvinetalker.py

@@ -24,6 +24,7 @@ from pprint import pprint
 import urllib2, urllib 
 import math 
 import re
+import time
 import datetime
 import ctversion
 import sys
@@ -49,12 +50,17 @@ from comicvinecacher import ComicVineCacher
 from genericmetadata import GenericMetadata
 from issuestring import IssueString
 
-
+class CVTypeID:
+	Volume = "4050"
+	Issue  = "4000"
+	
 class ComicVineTalkerException(Exception):
 	pass
 
 class ComicVineTalker(QObject):
 
+	logo_url = "http://static.comicvine.com/bundles/comicvinesite/images/logo.png"
+
 	def __init__(self, api_key=""):
 		QObject.__init__(self)
 
@@ -76,6 +82,19 @@ class ComicVineTalker(QObject):
 		else:
 			self.log_func( text )
 
+	def parseDateStr( self, date_str):
+		day = None
+		month = None
+		year = None
+		if  date_str is not None:
+			parts = date_str.split('-')
+			year = parts[0]
+			if len(parts) > 1:
+				month = parts[1]
+				if len(parts) > 2:
+					day = parts[2]
+		return day, month, year
+					
 	def testKey( self ):
 	
 		test_url = self.api_base_url + "/issue/1/?api_key=" + self.api_key + "&format=json&field_list=name"
@@ -88,12 +107,28 @@ class ComicVineTalker(QObject):
 		return cv_response[ 'status_code' ] != 100
 
 	def getUrlContent( self, url ):
-		try:
-			resp = urllib2.urlopen( url ) 
-			return resp.read()
-		except Exception as e:
-			self.writeLog( str(e) )
-			raise ComicVineTalkerException("Network Error!")
+		# connect to server:
+		#  if there is a 500 error, try a few more times before giving up
+		#  any other error, just bail
+		#print "ATB---", url
+		for tries in range(3):
+			try:
+				resp = urllib2.urlopen( url ) 
+				return resp.read()
+			except urllib2.HTTPError as e:
+				if e.getcode() == 500:					
+					self.writeLog( "Try #{0}: ".format(tries+1) )
+					time.sleep(1)
+				self.writeLog( str(e) + "\n" )
+				
+				if e.getcode() != 500:					
+					break
+				
+			except Exception as e:
+				self.writeLog( str(e)  + "\n" )
+				raise ComicVineTalkerException("Network Error!")
+				
+		raise ComicVineTalkerException("Error on Comic Vine server")
 
 	def searchForSeries( self, series_name , callback=None, refresh_cache=False ):
 		
@@ -110,12 +145,23 @@ class ComicVineTalker(QObject):
 				return cached_search_results
 		
 		original_series_name = series_name
-	
-		series_name = urllib.quote_plus(series_name.encode("utf-8"))
-		#series_name = urllib.quote_plus(unicode(series_name))
-		search_url = self.api_base_url + "/search/?api_key=" + self.api_key + "&format=json&resources=volume&query=" + series_name + "&field_list=name,id,start_year,publisher,image,description,count_of_issues&sort=start_year"
+		
+		# We need to make the series name into an "AND"ed query list
+		query_word_list = series_name.split()
+		and_list =  ['AND'] * (len(query_word_list)-1)
+		and_list.append('')
+		# zipper up the two lists
+		query_list = zip(query_word_list, and_list)
+		# flatten the list
+		query_list = [ item for sublist in query_list for item in sublist]
+		# convert back to a string
+		query_string = " ".join( query_list ).strip()
+		#print "Query string = ", query_string
+		
+		query_string = urllib.quote_plus(query_string.encode("utf-8"))
 
-		content = self.getUrlContent(search_url) 
+		search_url = self.api_base_url + "/search/?api_key=" + self.api_key + "&format=json&resources=volume&query=" + query_string + "&field_list=name,id,start_year,publisher,image,description,count_of_issues"
+		content = self.getUrlContent(search_url + "&page=1") 
 	
 		cv_response = json.loads(content)
 	
@@ -181,7 +227,7 @@ class ComicVineTalker(QObject):
 			return cached_volume_result
 
 	
-		volume_url = self.api_base_url + "/volume/" + str(series_id) + "/?api_key=" + self.api_key + "&format=json"
+		volume_url = self.api_base_url + "/volume/" + CVTypeID.Volume + "-" + str(series_id) + "/?api_key=" + self.api_key + "&field_list=name,id,start_year,publisher,count_of_issues&format=json"
 
 		content = self.getUrlContent(volume_url) 	
 		cv_response = json.loads(content)
@@ -195,22 +241,130 @@ class ComicVineTalker(QObject):
 		cvc.add_volume_info( volume_results )
 
 		return volume_results
-				
 
+	def fetchIssuesByVolume( self, series_id ):
+		
+		# before we search online, look in our cache, since we might already
+		# have this info
+		cvc = ComicVineCacher( )
+		cached_volume_issues_result = cvc.get_volume_issues_info( series_id )
+
+		if cached_volume_issues_result is not None:		
+			return cached_volume_issues_result
+		
+		#---------------------------------	
+		issues_url = self.api_base_url + "/issues/" + "?api_key=" + self.api_key + "&filter=volume:" + str(series_id) + "&field_list=id,volume,issue_number,name,image,cover_date,site_detail_url,description&format=json"
+		content = self.getUrlContent(issues_url) 	
+		cv_response = json.loads(content)
+		
+		if cv_response[ 'status_code' ] != 1:
+			print >> sys.stderr, "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] )
+			return None
+		#------------------------------------
+		
+		limit = cv_response['limit']
+		current_result_count = cv_response['number_of_page_results']
+		total_result_count = cv_response['number_of_total_results']
+		#print "ATB total_result_count", total_result_count
+		
+		#print "ATB Found {0} of {1} results".format( cv_response['number_of_page_results'], cv_response['number_of_total_results'])
+		volume_issues_result = cv_response['results']
+		page = 1
+		offset = 0
+				
+		# see if we need to keep asking for more pages...
+		while ( current_result_count < total_result_count ):
+			#print "ATB getting another page of issue results {0} of {1}...".format( current_result_count, total_result_count)
+			page += 1
+			offset += cv_response['number_of_page_results']
+
+			#print issues_url+ "&offset="+str(offset)
+			content = self.getUrlContent(issues_url + "&offset="+str(offset)) 
+			cv_response = json.loads(content)
+		
+			if cv_response[ 'status_code' ] != 1:
+				self.writeLog( "Comic Vine query failed with error:  [{0}]. \n".format( cv_response[ 'error' ] ))
+				return None
+			volume_issues_result.extend( cv_response['results'])
+			current_result_count += cv_response['number_of_page_results']				
+				
+		self.repairUrls( volume_issues_result )
+
+		cvc.add_volume_issues_info( series_id, volume_issues_result )
+
+		return volume_issues_result
+		
+		
+	def fetchIssuesByVolumeIssueNumAndYear( self, volume_id_list, issue_number, year ):
+		volume_filter = "volume:"
+		for vid in volume_id_list:
+			volume_filter += str(vid) + "|"
+
+		year_filter = ""
+		if year is not None and str(year).isdigit():
+			year_filter = ",cover_date:{0}-1-1|{1}-1-1".format(year, int(year)+1)
+
+		issue_number = urllib.quote_plus(unicode(issue_number).encode("utf-8"))
+			
+		filter = "&filter=" + volume_filter + year_filter + ",issue_number:" + issue_number
+		
+		issues_url = self.api_base_url + "/issues/" + "?api_key=" + self.api_key + filter + "&field_list=id,volume,issue_number,name,image,cover_date,site_detail_url,description&format=json"
+
+		content = self.getUrlContent(issues_url) 	
+		cv_response = json.loads(content)
+		
+		if cv_response[ 'status_code' ] != 1:
+			print >> sys.stderr, "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] )
+			return None
+		#------------------------------------
+		
+		limit = cv_response['limit']
+		current_result_count = cv_response['number_of_page_results']
+		total_result_count = cv_response['number_of_total_results']
+		#print "ATB total_result_count", total_result_count
+		
+		#print "ATB Found {0} of {1} results\n".format( cv_response['number_of_page_results'], cv_response['number_of_total_results'])
+		filtered_issues_result = cv_response['results']
+		page = 1
+		offset = 0
+				
+		# see if we need to keep asking for more pages...
+		while ( current_result_count < total_result_count ):
+			#print "ATB getting another page of issue results {0} of {1}...\n".format( current_result_count, total_result_count)
+			page += 1
+			offset += cv_response['number_of_page_results']
+
+			#print issues_url+ "&offset="+str(offset)
+			content = self.getUrlContent(issues_url + "&offset="+str(offset)) 
+			cv_response = json.loads(content)
+		
+			if cv_response[ 'status_code' ] != 1:
+				self.writeLog( "Comic Vine query failed with error:  [{0}]. \n".format( cv_response[ 'error' ] ))
+				return None
+			filtered_issues_result.extend( cv_response['results'])
+			current_result_count += cv_response['number_of_page_results']				
+
+		self.repairUrls( filtered_issues_result )
+	
+		return filtered_issues_result
+		
+						
+						
 	def fetchIssueData( self, series_id, issue_number, settings ):
 
 		volume_results = self.fetchVolumeData( series_id )
+		issues_list_results = self.fetchIssuesByVolume( series_id )
 	
 		found = False
-		for record in volume_results['issues']:
-			if IssueString(issue_number).asFloat() is None:
+		for record in issues_list_results:
+			if IssueString(issue_number).asString() is None:
 				issue_number = 1
 			if IssueString(record['issue_number']).asString().lower() == IssueString(issue_number).asString().lower():
 				found = True
 				break
 			
 		if (found):
-			issue_url = self.api_base_url + "/issue/" + str(record['id']) + "/?api_key=" + self.api_key + "&format=json"
+			issue_url = self.api_base_url + "/issue/" + CVTypeID.Issue + "-" + str(record['id']) + "/?api_key=" + self.api_key + "&format=json"
 
 			content = self.getUrlContent(issue_url) 
 			cv_response = json.loads(content)
@@ -227,7 +381,7 @@ class ComicVineTalker(QObject):
 
 	def fetchIssueDataByIssueID( self, issue_id, settings ):
 
-		issue_url = self.api_base_url + "/issue/" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json"
+		issue_url = self.api_base_url + "/issue/" + CVTypeID.Issue + "-" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json"
 		content = self.getUrlContent(issue_url)
 		cv_response = json.loads(content)
 		if cv_response[ 'status_code' ] != 1:
@@ -251,17 +405,12 @@ 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']
-		
-		# ComicVine gives redundant info in the title.  Strip out the
-		# volume name and issue number
-		metadata.title = re.sub( ".* #.+ - ", "", metadata.title )
 
 		metadata.publisher = volume_results['publisher']['name']
-		metadata.month = issue_results['publish_month']
-		metadata.year = issue_results['publish_year']
+		metadata.day, metadata.month, metadata.year = self.parseDateStr( issue_results['cover_date'] )
+				
 		#metadata.issueCount = volume_results['count_of_issues']
 		metadata.comments = self.cleanup_html(issue_results['description'])
 		if settings.use_series_start_as_volume:
@@ -277,11 +426,11 @@ class ComicVineTalker(QObject):
 		
 		person_credits = issue_results['person_credits']
 		for person in person_credits:
-			if person.has_key('roles'):
-				for role in person['roles']:
+			if person.has_key('role'):
+				roles = person['role'].split(',')
+				for role in roles:
 					# can we determine 'primary' from CV??
-					role_name = role['role'].title()
-					metadata.addCredit( person['name'], role['role'].title(), False )			
+					metadata.addCredit( person['name'], role.title().strip(), False )			
 
 		character_credits = issue_results['character_credits']
 		character_list = list()
@@ -312,6 +461,8 @@ class ComicVineTalker(QObject):
 	
 	def cleanup_html( self, string):
 		
+		if string is None:
+			return ""
 		# remove all newlines first
 		string = string.replace("\n", "")
 		
@@ -329,14 +480,13 @@ class ComicVineTalker(QObject):
 		newstring = newstring.replace('&amp;','&')
 	
 		newstring = newstring.strip()
-
-		
 		return newstring
 
 	def fetchIssueDate( self, issue_id ):
 		details = self.fetchIssueSelectDetails( issue_id )
-		return details['publish_month'], details['publish_year']
-
+		day, month, year = self.parseDateStr( details['cover_date'] )
+		return month, year
+	
 	def fetchIssueCoverURLs( self, issue_id ):
 		details = self.fetchIssueSelectDetails( issue_id )
 		return details['image_url'], details['thumb_image_url']
@@ -352,15 +502,14 @@ class ComicVineTalker(QObject):
 		if cached_details['image_url'] is not None:
 			return cached_details
 
-		issue_url = self.api_base_url + "/issue/" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json&field_list=image,publish_month,publish_year,site_detail_url"
+		issue_url = self.api_base_url + "/issue/" + CVTypeID.Issue + "-" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json&field_list=image,cover_date,site_detail_url"
 
 		content = self.getUrlContent(issue_url) 
 		
 		details = dict()
 		details['image_url'] = None
 		details['thumb_image_url'] = None
-		details['publish_month'] = None
-		details['publish_year'] = None
+		details['cover_date'] = None
 		details['site_detail_url'] = None
 		
 		cv_response = json.loads(content)
@@ -370,16 +519,14 @@ class ComicVineTalker(QObject):
 		
 		details['image_url'] =       cv_response['results']['image']['super_url']
 		details['thumb_image_url'] = cv_response['results']['image']['thumb_url']
-		details['publish_year'] =    cv_response['results']['publish_year']
-		details['publish_month'] =   cv_response['results']['publish_month']
+		details['cover_date'] =      cv_response['results']['cover_date']
 		details['site_detail_url'] = cv_response['results']['site_detail_url']
 				
 		if details['image_url'] is not None:
 			self.cacheIssueSelectDetails( issue_id,
 										details['image_url'],
 										details['thumb_image_url'],
-										details['publish_month'],
-										details['publish_year'],
+										details['cover_date'],
 										details['site_detail_url'] )
 		#print details['site_detail_url']
 		return details
@@ -391,18 +538,16 @@ class ComicVineTalker(QObject):
 		cvc = ComicVineCacher( )
 		return  cvc.get_issue_select_details( issue_id )
 
-	def cacheIssueSelectDetails( self, issue_id, image_url, thumb_url, month, year, page_url ):
+	def cacheIssueSelectDetails( self, issue_id, image_url, thumb_url, cover_date, page_url ):
 		cvc = ComicVineCacher( )
-		cvc.add_issue_select_details( issue_id, image_url, thumb_url, month, year, page_url )
+		cvc.add_issue_select_details( issue_id, image_url, thumb_url, cover_date, page_url )
 
 
-	def fetchAlternateCoverURLs(self, issue_id):
+	def fetchAlternateCoverURLs(self, issue_id, issue_page_url):
 		url_list = self.fetchCachedAlternateCoverURLs( issue_id )
 		if url_list is not None:
 			return url_list
 		
-		issue_page_url = self.fetchIssuePageURL( issue_id )
-		
 		# scrape the CV issue page URL to get the alternate cover URLs 
 		resp = urllib2.urlopen( issue_page_url ) 
 		content = resp.read()
@@ -458,7 +603,7 @@ class ComicVineTalker(QObject):
 			self.urlFetchComplete.emit( details['image_url'],details['thumb_image_url'], self.issue_id )
 			return
 
-		issue_url = "http://www.comicvine.com/api/issue/" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json&field_list=image,publish_month,publish_year,site_detail_url"
+		issue_url = self.api_base_url + "/issue/" + CVTypeID.Issue + "-" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json&field_list=image,cover_date,site_detail_url"
 		self.nam = QNetworkAccessManager()
 		self.nam.finished.connect( self.asyncFetchIssueCoverURLComplete )
 		self.nam.get(QNetworkRequest(QUrl(issue_url)))
@@ -481,11 +626,10 @@ class ComicVineTalker(QObject):
 		
 		image_url = cv_response['results']['image']['super_url']
 		thumb_url = cv_response['results']['image']['thumb_url']
-		year = cv_response['results']['publish_year']
-		month = cv_response['results']['publish_month']
+		cover_date = cv_response['results']['cover_date']
 		page_url = cv_response['results']['site_detail_url']
 
-		self.cacheIssueSelectDetails(  self.issue_id, image_url, thumb_url, month, year, page_url )
+		self.cacheIssueSelectDetails(  self.issue_id, image_url, thumb_url, cover_date, page_url )
 
 		self.urlFetchComplete.emit( image_url, thumb_url, self.issue_id ) 
 
@@ -514,3 +658,11 @@ class ComicVineTalker(QObject):
 
 		self.altUrlListFetchComplete.emit( alt_cover_url_list, int(self.issue_id) ) 		
 
+	def repairUrls(self, issue_list):
+		#make sure there are URLs for the image fields
+		for issue in issue_list:
+			if issue['image'] is None:
+				issue['image'] = dict()		
+				issue['image']['super_url'] = ComicVineTalker.logo_url
+				issue['image']['thumb_url'] = ComicVineTalker.logo_url
+		

comictaggerlib/coverimagewidget.py

@@ -1,5 +1,7 @@
 """
 A PyQt4 widget display cover images from either local archive, or from ComicVine
+
+(TODO: This should be re-factored using subclasses!)
 """
 
 """
@@ -59,8 +61,9 @@ class CoverImageWidget(QWidget):
 	ArchiveMode = 0
 	AltCoverMode = 1
 	URLMode = 1
+	DataMode = 3
 	
-	def __init__(self, parent, mode ):
+	def __init__(self, parent, mode, expand_on_click = True ):
 		super(CoverImageWidget, self).__init__(parent)
 		
 		uic.loadUi(ComicTaggerSettings.getUIFile('coverimagewidget.ui' ), self)
@@ -78,7 +81,10 @@ class CoverImageWidget(QWidget):
 		self.btnLeft.clicked.connect( self.decrementImage )
 		self.btnRight.clicked.connect( self.incrementImage )
 		self.resetWidget()
-		clickable(self.lblImage).connect(self.showPopup)
+		if expand_on_click:
+			clickable(self.lblImage).connect(self.showPopup)
+		else:
+			self.lblImage.setToolTip( "" )
 
 		self.updateContent()
 
@@ -93,11 +99,12 @@ class CoverImageWidget(QWidget):
 		self.page_loader = None
 		self.imageIndex = -1
 		self.imageCount = 1
+		self.imageData = None
 		
 	def clear( self ):
 		self.resetWidget()
 		self.updateContent()
-			
+		
 	def incrementImage( self ):
 		self.imageIndex += 1
 		if self.imageIndex == self.imageCount:
@@ -138,7 +145,19 @@ class CoverImageWidget(QWidget):
 			self.comicVine = ComicVineTalker()
 			self.comicVine.urlFetchComplete.connect( self.primaryUrlFetchComplete )	
 			self.comicVine.asyncFetchIssueCoverURLs( int(self.issue_id) )
-	
+
+	def setImageData( self, image_data ):
+		if self.mode == CoverImageWidget.DataMode:
+			self.resetWidget()
+			
+			if image_data is None:
+				self.imageIndex = -1
+			else:
+				self.imageIndex = 0
+				self.imageData = image_data
+				
+			self.updateContent()
+			
 	def primaryUrlFetchComplete( self, primary_url, thumb_url, issue_id ):
 		self.url_list.append(str(primary_url))
 		self.imageIndex = 0
@@ -179,11 +198,13 @@ class CoverImageWidget(QWidget):
 			self.loadDefault()
 		elif self.mode in [ CoverImageWidget.AltCoverMode,  CoverImageWidget.URLMode ]:
 			self.loadURL()
+		elif self.mode == CoverImageWidget.DataMode:
+			self.coverRemoteFetchComplete( self.imageData, 0 )
 		else:
 			self.loadPage()
 	
 	def updateControls( self ):
-		if not self.showControls:
+		if not self.showControls or self.mode == CoverImageWidget.DataMode:
 			self.btnLeft.hide()
 			self.btnRight.hide()
 			self.label.hide()
@@ -288,3 +309,4 @@ class CoverImageWidget(QWidget):
 			
 	def showPopup( self ):
 		self.popup = ImagePopup(self, self.current_pixmap)
+

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.4-beta"
+version="1.1.10-beta"

comictaggerlib/filenameparser.py

@@ -30,31 +30,25 @@ import os
 from urllib import unquote
 
 class FileNameParser:
+
+	def repl(self, m):
+	   return ' ' * len(m.group())
+	
 	def fixSpaces( self, string, remove_dashes=True ):
 		if remove_dashes:
 			placeholders = ['[-_]','  +']
 		else:
 			placeholders = ['[_]','  +']			
 		for ph in placeholders:
-			string = re.sub(ph, ' ', string )
-		return string.strip()
-
-	# check for silly .1 or .5 style issue strings
-	# allow up to 5 chars total
-	def isPointIssue( self, word ):
-		ret = False
-		try:
-			float(word)
-			if (len(word) < 5 and not word.isdigit()):
-				ret = True
-		except ValueError:
-			pass
-		return ret
+			string = re.sub(ph, self.repl, string )
+		return string #.strip()
 
 
-	def getIssueCount( self,filename ):
+	def getIssueCount( self,filename, issue_end ):
 
 		count = ""
+		filename = filename[issue_end:]
+		
 		# replace any name seperators with spaces
 		tmpstr = self.fixSpaces(filename)
 		found = False
@@ -74,113 +68,144 @@ class FileNameParser:
 		count = count.lstrip("0")
 
 		return count
-		
-		
+	
 	def getIssueNumber( self, filename ):
 
+		# Returns a tuple of issue number string, and start and end indexs in the filename
+		# (The indexes will be used to split the string up for further parsing)
+		
 		found = False
 		issue = ''
+		start = 0
+		end = 0
 		
-		# first, look for multiple "--", this mean's it's formatted differently from most:
+		# first, look for multiple "--", this means it's formatted differently from most:
 		if "--" in filename:
 			# the pattern seems to be that anything to left of the first "--" is the series name followed by issue
-			filename = filename.split("--")[0]
-		elif "___" in filename:
+			filename = re.sub("--.*", self.repl, filename)	
+			
+		elif "__" in filename:
 			# the pattern seems to be that anything to left of the first "__" is the series name followed by issue
-			filename = filename.split("__")[0]
+			filename = re.sub("__.*", self.repl, filename)	
 
 		filename = filename.replace("+", " ")
 			
-		# remove parenthetical phrases
-		filename = re.sub( "\(.*\)", "", filename)
-		filename = re.sub( "\[.*\]", "", filename)
-		
-		# guess based on position
+		# replace parenthetical phrases with spaces
+		filename = re.sub( "\(.*?\)", self.repl, filename)
+		filename = re.sub( "\[.*?\]", self.repl, filename)
 
 		# replace any name seperators with spaces
-		tmpstr = self.fixSpaces(filename)
-		word_list = tmpstr.split(' ')
+		filename = self.fixSpaces(filename)
+
+		# remove any "of NN" phrase with spaces (problem: this could break on some titles)
+		filename = re.sub( "of [\d]+", self.repl, filename)
+
+		#print u"[{0}]".format(filename)
 		
-		#before we search, remove any kind of likely "of X" phrase
-		for i in range(0, len(word_list)-2):
-			if ( word_list[i].isdigit() and
-				word_list[i+1] == "of"  and
-				word_list[i+2].isdigit() ):
-				word_list[i+1] ="XXX"
-				word_list[i+2] ="XXX"
-				
-				
-		# first look for the last "#" followed by a digit in the filename. this is almost certainly the issue number
-		#issnum = re.search('#\d+', filename)
-		matchlist = re.findall("#[-+]?(([0-9]*\.[0-9]+|[0-9]+)(\w*))", filename)
-		if len(matchlist) > 0:
-			#get the last item
-			issue = matchlist[ len(matchlist) - 1][0]
-			found = True
-
-		# assume the last number in the filename that is under 4 digits is the issue number
-		if not found:
-			for word in reversed(word_list):
-				if len(word) > 0 and word[0] == "#":
-					word = word[1:]
-				if ( 
-					 (word.isdigit() and len(word) < 4) or
-					 (self.isPointIssue(word))
-					):
-					issue = word
-					found = True
-					#print 'Assuming issue number is ' + str(issue) + ' based on the position.'
-					break
-
-		if not found:
-			# try a regex
-			issnum = re.search('(?<=[_#\s-])(\d+[a-zA-Z]+|\d+\.\d|\d+)', filename)
-			if issnum:
-				issue = issnum.group()
+		# we should now have a cleaned up filename version with all the words in
+		# the same positions as original filename
+			
+		# make a list of each word and its position
+		word_list = list()
+		for m in re.finditer("\S+", filename):
+			word_list.append( (m.group(0), m.start(), m.end()) )
+			
+		# remove the first word, since it can't be the issue number
+		if len(word_list) > 1:
+			word_list = word_list[1:]
+		else:
+			#only one word??  just bail.
+			return issue, start, end
+					
+		# Now try to search for the likely issue number word in the list
+		
+		# first look for a word with "#" followed by digits with optional sufix 
+		# this is almost certainly the issue number
+		for w in reversed(word_list):
+			if re.match("#[-]?(([0-9]*\.[0-9]+|[0-9]+)(\w*))", w[0]):
 				found = True
-				#print 'Got the issue using regex. Issue is ' + issue 
+				break
+
+		# same as above but w/o a '#', and only look at the last word in the list	
+		if not found:
+			w  = word_list[-1]
+			if re.match("[-]?(([0-9]*\.[0-9]+|[0-9]+)(\w*))", w[0]):
+				found = True
+				
+		# now try to look for a # followed by any characters		
+		if not found:
+			for w in reversed(word_list):
+				if re.match("#\S+", w[0]):
+					found = True
+					break
+				
+		if found:
+			issue = w[0]
+			start = w[1]
+			end = w[2]
+			if issue[0] == '#':
+				issue = issue[1:]
+				
+		return issue, start, end
 		
-		return issue.strip()
-
-	def getSeriesName(self, filename, issue ):
-
-		# use the issue number string to split the filename string
-		# assume first element of list is the series name, plus cruft
-		#!!! this could fail in the case of small numerics in the series name!!!
-
-		# TODO:  we really should pass in the *INDEX* of the issue, that makes 
-		# finding it easier
+	def getSeriesName(self, filename, issue_start ):
 		
+		# use the issue number string index to split the filename string
+		
+		if issue_start != 0:
+			filename = filename[:issue_start]
+
+		# in case there is no issue number, remove some obvious stuff
+		if "--" in filename:
+			# the pattern seems to be that anything to left of the first "--" is the series name followed by issue
+			filename = re.sub("--.*", self.repl, filename)	
+			
+		elif "__" in filename:
+			# the pattern seems to be that anything to left of the first "__" is the series name followed by issue
+			filename = re.sub("__.*", self.repl, filename)
+			
 		filename = filename.replace("+", " ")
 		tmpstr = self.fixSpaces(filename, remove_dashes=False)
 		
-		#remove pound signs.  this might mess up the series name if there is a# in it.
-		tmpstr = tmpstr.replace("#", " ")
-
-		if issue != "":	
-			# assume that issue substr has at least one space before it
-			issue_str = " " + str(issue)
-			series = tmpstr.split(issue_str)[0]
-		else:
-			# no issue to work off of
-			#!!! TODO we should look for the year, and split from that
-			# and if that doesn't exist, remove parenthetical phrases
-			series = tmpstr
-			series = re.sub( "\(.*\)", "", tmpstr)
-			
+		series = tmpstr	
 		volume = ""
+
+		#save the last word		
+		last_word = series.split()[-1]
 		
-		series = series.rstrip("#")
+		# remove any parenthetical phrases
+		series = re.sub( "\(.*?\)", "", series)
 			
 		# search for volume number
 		match = re.search('(.+)([vV]|[Vv][oO][Ll]\.?\s?)(\d+)\s*$', series)
 		if match:
 			series = match.group(1)
 			volume = match.group(3)
-		
-		return series.strip(), volume.strip()
+			
+		# if a volume wasn't found, see if the last word is a year in parentheses
+		# since that's a common way to designate the volume
+		if volume == "":
+			#match either (YEAR), (YEAR-), or (YEAR-YEAR2)
+			match = re.search("(\()(\d{4})(-(\d{4}|)|)(\))", last_word)
+			if match:
+				volume = match.group(2)
 
-	def getYear( self,filename):
+		series = series.strip()
+
+		# if we don't have an issue number (issue_start==0), look
+		# for hints i.e. "TPB", "one-shot", "OS", "OGN", etc that might
+		# 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]
+				
+		return series, volume.strip()
+
+	def getYear( self,filename, issue_end):
+		
+		filename = filename[issue_end:]
 
 		year = ""
 		# look for four digit number with "(" ")" or "--" around it
@@ -191,6 +216,28 @@ class FileNameParser:
 			year = re.sub("[^0-9]", "", year)
 		return year
 
+	def getRemainder( self, filename, year, count, issue_end ):
+		
+		#make a guess at where the the non-interesting stuff begins
+		remainder = ""
+		
+		if "--" in filename:
+			remainder = filename.split("--",1)[1]
+		elif "__" in filename:
+			remainder = filename.split("__",1)[1]
+		elif issue_end != 0:
+			remainder = filename[issue_end:]
+
+		remainder = self.fixSpaces(remainder, remove_dashes=False)
+		if year != "":
+			remainder = remainder.replace(year,"",1)
+		if count != "":
+			remainder = remainder.replace("of "+count,"",1)
+			
+		remainder = remainder.replace("()","")
+		
+		return remainder.strip()
+		
 	def parseFilename( self, filename ):
 
 		# remove the path
@@ -208,20 +255,12 @@ class FileNameParser:
 		if filename.count("_28") > 1 and filename.count("_29") > 1:
 			filename = filename.replace("_28", "(")
 			filename = filename.replace("_29", ")")
-		
-		# ----HACK  
-		# remove the first word that word is a 3 digit number.
-		# some story arcs collection packs do this, but it's ugly
-		# this will probably break something, i.e. "100 bullets"
-		#word = filename.split(' ')[0]
-		#if len(word) == 3 and word[0] =='0' and word.isdigit():
-		#	filename = filename[4:]
-		# ----HACK  -
 					
-		self.issue = self.getIssueNumber(filename)
-		self.series, self.volume = self.getSeriesName(filename, self.issue)
-		self.year = self.getYear(filename)
-		self.issue_count = self.getIssueCount(filename)
+		self.issue, issue_start, issue_end = self.getIssueNumber(filename)
+		self.series, self.volume = self.getSeriesName(filename, issue_start)
+		self.year = self.getYear(filename, issue_end)
+		self.issue_count = self.getIssueCount(filename, issue_end)
+		self.remainder = self.getRemainder( filename, self.year, self.issue_count, issue_end )
 	
 		if self.issue != "":
 			# strip off leading zeros

comictaggerlib/filerenamer.py

@@ -118,12 +118,20 @@ class FileRenamer:
 			new_name = re.sub("\[\s*[-:]*\s*\]", "", new_name )
 			new_name = re.sub("\{\s*[-:]*\s*\}", "", new_name )
 
-			# remove remove duplicate -, _,
-			new_name = re.sub("[-_]+\s+", "- ", new_name )
-			new_name = re.sub("(\s-)+", " -", new_name )
-
 			# remove duplicate spaces
 			new_name = u" ".join(new_name.split())
+
+			# remove remove duplicate -, _,
+			new_name = re.sub("[-_]{2,}\s+", "-- ", new_name )
+			new_name = re.sub("(\s--)+", " --", new_name )
+			new_name = re.sub("(\s-)+", " -", new_name )
+			
+			# remove dash or double dash at end of line
+			new_name = re.sub("[-]{1,2}\s*$", "", new_name )
+			
+			# remove duplicate spaces (again!)
+			new_name = u" ".join(new_name.split())
+
 		
 		if ext is None:
 			ext = os.path.splitext( filename )[1]
@@ -132,7 +140,9 @@ class FileRenamer:
 		
 		# some tweaks to keep various filesystems happy		
 		new_name = new_name.replace("/", "-")
-		new_name = new_name.replace(":", "-")
+		new_name = new_name.replace(" :", " -")
+		new_name = new_name.replace(": ",  " - ")
+		new_name = new_name.replace(":",  "-")
 		new_name = new_name.replace("?", "")
 		
 		return new_name

comictaggerlib/fileselectionlist.py

@@ -98,6 +98,14 @@ class FileSelectionList(QWidget):
 		self.addAction(removeAction)
 		self.addAction(self.separator)
 
+	def getSorting(self):
+		col = self.twList.horizontalHeader().sortIndicatorSection()
+		order = self.twList.horizontalHeader().sortIndicatorOrder()
+		return col, order
+
+	def setSorting(self, col, order):
+		col = self.twList.horizontalHeader().setSortIndicator( col, order)
+
 	def addAppAction( self, action ):
 		self.insertAction( None , action )
 	
@@ -154,6 +162,9 @@ class FileSelectionList(QWidget):
 		self.twList.currentItemChanged.connect( self.currentItemChangedCB )
 		
 		if self.twList.rowCount() > 0:
+			# since on a removal, we select row 0, make sure callback occurs if we're already there
+			if self.twList.currentRow() == 0:
+				self.currentItemChangedCB( self.twList.currentItem(), None)	
 			self.twList.selectRow(0)
 		else:
 			self.listCleared.emit()
@@ -187,7 +198,13 @@ class FileSelectionList(QWidget):
 		progdialog.close()
 		if firstAdded is not None:
 			self.twList.selectRow(firstAdded)
+		else:
+			if len(pathlist) == 1 and os.path.isfile(pathlist[0]):
+				QMessageBox.information(self, self.tr("File Open"), self.tr("Selected file doesn't seem to be a comic archive."))
+			else:
+				QMessageBox.information(self, self.tr("File/Folder Open"), self.tr("No comic archives were found."))
 			
+		
 		self.twList.setSortingEnabled(True)
 		
 		# Adjust column size

comictaggerlib/issueselectionwindow.py

@@ -20,6 +20,7 @@ limitations under the License.
 
 import sys
 import os
+import re
 from PyQt4 import QtCore, QtGui, uic
 
 from PyQt4.QtCore import QUrl, pyqtSignal, QByteArray
@@ -54,6 +55,7 @@ class IssueSelectionWindow(QtGui.QDialog):
 		gridlayout.setContentsMargins(0,0,0,0)
 
 		utils.reduceWidgetFontSize( self.twList )		
+		utils.reduceWidgetFontSize( self.teDescription, 1 )
 
 		self.setWindowFlags(self.windowFlags() |
 									  QtCore.Qt.WindowSystemMenuHint |
@@ -92,6 +94,7 @@ class IssueSelectionWindow(QtGui.QDialog):
 		try:
 			comicVine = ComicVineTalker( )
 			volume_data = comicVine.fetchVolumeData( self.series_id )
+			self.issue_list = comicVine.fetchIssuesByVolume( self.series_id )
 		except ComicVineTalkerException:
 			QtGui.QApplication.restoreOverrideCursor()		
 			QtGui.QMessageBox.critical(self, self.tr("Network Issue"), self.tr("Could not connect to ComicVine to list issues!"))
@@ -99,8 +102,6 @@ class IssueSelectionWindow(QtGui.QDialog):
 
 		while self.twList.rowCount() > 0:
 			self.twList.removeRow(0)
-				
-		self.issue_list = volume_data['issues']
 
 		self.twList.setSortingEnabled(False)
 
@@ -116,11 +117,26 @@ class IssueSelectionWindow(QtGui.QDialog):
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 0, item)
 			
-			item_text = record['name']
+			item_text = record['cover_date']
+			if item_text is None:
+				item_text = ""
+			#remove the day of "YYYY-MM-DD"
+			parts = item_text.split("-")
+			if len(parts) > 1:
+				item_text = parts[0] + "-" + parts[1]
+				
 			item = QtGui.QTableWidgetItem(item_text)			
 			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 1, item)
+
+			item_text = record['name']
+			if item_text is None:
+				item_text = ""				
+			item = QtGui.QTableWidgetItem(item_text)			
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
+			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
+			self.twList.setItem(row, 2, item)
 			
 			if IssueString(record['issue_number']).asString().lower() == IssueString(self.issue_number).asString().lower():
 				self.initial_id = record['id']
@@ -149,5 +165,10 @@ class IssueSelectionWindow(QtGui.QDialog):
 			if record['id'] == self.issue_id:				
 				self.issue_number = record['issue_number']
 				self.coverWidget.setIssueID( int(self.issue_id) )
+				if record['description'] is None:
+					self.teDescription.setText ( "" )
+				else:	
+					self.teDescription.setText ( record['description'] )
+				
 				break
 		

comictaggerlib/issuestring.py

@@ -8,6 +8,7 @@ e.g.:
 "0"
 "-1"
 "5AU"
+"100-2"
 
 """
 
@@ -34,31 +35,53 @@ import re
 class IssueString:
 	def __init__(self, text):
 	
-		if text is None:
-			self.num = None
-			self.suffix = ""
-			return
-			
-		self.text = str(text)
-		#strip out non float-y stuff
-		tmp_num_str = re.sub('[^0-9.-]',"", self.text )
+		#  break up the issue number string into 2 parts: the numeric and suffix string.
+		# ( assumes that the numeric portion is always first )
+		
+		self.num = None
+		self.suffix = ""
 
-		if tmp_num_str == "":
-			self.num = None
-			self.suffix = self.text
-			
+		if text is None:
+			return
+		
+		text = unicode(text)
+		
+		#skip the minus sign if it's first
+		if text[0] == '-':
+			start = 1
 		else:
-			if tmp_num_str.count(".") > 1:
-				#make sure it's a valid float or int.
-				parts = tmp_num_str.split('.')
-				self.num = float( parts[0] + '.' + parts[1] )
-			else:	
-				self.num = float( tmp_num_str )
-				
-			self.suffix = ""		
-			parts = self.text.split(tmp_num_str)
-			if len( parts ) > 1 :
-				self.suffix = parts[1]
+			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:
+					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
+		
+		#print "num: {0} suf: {1}".format(self.num, self.suffix)
 
 	def asString( self, pad = 0 ):
 		#return the float, left side zero-padded, with suffix attached

comictaggerlib/matchselectionwindow.py

@@ -51,6 +51,7 @@ class MatchSelectionWindow(QtGui.QDialog):
 		gridlayout.setContentsMargins(0,0,0,0)
 
 		utils.reduceWidgetFontSize( self.twList )		
+		utils.reduceWidgetFontSize( self.teDescription, 1 )
 
 		self.setWindowFlags(self.windowFlags() |
 									  QtCore.Qt.WindowSystemMenuHint |
@@ -116,6 +117,8 @@ class MatchSelectionWindow(QtGui.QDialog):
 			self.twList.setItem(row, 2, item)
 
 			item_text = match['issue_title']  
+			if item_text is None:
+				item_text = ""
 			item = QtGui.QTableWidgetItem(item_text)			
 			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
@@ -142,7 +145,11 @@ class MatchSelectionWindow(QtGui.QDialog):
 				return
 		
 		self.altCoverWidget.setIssueID( self.currentMatch()['issue_id'] )
-		
+		if self.currentMatch()['description'] is None:
+			self.teDescription.setText ( "" )
+		else:	
+			self.teDescription.setText ( self.currentMatch()['description'] )
+			
 	def setCoverImage( self ):
 		self.archiveCoverWidget.setArchive( self.comic_archive)
 

comictaggerlib/options.py

@@ -25,8 +25,14 @@ import os
 import traceback
 import ctversion
 import utils
+try:
+	import argparse
+except:
+	pass
+
 from genericmetadata import GenericMetadata
 from comicarchive import MetaDataStyle
+from versionchecker import VersionChecker
 
 class Options:
 	help_text = """	
@@ -46,6 +52,7 @@ If no options are given, {0} will run in windowed mode
   -s, --save                 Save out tags as specified type (via -t)
                              Must specify also at least -o, -p, or -m
       --nooverwrite          Don't modify tag block if it already exists ( relevent for -s or -c )  
+  -1, --assume-issue-one     Assume issue number is 1 if not found ( relevent for -s )  
   -n, --dryrun               Don't actually modify file (only relevent for -d, -s, or -r)
   -t, --type=TYPE            Specify TYPE as either "CR", "CBL", or "COMET" (as either 
                              ComicRack, ComicBookLover, or CoMet style tags, respectivly)
@@ -111,6 +118,7 @@ For more help visit the wiki at: http://code.google.com/p/comictagger/
 		self.recursive = False
 		self.run_script = False
 		self.script = None
+		self.assume_issue_is_one_if_not_set = False
 		self.file_list = []
 		
 	def display_msg_and_quit( self, msg, code, show_help=False ):
@@ -172,6 +180,41 @@ For more help visit the wiki at: http://code.google.com/p/comictagger/
 		#print md
 		return md
 		
+	def launch_script(self, scriptfile):
+		# we were given a script.  special case for the args:
+		#  1. ignore everthing before the -S,
+		#  2. pass all the ones that follow (including script name) to the script 
+		script_args = list()
+		for idx, arg in enumerate(sys.argv):
+			if arg in [ '-S', '--script']:
+				#found script!
+				script_args = sys.argv[idx+1:]
+				break
+		sys.argv = script_args
+		if not os.path.exists(scriptfile):
+			print "Can't find {0}".format( scriptfile )
+		else:
+			# I *think* this makes sense:
+			#  assume the base name of the file is the module name
+			#  add the folder of the given file to the python path
+			#  import module
+			dirname = os.path.dirname(scriptfile)
+			module_name = os.path.splitext(os.path.basename(scriptfile))[0]
+			sys.path = [dirname] + sys.path
+			try:
+				script =  __import__(module_name)
+			
+				# Determine if the entry point exists before trying to run it
+				if "main" in dir(script):
+					script.main()
+				else:
+					print "Can't find entry point \"main()\" in module \"{0}\"".format( module_name )
+			except Exception as e:
+				print "Script raised an unhandled exception: ", e	
+				print traceback.format_exc()
+	
+		sys.exit(0)		
+
 	def parseCmdLineArgs(self):
 		
 		if platform.system() == "Darwin" and hasattr(sys, "frozen") and sys.frozen == 1:
@@ -180,14 +223,23 @@ For more help visit the wiki at: http://code.google.com/p/comictagger/
 		else:
 			input_args = sys.argv[1:]
 			
+		# first check if we're launching a script:	
+		for n in range(len(input_args)):
+			if (  input_args[n] in [ "-S", "--script" ] and
+                  n+1 < len(input_args)):
+				# insert a "--" which will cause getopt to ignore the remaining args
+				# so they will be passed to the script
+				input_args.insert(n+2, "--")
+				break
+	
 		# parse command line options
 		try:
 			opts, args = getopt.getopt( input_args, 
-			           "hpdt:fm:vonsrc:ieRS:", 
+			           "hpdt:fm:vonsrc:ieRS:1", 
 			           [ "help", "print", "delete", "type=", "copy=", "parsefilename", "metadata=", "verbose",
 			            "online", "dryrun", "save", "rename" , "raw", "noabort", "terse", "nooverwrite",
 			            "interactive", "nosummary", "version", "id=" , "recursive", "script=",
-			            "export-to-zip", "delete-rar", "abort-on-conflict" ] )
+			            "export-to-zip", "delete-rar", "abort-on-conflict", "assume-issue-one" ] )
 
 		except getopt.GetoptError as err:
 			self.display_msg_and_quit( str(err), 2 )
@@ -247,11 +299,18 @@ For more help visit the wiki at: http://code.google.com/p/comictagger/
 				self.terse = True
 			if o == "--nosummary":
 				self.show_save_summary = False
+			if o in ("-1", "--assume-issue-one"):
+				self.assume_issue_is_one_if_not_set = True
 			if o  == "--nooverwrite":
 				self.no_overwrite = True
 			if o  == "--version":
 				print "ComicTagger {0}:  Copyright (c) 2012-2013 Anthony Beville".format(ctversion.version)
-				print "Distributed under Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)"	
+				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:
+					print "----------------------------------------"
+					print "New version available online: {0}".format(new_version)
+					print "----------------------------------------"
 				sys.exit(0)
 			if o in ("-t", "--type"):
 				if a.lower() == "cr":
@@ -279,40 +338,8 @@ For more help visit the wiki at: http://code.google.com/p/comictagger/
 			self.display_msg_and_quit( "Must choose only one action of print, delete, save, copy, rename, export, or run script", 1 )
 
 		if self.script is not None:
-			# we were given a script.  special case for the args:
-			#  1. ignore everthing before the -S,
-			#  2. pass all the ones that follow (including script name) to the script 
-			script_args = list()
-			for idx, arg in enumerate(sys.argv):
-				if arg in [ '-S', '--script']:
-					#found script!
-					script_args = sys.argv[idx+1:]
-					break
-			sys.argv = script_args
-			if not os.path.exists(self.script):
-				print "Can't find {0}".format( self.script )
-			else:
-				# I *think* this makes sense:
-				#  assume the base name of the file is the module name
-				#  add the folder of the given file to the python path
-				#  import module
-				dirname = os.path.dirname(self.script)
-				module_name = os.path.splitext(os.path.basename(self.script))[0]
-				sys.path = [dirname] + sys.path
-				try:
-					script =  __import__(module_name)
-				
-					# Determine if the entry point exists before trying to run it
-					if "main" in dir(script):
-						script.main()
-					else:
-						print "Can't find entry point \"main()\" in module \"{0}\"".format( module_name )
-				except Exception as e:
-					print "Script raised an unhandled exception: ", e	
-					print traceback.format_exc()
-	
-			sys.exit(0)
-		
+			self.launch_script( self.script )
+
 		if len(args) > 0:
 			if platform.system() == "Windows":
 				# no globbing on windows shell, so do it for them

comictaggerlib/settings.py

@@ -24,6 +24,7 @@ import sys
 import configparser
 import platform
 import codecs
+import uuid
 
 import utils
 
@@ -67,8 +68,11 @@ class ComicTaggerSettings:
 		self.rar_exe_path = ""
 		self.unrar_exe_path = ""
 		self.allow_cbi_in_rar = True
+		self.check_for_new_version = True
+		self.send_usage_stats = False
 		
 		# automatic settings
+		self.install_id = uuid.uuid4().hex
 		self.last_selected_save_data_style = 0
 		self.last_selected_load_data_style = 0
 		self.last_opened_folder = ""
@@ -78,6 +82,8 @@ class ComicTaggerSettings:
 		self.last_main_window_y = 0
 		self.last_form_side_width = -1
 		self.last_list_side_width = -1
+		self.last_filelist_sorted_column = -1
+		self.last_filelist_sorted_order = 0
 		
 		# identifier settings
 		self.id_length_delta_thresh = 5
@@ -86,6 +92,11 @@ class ComicTaggerSettings:
 		# Show/ask dialog flags
 		self.ask_about_cbi_in_rar = True
 		self.show_disclaimer = True
+		self.dont_notify_about_this_version = ""
+		self.ask_about_usage_stats = True
+		
+		#filename parsing settings
+		self.parse_scan_info = True
 		
 		# Comic Vine settings
 		self.use_series_start_as_volume = False
@@ -159,12 +170,25 @@ class ComicTaggerSettings:
 		self.__init__()
 		
 	def load(self):
-		
-		self.config.readfp(codecs.open(self.settings_file, "r", "utf8"))
+
+		def readline_generator(f):
+			line = f.readline()
+			while line:
+				yield line
+				line = f.readline()			
+
+		#self.config.readfp(codecs.open(self.settings_file, "r", "utf8"))
+		self.config.read_file(readline_generator(codecs.open(self.settings_file, "r", "utf8")))
 		
 		self.rar_exe_path =    self.config.get( 'settings', 'rar_exe_path' )
 		self.unrar_exe_path =  self.config.get( 'settings', 'unrar_exe_path' )
-
+		if self.config.has_option('settings', 'check_for_new_version'):
+			self.check_for_new_version =        self.config.getboolean( 'settings', 'check_for_new_version' )		
+		if self.config.has_option('settings', 'send_usage_stats'):
+			self.send_usage_stats =        self.config.getboolean( 'settings', 'send_usage_stats' )		
+	
+		if self.config.has_option('auto', 'install_id'):
+			self.install_id =  self.config.get( 'auto', 'install_id' )
 		if self.config.has_option('auto', 'last_selected_load_data_style'):
 			self.last_selected_load_data_style =  self.config.getint( 'auto', 'last_selected_load_data_style' )
 		if self.config.has_option('auto', 'last_selected_save_data_style'):
@@ -183,17 +207,28 @@ class ComicTaggerSettings:
 			self.last_form_side_width =   self.config.getint( 'auto', 'last_form_side_width' )
 		if self.config.has_option('auto', 'last_list_side_width'):
 			self.last_list_side_width =   self.config.getint( 'auto', 'last_list_side_width' )
+		if self.config.has_option('auto', 'last_filelist_sorted_column'):
+			self.last_filelist_sorted_column =   self.config.getint( 'auto', 'last_filelist_sorted_column' )
+		if self.config.has_option('auto', 'last_filelist_sorted_order'):
+			self.last_filelist_sorted_order =   self.config.getint( 'auto', 'last_filelist_sorted_order' )
 
 		if self.config.has_option('identifier', 'id_length_delta_thresh'):
 			self.id_length_delta_thresh =   self.config.getint( 'identifier', 'id_length_delta_thresh' )
 		if self.config.has_option('identifier', 'id_publisher_blacklist'):
 			self.id_publisher_blacklist =   self.config.get( 'identifier', 'id_publisher_blacklist' )
 
+		if self.config.has_option('filenameparser', 'parse_scan_info'):
+			self.parse_scan_info =   self.config.getboolean( 'filenameparser', 'parse_scan_info' )
+
 		if self.config.has_option('dialogflags', 'ask_about_cbi_in_rar'):
 			self.ask_about_cbi_in_rar =        self.config.getboolean( 'dialogflags', 'ask_about_cbi_in_rar' )		
 		if self.config.has_option('dialogflags', 'show_disclaimer'):
 			self.show_disclaimer =        self.config.getboolean( 'dialogflags', 'show_disclaimer' )
-			
+		if self.config.has_option('dialogflags', 'dont_notify_about_this_version'):
+			self.dont_notify_about_this_version = self.config.get( 'dialogflags', 'dont_notify_about_this_version' )
+		if self.config.has_option('dialogflags', 'ask_about_usage_stats'):
+			self.ask_about_usage_stats =        self.config.getboolean( 'dialogflags', 'ask_about_usage_stats' )		
+						
 		if self.config.has_option('comicvine', 'use_series_start_as_volume'):
 			self.use_series_start_as_volume =        self.config.getboolean( 'comicvine', 'use_series_start_as_volume' )		
 
@@ -227,13 +262,16 @@ class ComicTaggerSettings:
 
 		if not self.config.has_section( 'settings' ):
 			self.config.add_section( 'settings' )
-			
+
+		self.config.set( 'settings', 'check_for_new_version',   self.check_for_new_version )
 		self.config.set( 'settings', 'rar_exe_path',   self.rar_exe_path )
 		self.config.set( 'settings', 'unrar_exe_path', self.unrar_exe_path )
+		self.config.set( 'settings', 'send_usage_stats', self.send_usage_stats )	
 
 		if not self.config.has_section( 'auto' ):
 			self.config.add_section( 'auto' )
 
+		self.config.set( 'auto', 'install_id', self.install_id )
 		self.config.set( 'auto', 'last_selected_load_data_style', self.last_selected_load_data_style )
 		self.config.set( 'auto', 'last_selected_save_data_style', self.last_selected_save_data_style )
 		self.config.set( 'auto', 'last_opened_folder', self.last_opened_folder )
@@ -243,6 +281,8 @@ class ComicTaggerSettings:
 		self.config.set( 'auto', 'last_main_window_y', self.last_main_window_y )
 		self.config.set( 'auto', 'last_form_side_width', self.last_form_side_width )
 		self.config.set( 'auto', 'last_list_side_width', self.last_list_side_width )
+		self.config.set( 'auto', 'last_filelist_sorted_column', self.last_filelist_sorted_column )
+		self.config.set( 'auto', 'last_filelist_sorted_order', self.last_filelist_sorted_order )
 
 		if not self.config.has_section( 'identifier' ):
 			self.config.add_section( 'identifier' )
@@ -255,7 +295,14 @@ class ComicTaggerSettings:
 
 		self.config.set( 'dialogflags', 'ask_about_cbi_in_rar', self.ask_about_cbi_in_rar )
 		self.config.set( 'dialogflags', 'show_disclaimer', self.show_disclaimer )
+		self.config.set( 'dialogflags', 'dont_notify_about_this_version', self.dont_notify_about_this_version )
+		self.config.set( 'dialogflags', 'ask_about_usage_stats', self.ask_about_usage_stats )
 
+		if not self.config.has_section( 'filenameparser' ):
+			self.config.add_section( 'filenameparser' )
+			
+		self.config.set( 'filenameparser', 'parse_scan_info', self.parse_scan_info )
+	
 		if not self.config.has_section( 'comicvine' ):
 			self.config.add_section( 'comicvine' )
 			

comictaggerlib/settingswindow.py

@@ -119,6 +119,12 @@ class SettingsWindow(QtGui.QDialog):
 		self.leNameLengthDeltaThresh.setText( str(self.settings.id_length_delta_thresh) )
 		self.tePublisherBlacklist.setPlainText( self.settings.id_publisher_blacklist )
 
+		if self.settings.check_for_new_version:
+			self.cbxCheckForNewVersion.setCheckState( QtCore.Qt.Checked)
+		
+		if self.settings.parse_scan_info:
+			self.cbxParseScanInfo.setCheckState( QtCore.Qt.Checked)
+			
 		if self.settings.use_series_start_as_volume:
 			self.cbxUseSeriesStartAsVolume.setCheckState( QtCore.Qt.Checked)
 	
@@ -162,10 +168,14 @@ class SettingsWindow(QtGui.QDialog):
 
 		if not str(self.leIssueNumPadding.text()).isdigit():
 			self.leIssueNumPadding.setText("0")
+
+		self.settings.check_for_new_version = self.cbxCheckForNewVersion.isChecked()
 		
 		self.settings.id_length_delta_thresh = int(self.leNameLengthDeltaThresh.text())
 		self.settings.id_publisher_blacklist = str(self.tePublisherBlacklist.toPlainText())
-		
+			
+		self.settings.parse_scan_info = self.cbxParseScanInfo.isChecked()
+
 		self.settings.use_series_start_as_volume = self.cbxUseSeriesStartAsVolume.isChecked()
 				
 		self.settings.assume_lone_credit_is_primary = self.cbxAssumeLoneCreditIsPrimary.isChecked()
@@ -185,7 +195,6 @@ class SettingsWindow(QtGui.QDialog):
 		self.settings.save()
 		QtGui.QDialog.accept(self)
 	
-	
 	def selectRar( self ):
 		self.selectFile(  self.leRarExePath, "RAR" )
 	
@@ -226,5 +235,5 @@ class SettingsWindow(QtGui.QDialog):
 			control.setText( str(fileList[0]) )
 
 	def showRenameTab( self ):
-		self.tabWidget.setCurrentIndex(4)	
+		self.tabWidget.setCurrentIndex(5)	
 		

comictaggerlib/taggerwindow.py

@@ -55,6 +55,7 @@ from autotagstartwindow import AutoTagStartWindow
 from autotagprogresswindow import AutoTagProgressWindow
 from autotagmatchwindow import AutoTagMatchWindow
 from coverimagewidget import CoverImageWidget
+from versionchecker import VersionChecker
 
 import utils
 import ctversion
@@ -100,6 +101,8 @@ class TaggerWindow( QtGui.QMainWindow):
 		
 		self.fileSelectionList.selectionChanged.connect( self.fileListSelectionChanged )
 		self.fileSelectionList.listCleared.connect( self.fileListCleared )
+		self.fileSelectionList.setSorting(self.settings.last_filelist_sorted_column,
+										  self.settings.last_filelist_sorted_order)
 
 		# we can't specify relative font sizes in the UI designer, so
 		# walk through all the lablels in the main form, and make them
@@ -203,7 +206,23 @@ class TaggerWindow( QtGui.QMainWindow):
 								"""
 								)
 			self.settings.show_disclaimer = not checked
-		
+
+		if self.settings.ask_about_usage_stats:
+			reply = QtGui.QMessageBox.question(self, 
+				 self.tr("Anonymous Stats"), 
+				 self.tr(
+						"Is it okay if ComicTagger occasionally sends some anonymous usage statistics?  Nothing nefarious, "
+						"just trying to get a better idea of how the app is being used.\n\nThanks for your support!"
+						),
+				 QtGui.QMessageBox.Yes|QtGui.QMessageBox.Default, QtGui.QMessageBox.No )
+				 
+			if reply == QtGui.QMessageBox.Yes:		
+				self.settings.send_usage_stats = True
+			self.settings.ask_about_usage_stats = False
+				
+		if self.settings.check_for_new_version:
+			self.checkLatestVersionOnline()
+					
 	def sigint_handler(self, *args):
 		# defer the actual close in the app loop thread
 		QtCore.QTimer.singleShot(200, self.close)
@@ -312,7 +331,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.actionApplyCBLTransform.setStatusTip( 'Modify tags specifically for CBL format' )
 		self.actionApplyCBLTransform.triggered.connect( self.applyCBLTransform )		
 
-		#self.actionClearEntryForm.setShortcut( 'Ctrl+C' )
+		self.actionClearEntryForm.setShortcut( 'Ctrl+Shift+C' )
 		self.actionClearEntryForm.setStatusTip( 'Clear all the data on the screen' )
 		self.actionClearEntryForm.triggered.connect( self.clearForm )
 
@@ -897,7 +916,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!)")
@@ -908,14 +927,17 @@ class TaggerWindow( QtGui.QMainWindow):
 		else:
 			QtGui.QMessageBox.information(self, self.tr("Online Search"), self.tr("Need to enter a series name to search."))
 			return
-			
-
+		
 		year = str(self.lePubYear.text()).strip()
 		if year == "":
 			year = None
 
+		issue_count = str(self.leIssueCount.text()).strip()
+		if issue_count == "":
+			issue_count = None
+			
 		cover_index_list =  self.metadata.getCoverPageIndexList()
-		selector = VolumeSelectionWindow( self, series_name, issue_number, year, cover_index_list, self.comic_archive, self.settings, autoselect )
+		selector = VolumeSelectionWindow( self, series_name, issue_number, year, issue_count, cover_index_list, self.comic_archive, self.settings, autoselect )
 
 		title = "Search: '" + series_name + "' - "
 		selector.setWindowTitle( title + "Select Series")
@@ -1731,6 +1753,7 @@ class TaggerWindow( QtGui.QMainWindow):
 			self.settings.last_main_window_y = self.y()
 			self.settings.last_form_side_width = self.splitter.sizes()[0]
 			self.settings.last_list_side_width = self.splitter.sizes()[1]
+			self.settings.last_filelist_sorted_column, self.settings.last_filelist_sorted_order = self.fileSelectionList.getSorting()
 			self.settings.save()
 
 			
@@ -1835,4 +1858,21 @@ class TaggerWindow( QtGui.QMainWindow):
 	def tabChanged( self, idx ):
 		if idx == 0:
 			self.splitterMovedEvent( 0, 0)
-
+		
+	def checkLatestVersionOnline( self ):
+		self.versionChecker = VersionChecker()
+		self.versionChecker.versionRequestComplete.connect( self.versionCheckComplete )
+		self.versionChecker.asyncGetLatestVersion( self.settings.install_id, self.settings.send_usage_stats )
+	
+	def versionCheckComplete( self, new_version ):
+		if (  new_version != self.version and
+		      new_version != self.settings.dont_notify_about_this_version):
+			website = "http://code.google.com/p/comictagger"
+			checked = OptionalMessageDialog.msg(  self, "New version available!",
+					"New version ({0}) available!<br>(You are currently running {1})<br><br>".format( new_version, self.version) +
+					"Visit <a href='{0}'>{0}</a> for more info.<br><br>".format(website),
+					QtCore.Qt.Unchecked,
+					"Don't tell me about this version again")
+			if checked:
+				self.settings.dont_notify_about_this_version = new_version
+	

comictaggerlib/ui/autotagmatchwindow.ui

@@ -6,21 +6,18 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>907</width>
-    <height>507</height>
+    <width>943</width>
+    <height>467</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Select Match</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1">
+   <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
        <item>
         <widget class="QWidget" name="archiveCoverContainer" native="true">
          <property name="minimumSize">
@@ -38,45 +35,73 @@
         </widget>
        </item>
        <item>
-        <widget class="QTableWidget" name="twList">
-         <property name="selectionMode">
-          <enum>QAbstractItemView::SingleSelection</enum>
+        <widget class="QSplitter" name="splitter">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectRows</enum>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="rowCount">
-          <number>0</number>
-         </property>
-         <property name="columnCount">
-          <number>4</number>
-         </property>
-         <attribute name="horizontalHeaderStretchLastSection">
-          <bool>true</bool>
-         </attribute>
-         <attribute name="verticalHeaderVisible">
+         <property name="childrenCollapsible">
           <bool>false</bool>
-         </attribute>
-         <column>
-          <property name="text">
-           <string>Series</string>
+         </property>
+         <widget class="QTableWidget" name="twList">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>7</verstretch>
+           </sizepolicy>
           </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Publisher</string>
+          <property name="selectionMode">
+           <enum>QAbstractItemView::SingleSelection</enum>
           </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Date</string>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
           </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Title</string>
+          <property name="rowCount">
+           <number>0</number>
           </property>
-         </column>
+          <property name="columnCount">
+           <number>4</number>
+          </property>
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+          <attribute name="verticalHeaderVisible">
+           <bool>false</bool>
+          </attribute>
+          <column>
+           <property name="text">
+            <string>Series</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Publisher</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Date</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Title</string>
+           </property>
+          </column>
+         </widget>
+         <widget class="QTextEdit" name="teDescription">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>3</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
         </widget>
        </item>
        <item>

comictaggerlib/ui/autotagprogresswindow.ui

@@ -21,6 +21,44 @@
   </property>
   <layout class="QGridLayout" name="gridLayout">
    <item row="0" column="1">
+    <widget class="QWidget" name="archiveCoverContainer">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>110</width>
+       <height>165</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>110</width>
+       <height>165</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="4">
+    <widget class="QWidget" name="testCoverContainer">
+     <property name="minimumSize">
+      <size>
+       <width>110</width>
+       <height>165</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>110</width>
+       <height>165</height>
+      </size>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <widget class="QProgressBar" name="progressBar">
@@ -66,50 +104,6 @@
      </item>
     </layout>
    </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="lblArchive">
-     <property name="sizePolicy">
-      <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
-       <horstretch>0</horstretch>
-       <verstretch>0</verstretch>
-      </sizepolicy>
-     </property>
-     <property name="minimumSize">
-      <size>
-       <width>110</width>
-       <height>165</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>110</width>
-       <height>165</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-    </widget>
-   </item>
-   <item row="0" column="2">
-    <widget class="QLabel" name="lblTest">
-     <property name="minimumSize">
-      <size>
-       <width>110</width>
-       <height>165</height>
-      </size>
-     </property>
-     <property name="maximumSize">
-      <size>
-       <width>110</width>
-       <height>165</height>
-      </size>
-     </property>
-     <property name="text">
-      <string>TextLabel</string>
-     </property>
-    </widget>
-   </item>
   </layout>
  </widget>
  <resources/>

comictaggerlib/ui/issueselectionwindow.ui

@@ -6,51 +6,90 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>657</width>
-    <height>400</height>
+    <width>872</width>
+    <height>550</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Select Issue</string>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
+  <layout class="QGridLayout" name="gridLayout_2">
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>6</number>
+       </property>
        <item>
-        <widget class="QTableWidget" name="twList">
-         <property name="selectionMode">
-          <enum>QAbstractItemView::SingleSelection</enum>
+        <widget class="QSplitter" name="splitter">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectRows</enum>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="rowCount">
-          <number>0</number>
-         </property>
-         <property name="columnCount">
-          <number>2</number>
-         </property>
-         <attribute name="horizontalHeaderStretchLastSection">
-          <bool>true</bool>
-         </attribute>
-         <attribute name="verticalHeaderVisible">
+         <property name="childrenCollapsible">
           <bool>false</bool>
-         </attribute>
-         <column>
-          <property name="text">
-           <string>Issue</string>
+         </property>
+         <widget class="QTableWidget" name="twList">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>7</verstretch>
+           </sizepolicy>
           </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Title</string>
+          <property name="selectionMode">
+           <enum>QAbstractItemView::SingleSelection</enum>
           </property>
-          <property name="textAlignment">
-           <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
           </property>
-         </column>
+          <property name="rowCount">
+           <number>0</number>
+          </property>
+          <property name="columnCount">
+           <number>3</number>
+          </property>
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+          <attribute name="verticalHeaderVisible">
+           <bool>false</bool>
+          </attribute>
+          <column>
+           <property name="text">
+            <string>Issue</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Date</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Title</string>
+           </property>
+           <property name="textAlignment">
+            <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+           </property>
+          </column>
+         </widget>
+         <widget class="QTextEdit" name="teDescription">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>3</verstretch>
+           </sizepolicy>
+          </property>
+          <property name="textInteractionFlags">
+           <set>Qt::TextSelectableByKeyboard|Qt::TextSelectableByMouse</set>
+          </property>
+         </widget>
         </widget>
        </item>
        <item>

comictaggerlib/ui/matchselectionwindow.ui

@@ -6,21 +6,18 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>907</width>
-    <height>507</height>
+    <width>943</width>
+    <height>467</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Select Match</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="1">
+   <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
-       <property name="spacing">
-        <number>0</number>
-       </property>
        <item>
         <widget class="QWidget" name="archiveCoverContainer" native="true">
          <property name="minimumSize">
@@ -38,45 +35,73 @@
         </widget>
        </item>
        <item>
-        <widget class="QTableWidget" name="twList">
-         <property name="selectionMode">
-          <enum>QAbstractItemView::SingleSelection</enum>
+        <widget class="QSplitter" name="splitter">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
          </property>
-         <property name="selectionBehavior">
-          <enum>QAbstractItemView::SelectRows</enum>
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
          </property>
-         <property name="rowCount">
-          <number>0</number>
-         </property>
-         <property name="columnCount">
-          <number>4</number>
-         </property>
-         <attribute name="horizontalHeaderStretchLastSection">
-          <bool>true</bool>
-         </attribute>
-         <attribute name="verticalHeaderVisible">
+         <property name="childrenCollapsible">
           <bool>false</bool>
-         </attribute>
-         <column>
-          <property name="text">
-           <string>Series</string>
+         </property>
+         <widget class="QTableWidget" name="twList">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>7</verstretch>
+           </sizepolicy>
           </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Publisher</string>
+          <property name="selectionMode">
+           <enum>QAbstractItemView::SingleSelection</enum>
           </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Date</string>
+          <property name="selectionBehavior">
+           <enum>QAbstractItemView::SelectRows</enum>
           </property>
-         </column>
-         <column>
-          <property name="text">
-           <string>Title</string>
+          <property name="rowCount">
+           <number>0</number>
           </property>
-         </column>
+          <property name="columnCount">
+           <number>4</number>
+          </property>
+          <attribute name="horizontalHeaderStretchLastSection">
+           <bool>true</bool>
+          </attribute>
+          <attribute name="verticalHeaderVisible">
+           <bool>false</bool>
+          </attribute>
+          <column>
+           <property name="text">
+            <string>Series</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Publisher</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Date</string>
+           </property>
+          </column>
+          <column>
+           <property name="text">
+            <string>Title</string>
+           </property>
+          </column>
+         </widget>
+         <widget class="QTextEdit" name="teDescription">
+          <property name="sizePolicy">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+            <horstretch>0</horstretch>
+            <verstretch>3</verstretch>
+           </sizepolicy>
+          </property>
+         </widget>
         </widget>
        </item>
        <item>

comictaggerlib/ui/settingswindow.ui

@@ -35,7 +35,7 @@
             <string/>
            </property>
            <layout class="QGridLayout" name="gridLayout_4">
-            <item row="0" column="0">
+            <item row="1" column="0">
              <widget class="QPushButton" name="btnResetSettings">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -48,7 +48,7 @@
               </property>
              </widget>
             </item>
-            <item row="0" column="1">
+            <item row="1" column="1">
              <widget class="QLabel" name="lblDefaultSettings">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -64,7 +64,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="0">
+            <item row="2" column="0">
              <widget class="QPushButton" name="btnClearCache">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
@@ -77,7 +77,7 @@
               </property>
              </widget>
             </item>
-            <item row="1" column="1">
+            <item row="2" column="1">
              <widget class="QLabel" name="label_2">
               <property name="sizePolicy">
                <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
@@ -93,6 +93,13 @@
               </property>
              </widget>
             </item>
+            <item row="0" column="0" colspan="2">
+             <widget class="QCheckBox" name="cbxCheckForNewVersion">
+              <property name="text">
+               <string>Check for new version on startup</string>
+              </property>
+             </widget>
+            </item>
            </layout>
           </widget>
          </item>
@@ -307,6 +314,24 @@
          </item>
         </layout>
        </widget>
+       <widget class="QWidget" name="tab_6">
+        <attribute name="title">
+         <string>Filename Parser</string>
+        </attribute>
+        <widget class="QCheckBox" name="cbxParseScanInfo">
+         <property name="geometry">
+          <rect>
+           <x>30</x>
+           <y>30</y>
+           <width>421</width>
+           <height>25</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Parse Scan Info From Filename (Experimental)</string>
+         </property>
+        </widget>
+       </widget>
        <widget class="QWidget" name="tab_3">
         <attribute name="title">
          <string>Comic Vine</string>

comictaggerlib/ui/volumeselectionwindow.ui

@@ -42,17 +42,20 @@
          <property name="orientation">
           <enum>Qt::Vertical</enum>
          </property>
+         <property name="childrenCollapsible">
+          <bool>false</bool>
+         </property>
          <widget class="QTableWidget" name="twList">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="MinimumExpanding">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
+            <verstretch>7</verstretch>
            </sizepolicy>
           </property>
           <property name="minimumSize">
            <size>
             <width>0</width>
-            <height>250</height>
+            <height>0</height>
            </size>
           </property>
           <property name="selectionMode">
@@ -102,15 +105,15 @@
          </widget>
          <widget class="QTextEdit" name="teDetails">
           <property name="sizePolicy">
-           <sizepolicy hsizetype="Expanding" vsizetype="Maximum">
+           <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
             <horstretch>0</horstretch>
-            <verstretch>0</verstretch>
+            <verstretch>3</verstretch>
            </sizepolicy>
           </property>
           <property name="maximumSize">
            <size>
             <width>16777215</width>
-            <height>200</height>
+            <height>16777215</height>
            </size>
           </property>
           <property name="readOnly">

comictaggerlib/utils.py

@@ -126,9 +126,13 @@ def removearticles( text ):
 	
 	# now get rid of some other junk
 	newText = newText.replace(":", "")
-	newText = newText.replace(".", "")
 	newText = newText.replace(",", "")
 	newText = newText.replace("-", " ")
+
+	# since the CV api changed, searches for series names with periods
+	# now explicity require the period to be in the search key,
+	# so the line below is removed (for now)
+	#newText = newText.replace(".", "")
 	
 	return newText
 

comictaggerlib/versionchecker.py

@@ -0,0 +1,91 @@
+"""
+Version checker
+"""
+
+"""
+Copyright 2013  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+import sys
+import os
+import platform
+import urllib,urllib2
+import ctversion
+
+try:
+	from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
+	from PyQt4.QtCore import QUrl, pyqtSignal, QObject, QByteArray
+except ImportError:
+	# No Qt, so define a few dummy QObjects to help us compile
+	class QObject():
+		def __init__(self,*args):
+			pass
+	class pyqtSignal():
+		def __init__(self,*args):
+			pass
+		def emit(a,b,c):
+			pass
+			
+class VersionChecker(QObject):
+
+	def getRequestUrl( self, uuid, use_stats ):
+	
+		base_url = "http://comictagger1.appspot.com/latest"
+		args = ""
+		
+		if use_stats:
+			if platform.system() == "Windows":
+				plat = "win"
+			elif platform.system() == "Linux":
+				plat = "lin"
+			elif platform.system() == "Darwin":
+				plat = "mac"
+			else:
+				plat = "other"
+			args = "?uuid={0}&platform={1}&version={2}".format(uuid, plat, ctversion.version)
+			if not getattr(sys, 'frozen', None):
+				args += "&src=T"
+
+		return base_url+args
+		
+	def getLatestVersion( self, uuid, use_stats=True):
+		
+		try:
+			resp = urllib2.urlopen( self.getRequestUrl(uuid, use_stats ))
+			new_version = resp.read()
+		except Exception as e:
+			return None
+			
+		if new_version is None or new_version == "":
+			return None
+		return new_version.strip()
+
+	versionRequestComplete = pyqtSignal( str )
+	
+	def asyncGetLatestVersion( self, uuid, use_stats ):
+
+		url = self.getRequestUrl( uuid, use_stats )
+			
+		self.nam = QNetworkAccessManager()
+		self.nam.finished.connect( self.asyncGetLatestVersionComplete )
+		self.nam.get(QNetworkRequest(QUrl(str(url))))
+		
+	def asyncGetLatestVersionComplete( self, reply ):
+		# read in the response
+		new_version = str(reply.readAll())
+
+		if new_version is None or new_version == "":
+			return
+
+		self.versionRequestComplete.emit( new_version.strip() )	

comictaggerlib/volumeselectionwindow.py

@@ -87,7 +87,7 @@ class IdentifyThread( QtCore.QThread):
 
 class VolumeSelectionWindow(QtGui.QDialog):
 
-	def __init__(self, parent, series_name, issue_number, year, cover_index_list, comic_archive, settings, autoselect=False):
+	def __init__(self, parent, series_name, issue_number, year, issue_count, cover_index_list, comic_archive, settings, autoselect=False):
 		super(VolumeSelectionWindow, self).__init__(parent)
 		
 		uic.loadUi(ComicTaggerSettings.getUIFile('volumeselectionwindow.ui' ), self)
@@ -108,6 +108,7 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		self.series_name = series_name
 		self.issue_number = issue_number
 		self.year = year
+		self.issue_count = issue_count
 		self.volume_id = 0
 		self.comic_archive = comic_archive
 		self.immediate_autoselect = autoselect
@@ -161,10 +162,11 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		md.series = self.series_name
 		md.issue = self.issue_number
 		md.year = self.year
+		md.issueCount = self.issue_count
 
 		self.ii.setAdditionalMetadata( md )
 		self.ii.onlyUseAdditionalMetaData = True
-		print self.cover_index_list
+
 		self.ii.cover_page_index = int(self.cover_index_list[0])
 		
 		self.id_thread = IdentifyThread( self.ii )

current_version.txt

@@ -0,0 +1 @@
+1.1.7-beta

google/gadgets/social.xml

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+<Module>
+  <ModulePrefs title="mygaget" /> 
+  <Content type="html">
+     <![CDATA[ 
+<a href="https://twitter.com/ComicTagger" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @ComicTagger</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+<iframe allowtransparency="true" frameborder="0" scrolling="no" src="http://www.facebook.com/plugins/likebox.php?href=http%3A%2F%2Fwww.facebook.com%2Fpages%2FComictagger/139615369550787&amp;width=292&amp;colorscheme=light&amp;show_faces =false&amp;border_color&amp;stream=false&amp;header=false&amp;height=62" style="background-color: white; border-bottom-style: none; border-color: initial; border-left-style: none; border-right-style: none; border-top-style: none; border-width: initial; color: #333333; font-family: Verdana; font-size: 12px; height: 62px; line-height: 19px; overflow-x: hidden; overflow-y: hidden; text-align: -webkit-auto; width: 292px;"></iframe>
+     ]]>
+  </Content> 
+</Module>

google/gadgets/twitter.xml

@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8" ?> 
+<Module>
+  <ModulePrefs title="mygaget" /> 
+  <Content type="html">
+     <![CDATA[ 
+<a href="https://twitter.com/ComicTagger" class="twitter-follow-button" data-show-count="false" data-size="large">Follow @ComicTagger</a>
+<script>!function(d,s,id){var js,fjs=d.getElementsByTagName(s)[0];if(!d.getElementById(id)){js=d.createElement(s);js.id=id;js.src="//platform.twitter.com/widgets.js";fjs.parentNode.insertBefore(js,fjs);}}(document,"script","twitter-wjs");</script>
+     ]]>
+  </Content> 
+</Module>

mac/Makefile

@@ -1,6 +1,6 @@
 #PYINSTALLER_CMD := VERSIONER_PYTHON_PREFER_32_BIT=yes arch -i386 python $(HOME)/pyinstaller-2.0/pyinstaller.py
 PYINSTALLER_CMD := python $(HOME)/pyinstaller-2.0/pyinstaller.py
-TAGGER_BASE := $(HOME)/Dropbox/tagger/comictagger
+TAGGER_BASE ?= $(HOME)/Dropbox/tagger/comictagger
 TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib
 
 APP_NAME := ComicTagger

release_notes.txt

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

scripts/name_fixer.py

@@ -0,0 +1,151 @@
+#!/usr/bin/python
+"""
+fix the comic file names using a list of transforms
+"""
+
+"""
+Copyright 2013  Anthony Beville
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+	http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+"""
+
+import sys
+import os
+import re
+import argparse
+import json
+
+from comictaggerlib.comicarchive import *
+from comictaggerlib.settings import *
+from comictaggerlib.filerenamer import *
+import comictaggerlib.utils
+
+def parse_args():
+	
+	input_args = sys.argv[1:]
+
+	parser = argparse.ArgumentParser(description='a script to rename comic files')
+	parser.add_argument('-t', '--transforms', metavar='xformfile', help="the file with transforms")
+	parser.add_argument('-n', '--noconfirm', action='store_true', help="don't confirm before rename")
+	parser.add_argument('paths', metavar='PATH', type=str, nargs='+', help='path to look for comic files')
+	parsed_args = parser.parse_args(input_args)
+
+	return parsed_args	
+
+def caclulate_rename(ca, md, settings):
+	
+		new_ext = None  # default
+		if settings.rename_extension_based_on_archive:
+			if ca.isZip():
+				new_ext = ".cbz"
+			elif ca.isRar():
+				new_ext = ".cbr"
+			
+		renamer = FileRenamer( md )
+		renamer.setTemplate( "%series% V%volume% #%issue% (of %issuecount%) (%year%) %scaninfo%" )
+		renamer.setIssueZeroPadding( 0 )
+		renamer.setSmartCleanup( settings.rename_use_smart_string_cleanup )
+		
+		return renamer.determineName( ca.path, ext=new_ext )
+
+def perform_rename(filelist):
+	for old_name,new_name in filelist:
+		folder = os.path.dirname( os.path.abspath( old_name ) )
+		new_abs_path = utils.unique_file( os.path.join( folder, new_name ) )
+
+		os.rename( old_name, new_abs_path )
+		print u"renamed '{0}' -> '{1}'".format(os.path.basename(old_name), new_name)	
+		
+def main():
+
+	default_xform_list = [
+					[ "^2000AD$", "2000 AD" ],
+					[ "^G\.{0,1}I\.{0,1}Joe$", "G.I. Joe" ],
+				 ]
+	
+	utils.fix_output_encoding()
+	settings = ComicTaggerSettings()
+
+	style = MetaDataStyle.CIX
+	
+	parsed_args = parse_args()
+	
+	#parsed_args.noconfirm
+	if parsed_args.transforms is not None:
+		print "Reading in transforms from:", parsed_args.transforms
+		json_data=open(parsed_args.transforms).read()		
+		data = json.loads(json_data)
+		xform_list = data['xforms']
+	else:
+		xform_list = default_xform_list
+			
+	#pprint( xform_list, indent=4)
+
+	filelist = utils.get_recursive_filelist( parsed_args.paths )
+		
+	#first find all comics 
+	print "reading in all comics..."
+	comic_list = []
+	max_name_len = 2
+	fmt_str = ""
+	for filename in filelist:
+		ca = ComicArchive(filename, settings )
+		# do we care if it already has metadata?
+		if ca.seemsToBeAComicArchive() and not ca.hasMetadata( style ):
+
+			comic_list.append(ca)
+			
+			max_name_len = max ( max_name_len, len(filename))
+			fmt_str = u"{{0:{0}}}".format(max_name_len)
+			print >> sys.stderr, fmt_str.format( filename ) + "\r",
+			sys.stderr.flush()
+
+	print >> sys.stderr, fmt_str.format( "" )
+	print "Found {0} comics.".format( len(comic_list))
+
+	modify_list = list()
+	# walk through the comic list fix the filenames
+	for ca in comic_list:
+		
+		# 1. parse the filename into a MD object
+		md = ca.metadataFromFilename()
+		# 2. walk thru list of transforms
+		if md.series is not None and md.series != "":
+			for pattern, replacement in xform_list:
+				# apply each transform
+				new_series = re.sub( pattern, replacement, md.series )
+				if new_series != md.series:
+					md.series = new_series
+					new_name = caclulate_rename(ca, md, settings)
+					
+					#found a match.  add to proposed list, and bail on this file
+					modify_list.append( (ca.path, new_name ) ) 
+					break
+				
+	print "{0} filenames to modify".format(len(modify_list))
+	if len(modify_list) > 0:		
+		if parsed_args.noconfirm:
+			print "Not confirming before rename"
+		else:
+			for old_name, new_name in  modify_list:
+				print u"'{0}' -> '{1}'".format(os.path.basename(old_name), new_name)	
+
+			i = raw_input("Do you want to proceed with rename? [y/N] ")
+			if i.lower() not in ('y', 'yes'):
+				print "exiting without rename."				
+				sys.exit(0)
+				
+		perform_rename(modify_list)
+		
+if __name__ == '__main__':
+	main() 

scripts/shrink.py

@@ -125,6 +125,7 @@ def main():
 			for idx in range(ca.getNumberOfPages()):
 				name = ca.getPageName( idx )
 				in_data = ca.getPage( idx )
+				out_data = in_data
 				if in_data is not None:
 					try:
 						im = Image.open(StringIO.StringIO(in_data))
@@ -143,7 +144,7 @@ def main():
 
 					except IOError:
 						#doesn't appear to be an image
-						out_data = in_data
+						pass
 									
 				else:
 					#page is empty?? nothing to write
@@ -152,7 +153,7 @@ def main():
 				sys.stdout.write('.')
 				sys.stdout.flush()
 				
-				#Generate a new name for the page file
+				#write out the new resized image
 				zout.writestr(name, out_data)
 									
 					

scripts/xforms

@@ -0,0 +1,8 @@
+{
+	"_comment": "This file contains JSON data.  Any backslashes should be escaped with another backslash",
+	"xforms":
+		[
+			[ "^2000AD$", "2000 AD" ],
+			[ "^G\\.{0,1}I\\.{0,1}Joe$", "G.I. Joe" ]
+		]
+}

todo.txt

@@ -4,24 +4,46 @@ Features
 Rename dialog:
 	check-box for rows?
 	manual edit the preview?
+
+Maybe replace configparser  -- seems to be causing all sorts of problems
+
+Feature Requests:
+	Move CBR to other folder after conversion to ZIP
+	Pre-process series name before identification
+		(using a list of regex transforms) 
+	(GC #28) Save auto-tag options
+	(GC #24) Multiple options for -t i.e. "-t cr,cbl"
+	(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
+	
+	Denied Requests (for now):
+		Auto-rename on auto-tag
+		Re-zip (to remove compression)
+	
+	
+	Selective fields on CLI print (use -m option.  Maybe internally remove all but specified fields in MD object before print )
 		
 Docs:
 	Auto-Tagging Tips:
-		Multiple Passes with different options
-		
+		Multiple Passes with different options	
+	
 -----------------------------------------------------
 Bugs	
 -----------------------------------------------------
 
 Zip flakes out when filename differs from index (or whatever)  i.e "\" vs "/". Python issue
 
+
+
 -----------------------------------------------------
 Big  Future Features
 -----------------------------------------------------
+Support for ACBF metatdata in CBZ
 
 GCD scraper or DB reader
 
-Batch Edit
+(GC #29) Batch Edit
 	Form Mode:  Single vs Batch
 	
 -----------------------------------------------------
@@ -48,7 +70,7 @@ Google App engine to store hashes
 
 Filename parsing:
 	Rework how series name is separated from issue
-s
+
 Internal GenericMetadata - Make Characters, Genre into lists?
 
 -----------------------------------------------------
@@ -67,6 +89,7 @@ Release Process
 	Upload packages
 	Announce on Forum and Main Page and Twitter
 	MacUpdate
+	Update appspot value
 	
 ----------------------------------------------
 

windows/Makefile

@@ -2,7 +2,7 @@
 # rm, cp, grep, cut, cat
 
 HOMEPATH ?= $(HOME)
-TAGGER_BASE:= $(HOMEPATH)/Dropbox/tagger/comictagger
+TAGGER_BASE?= $(HOMEPATH)/Dropbox/tagger/comictagger
 TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib
 DIST_DIR := $(TAGGER_BASE)\windows\dist
 NSIS_CMD :=	"C:\Program Files (x86)\NSIS\makensis.exe"