Make sure the mac bundle Info.plist has the version string set

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

MANIFEST.in

@@ -0,0 +1,4 @@
+include README.txt
+include release_notes.txt
+include requirements.txt
+recursive-include scripts *.py *.txt

Makefile

@@ -1,25 +1,60 @@
 TAGGER_BASE := $(HOME)/Dropbox/tagger/comictagger
-VERSION_STR := $(shell grep version $(TAGGER_BASE)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
-
+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)  
+UPLOAD_TOOL := $(TAGGER_BASE)/google/googlecode_upload.py
 all: clean
 
 clean:
-	rm -f *~ *.pyc *.pyo
-	rm -f logdict*.log
+	rm -rf *~ *.pyc *.pyo
+	rm -rf scripts/*.pyc
+	cd comictaggerlib; rm -f *~ *.pyc *.pyo
+	rm -rf dist MANIFEST
+	rm -rf *.deb
+	rm -rf logdict*.log
 	make -C mac clean
 	make -C windows clean
+	rm -rf build
 
-zip:
-	cd release; \
-		rm -rf *zip comictagger-src-$(VERSION_STR) ;  \
-		svn export https://comictagger.googlecode.com/svn/trunk/ comictagger-src-$(VERSION_STR); \
-		zip -r comictagger-src-$(VERSION_STR).zip comictagger-src-$(VERSION_STR); \
-		rm -rf comictagger-src-$(VERSION_STR)
-	
+pydist:
+	mkdir -p release
+	rm -f release/*.zip
+	python setup.py sdist --formats=zip  #,gztar
+	mv dist/comictagger-$(VERSION_STR).zip release
 	@echo When satisfied with release, do this:
 	@echo make svn_tag
+
+remove_test_install:
+	sudo rm -rf /usr/local/bin/comictagger.py
+	sudo rm -rf /usr/local/lib/python2.7/dist-packages/comictagger*
 	
+#deb:
+#	fpm -s python -t deb \
+#		-n 'comictagger' \
+#		--category 'utilities' \
+#		--maintainer 'comictagger@gmail.com' \
+#		--after-install debian_scripts/after_install.sh \
+#		--before-remove debian_scripts/before_remove.sh \
+#		-d 'python >= 2.6' \
+#		-d 'python < 2.8' \
+#		-d 'python-imaging' \
+#		-d 'python-bs4' \
+#		--deb-suggests 'rar' \
+#		--deb-suggests 'unrar-free' \
+#		--python-install-bin /usr/share/comictagger \
+#		--python-install-lib /usr/share/comictagger \
+#		setup.py 
+#
+#		# For now, don't require PyQt, since command-line is available without it
+#		#-d 'python-qt4 >= 4.8' 
+		
+upload:
+	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR) Source" -l Featured,Type-Source -u beville -w $(PASSWORD) "release/comictagger-$(VERSION_STR).zip"
+	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR)  Mac OS X" -l Featured,Type-Archive -u beville -w $(PASSWORD) "release/ComicTagger-$(VERSION_STR).dmg"
+	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR)  Windows" -l Featured,Type-Installer -u beville -w $(PASSWORD) "release/ComicTagger v$(VERSION_STR).exe"
+	python setup.py register
+ 
 svn_tag:
 	svn copy https://comictagger.googlecode.com/svn/trunk \
-      https://comictagger.googlecode.com/svn/tags/$(VERSION_STR) -m "Release $(VERSION_STR)"
-	
+		https://comictagger.googlecode.com/svn/tags/$(VERSION_STR) -m "Release $(VERSION_STR)"
+

README.txt

@@ -0,0 +1,30 @@
+ComicTagger is a multi-platform app for writing metadata to comic archives, written in Python and PyQt.
+
+Features:
+
+* Runs on Mac OSX, Microsoft Windows, and Linux systems
+* Communicates with an online database (Comic Vine) for acquiring metadata
+* Uses image processing to automatically match a given archive with the correct issue data
+* Batch processing in the GUI for tagging hundreds or more comics at a time
+* Reads and writes multiple tagging schemes ( ComicBookLover and ComicRack, with more planned).
+* Reads and writes RAR and Zip archives (external tools needed for writing RAR)
+* Command line interface (CLI) on all platforms (including Windows), which supports batch operations, and which can be used in native scripts for complex operations. For example, to recusrively scrape and tag all archives in a folder
+	comictagger.py -R -s -o -f -t cr -v -i --nooverwrite /path/to/comics/
+
+For details, screenshots, release notes, and more, visit http://code.google.com/p/comictagger/
+
+Requires:
+
+* python 2.6 or 2.7
+* python imaging (PIL) >= 1.1.6
+* beautifulsoup > 4.1
+    
+Optional requirement (for GUI):
+
+* pyqt4
+
+Install and run:
+
+* ComicTagger can be run directly from this directory, using the launcher script "comictagger.py"
+
+* To install on your system use:  "python setup.py install".  Take note in the output where comictagger.py goes!

comictagger.py

@@ -1,507 +1,5 @@
 #!/usr/bin/python
+from comictaggerlib.main import ctmain
 
-"""
-A python script to tag comic archives
-"""
-
-"""
-Copyright 2012  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 signal
-import os
-import traceback
-import time
-from pprint import pprint
-import json
-import platform
-import locale
-
-filename_encoding = sys.getfilesystemencoding()
-	
-try:
-	qt_available = True
-	from PyQt4 import QtCore, QtGui
-	from taggerwindow import TaggerWindow
-except ImportError as e:
-	qt_available = False
-
-
-from settings import ComicTaggerSettings
-from options import Options, MetaDataStyle
-from comicarchive import ComicArchive
-from issueidentifier import IssueIdentifier
-from genericmetadata import GenericMetadata
-from comicvinetalker import ComicVineTalker, ComicVineTalkerException
-from filerenamer import FileRenamer
-from cbltransformer import CBLTransformer
-
-import utils
-import codecs
-
-class MultipleMatch():
-	def __init__( self, filename, match_list):
-		self.filename = filename  
-		self.matches = match_list  
-
-class OnlineMatchResults():
-	def __init__(self):
-		self.goodMatches = []  
-		self.noMatches = []    
-		self.multipleMatches = []  
-		self.writeFailures = []  
-
-#-----------------------------
-
-def actual_issue_data_fetch( match, settings ):
-
-	# now get the particular issue data
-	try:
-		cv_md = ComicVineTalker().fetchIssueData( match['volume_id'],  match['issue_number'], settings )
-	except ComicVineTalkerException:
-		print "Network error while getting issue details.  Save aborted"
-		return None
-
-	if settings.apply_cbl_transform_on_cv_import:
-		cv_md = CBLTransformer( cv_md, settings ).apply()
-		
-	return cv_md
-
-def actual_metadata_save( ca, opts, md ):
-
-	if not opts.dryrun:
-		# write out the new data
-		if not ca.writeMetadata( md, opts.data_style ):
-			print "The tag save seemed to fail!"
-			return False
-		else:
-			print "Save complete."				
-	else:
-		if opts.terse:
-			print "dry-run option was set, so nothing was written"
-		else:
-			print "dry-run option was set, so nothing was written, but here is the final set of tags:"
-			print u"{0}".format(md)
-	return True
-		
-
-def post_process_matches( match_results, opts, settings ):
-	# now go through the match results
-	if opts.show_save_summary:
-		if len( match_results.goodMatches ) > 0:
-			print "\nSuccessful matches:"
-			print "------------------"
-			for f in match_results.goodMatches:
-				print f
-				
-		if len( match_results.noMatches ) > 0:
-			print "\nNo matches:"
-			print "------------------"
-			for f in match_results.noMatches:
-				print f
-	
-		if len( match_results.writeFailures ) > 0:
-			print "\nFile Write Failures:"
-			print "------------------"
-			for f in match_results.writeFailures:
-				print f
-
-	if not opts.show_save_summary and not opts.interactive:
-		#jusr quit if we're not interactive or showing the summary
-		return
-	
-	if len( match_results.multipleMatches ) > 0:
-		print "\nMultiple matches:"
-		print "------------------"
-		for mm in match_results.multipleMatches:
-			print mm.filename
-			for (counter,m) in enumerate(mm.matches):
-				print u"  {0}. {1} #{2} [{3}] ({4}/{5}) - {6}".format(counter,
-											   m['series'],
-											   m['issue_number'],
-											   m['publisher'],
-											   m['month'],
-											   m['year'],
-											   m['issue_title'])
-			if opts.interactive:
-				while True:
-					i = raw_input("Choose a match #, or 's' to skip: ")
-					if (i.isdigit() and int(i) in range(len(mm.matches))) or i == 's':
-						break
-				if i != 's':
-					# save the data!
-					# we know at this point, that the file is all good to go
-					ca = ComicArchive( mm.filename )
-					md = create_local_metadata( opts, ca, ca.hasMetadata(opts.data_style) )
-					cv_md = actual_issue_data_fetch(mm.matches[int(i)], settings)
-					md.overlay( cv_md )
-					actual_metadata_save( ca, opts, md )
-					
-					
-			print
-
-
-def cli_mode( opts, settings ):
-	if len( opts.file_list ) < 1:
-		print "You must specify at least one filename.  Use the -h option for more info"
-		return
-	
-	match_results = OnlineMatchResults()
-	
-	for f in opts.file_list:
-		f = f.decode(filename_encoding, 'replace')
-		process_file_cli( f, opts, settings, match_results )
-		sys.stdout.flush()
-		
-	post_process_matches( match_results, opts, settings )	
-
-
-def create_local_metadata( opts, ca, has_desired_tags ):
-	
-	md = GenericMetadata()
-	md.setDefaultPageList( ca.getNumberOfPages() )
-	
-	if has_desired_tags:
-		md = ca.readMetadata( opts.data_style )
-		
-	# now, overlay the parsed filename info	
-	if opts.parse_filename:
-		md.overlay( ca.metadataFromFilename() )
-	
-	# finally, use explicit stuff	
-	if opts.metadata is not None:
-		md.overlay( opts.metadata )
-
-	return md
-
-def process_file_cli( filename, opts, settings, match_results ):
-
-	batch_mode = len( opts.file_list ) > 1
-		
-	ca = ComicArchive(filename)
-	if settings.rar_exe_path != "":
-		ca.setExternalRarProgram( settings.rar_exe_path )	
-	
-	if not ca.seemsToBeAComicArchive():
-		print "Sorry, but "+ filename + "  is not a comic archive!"
-		return
-	
-	#if not ca.isWritableForStyle( opts.data_style ) and ( opts.delete_tags or opts.save_tags or opts.rename_file ):
-	if not ca.isWritable(  ) and ( opts.delete_tags or opts.copy_tags or opts.save_tags or opts.rename_file ):
-		print "This archive is not writable for that tag type"
-		return
-
-	has = [ False, False, False ]
-	if ca.hasCIX(): has[ MetaDataStyle.CIX ] = True
-	if ca.hasCBI(): has[ MetaDataStyle.CBI ] = True
-	if ca.hasCoMet(): has[ MetaDataStyle.COMET ] = True
-
-	if opts.print_tags:
-
-
-		if opts.data_style is None:
-			page_count = ca.getNumberOfPages()
-
-			brief = ""
-
-			if batch_mode:
-				brief = "{0}: ".format(filename)
-
-			if ca.isZip():      brief += "ZIP archive    "
-			elif ca.isRar():    brief += "RAR archive    "
-			elif ca.isFolder(): brief += "Folder archive "
-				
-			brief += "({0: >3} pages)".format(page_count)			
-			brief += "  tags:[ "
-
-			if not ( has[ MetaDataStyle.CBI ] or has[ MetaDataStyle.CIX ] or has[ MetaDataStyle.COMET ] ):
-				brief += "none "
-			else:
-				if has[ MetaDataStyle.CBI ]: brief += "CBL "
-				if has[ MetaDataStyle.CIX ]: brief += "CR "
-				if has[ MetaDataStyle.COMET ]: brief += "CoMet "
-			brief += "]"
-				
-			print brief
-
-		if opts.terse:
-			return
-
-		print
-		
-		if opts.data_style is None or opts.data_style == MetaDataStyle.CIX:
-			if has[ MetaDataStyle.CIX ]:
-				print "------ComicRack tags--------"
-				if opts.raw:
-					print u"{0}".format(unicode(ca.readRawCIX(), errors='ignore'))
-				else:
-					print u"{0}".format(ca.readCIX())
-				
-		if opts.data_style is None or opts.data_style == MetaDataStyle.CBI:
-			if has[ MetaDataStyle.CBI ]:
-				print "------ComicBookLover tags--------"
-				if opts.raw:
-					pprint(json.loads(ca.readRawCBI()))
-				else:
-					print u"{0}".format(ca.readCBI())
-					
-		if opts.data_style is None or opts.data_style == MetaDataStyle.COMET:
-			if has[ MetaDataStyle.COMET ]:
-				print "------CoMet tags--------"
-				if opts.raw:
-					print u"{0}".format(ca.readRawCoMet())
-				else:
-					print u"{0}".format(ca.readCoMet())
-			
-			
-	elif opts.delete_tags:
-		style_name = MetaDataStyle.name[ opts.data_style ]
-		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 )
-				else:
-					print "{0}: Removed {1} tags.".format( filename, style_name )
-			else:
-				print "{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 )
-
-	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)
-			return
-		if opts.copy_source == opts.data_style:
-			print "{0}: Destination and source are same: {1}.  Nothing to do.".format(filename, dst_style_name)
-			return
-			
-		src_style_name = MetaDataStyle.name[ opts.copy_source ]
-		if has[ opts.copy_source ]:
-			if not opts.dryrun:
-				md = ca.readMetadata( opts.copy_source )
-				
-				if settings.apply_cbl_transform_on_bulk_operation and opts.data_style == MetaDataStyle.CBI:
-					md = CBLTransformer( md, settings ).apply()
-				
-				if not ca.writeMetadata( md, opts.data_style ):
-					print u"{0}: Tag copy seemed to fail!".format( filename )
-				else:
-					print u"{0}: Copied {1} tags to {2} .".format( filename, src_style_name, dst_style_name )
-			else:
-				print u"{0}: dry-run.  {1} tags not copied".format( filename, src_style_name )		
-		else:
-			print u"{0}: This archive doesn't have {1} tags to copy.".format( filename, src_style_name )
-
-		
-	elif opts.save_tags:
-
-		if opts.no_overwrite and has[ opts.data_style ]:
-			print u"{0}: Already has {1} tags.  Not overwriting.".format(filename, MetaDataStyle.name[ opts.data_style ])
-			return
-		
-		if batch_mode:
-			print u"Processing {0}: ".format(filename)
-			
-		md = create_local_metadata( opts, ca, has[ opts.data_style ] )
-
-		# now, search online
-		if opts.search_online:
-			if opts.issue_id is not None:
-				# we were given the actual ID to search with
-				try:
-					cv_md = ComicVineTalker().fetchIssueDataByIssueID( opts.issue_id, settings )
-				except ComicVineTalkerException:
-					print "Network error while getting issue details.  Save aborted"
-					return None
-				
-				if cv_md is None:
-					print "No match for ID {0} was found.".format(opts.issue_id)
-					return None
-				
-				if settings.apply_cbl_transform_on_cv_import:
-					cv_md = CBLTransformer( cv_md, settings ).apply()
-			else:
-				ii = IssueIdentifier( ca, settings )
-	
-				if md is None or md.isEmpty:
-					print "No metadata given to search online with!"
-					return
-	
-				def myoutput( text ):
-					if opts.verbose:
-						IssueIdentifier.defaultWriteOutput( text )
-					
-				# use our overlayed MD struct to search
-				ii.setAdditionalMetadata( md )
-				ii.onlyUseAdditionalMetaData = True
-				ii.setOutputFunction( myoutput )
-				ii.cover_page_index = md.getCoverPageIndexList()[0]
-				matches = ii.search()
-				
-				result = ii.search_result
-				
-				found_match = False
-				choices = False
-				low_confidence = False
-				
-				if result == ii.ResultNoMatches:
-					pass
-				elif result == ii.ResultFoundMatchButBadCoverScore:
-					low_confidence = True
-					found_match = True
-				elif result == ii.ResultFoundMatchButNotFirstPage :
-					found_match = True
-				elif result == ii.ResultMultipleMatchesWithBadImageScores:
-					low_confidence = True
-					choices = True
-				elif result == ii.ResultOneGoodMatch:
-					found_match = True
-				elif result == ii.ResultMultipleGoodMatches:
-					choices = True
-	
-				if choices:
-					print "Online search: Multiple matches.  Save aborted"
-					match_results.multipleMatches.append(MultipleMatch(filename,matches))
-					return
-				if low_confidence and opts.abortOnLowConfidence:
-					print "Online search: Low confidence match.  Save aborted"
-					match_results.noMatches.append(filename)
-					return
-				if not found_match:
-					print "Online search: No match found.  Save aborted"
-					match_results.noMatches.append(filename)
-					return
-	
-	
-				# we got here, so we have a single match
-				
-				# now get the particular issue data
-				cv_md = actual_issue_data_fetch(matches[0], settings)
-				if cv_md is None:
-					return
-			
-			md.overlay( cv_md )
-			
-		# ok, done building our metadata. time to save
-		if not actual_metadata_save( ca, opts, md ):
-				match_results.writeFailures.append(filename)
-		else:
-				match_results.goodMatches.append(filename)
-
-	elif opts.rename_file:
-
-		msg_hdr = ""
-		if batch_mode:
-			msg_hdr = u"{0}: ".format(filename)
-
-		if opts.data_style is not None:
-			use_tags = has[ opts.data_style ]
-		else:
-			use_tags = False
-			
-		md = create_local_metadata( opts, ca, use_tags )
-		
-		if md.series is None:
-			print msg_hdr + "Can't rename without series name"
-			return
-
-		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( settings.rename_template )
-		renamer.setIssueZeroPadding( settings.rename_issue_number_padding )
-		renamer.setSmartCleanup( settings.rename_use_smart_string_cleanup )
-		
-		new_name = renamer.determineName( filename, ext=new_ext )
-			
-		if new_name == os.path.basename(filename):
-			print msg_hdr + "Filename is already good!"
-			return
-		
-		folder = os.path.dirname( os.path.abspath( filename ) )
-		new_abs_path = utils.unique_file( os.path.join( folder, new_name ) )
-
-		suffix = ""
-		if not opts.dryrun:
-			# rename the file
-			os.rename( filename, new_abs_path )
-		else:
-			suffix = " (dry-run, no change)"
-
-		print u"renamed '{0}' -> '{1}' {2}".format(os.path.basename(filename), new_name, suffix)
-
-#-----------------------------
-
-def main():
-	
-	# try to make stdout encodings happy for unicode
-	if platform.system() == "Darwin":
-		preferred_encoding = "utf-8"
-	else:
-		preferred_encoding = locale.getpreferredencoding()
-	sys.stdout = codecs.getwriter(preferred_encoding)(sys.stdout)
-
-	opts = Options()
-	opts.parseCmdLineArgs()
-
-	settings = ComicTaggerSettings()
-	# make sure unrar program is in the path for the UnRAR class
-	utils.addtopath(os.path.dirname(settings.unrar_exe_path))
-	
-	signal.signal(signal.SIGINT, signal.SIG_DFL)
-	
-	if not qt_available and not opts.no_gui:
-		opts.no_gui = True
-		print "QT is not available."
-	
-	if opts.no_gui:
-		cli_mode( opts, settings )
-		
-	else:
-
-		app = QtGui.QApplication(sys.argv)
-		
-		if platform.system() != "Linux":
-			img =  QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/tags.png' ))
-			splash = QtGui.QSplashScreen(img)
-			splash.show()
-			splash.raise_()
-			app.processEvents()
-	
-		try:			
-			tagger_window = TaggerWindow( opts.file_list, settings )
-			tagger_window.show()
-
-			if platform.system() != "Linux":
-				splash.finish( tagger_window )
-
-			sys.exit(app.exec_())
-		except Exception, e:
-			QtGui.QMessageBox.critical(QtGui.QMainWindow(), "Error", "Unhandled exception in app:\n" + traceback.format_exc() )
-			
-			
-if __name__ == "__main__":
-	main()
-    
-    
-    
-    
+if __name__ == '__main__':
+	ctmain()

comictaggerlib/UnRAR2/unix.py

@@ -120,7 +120,9 @@ class RarFileImplementation(object):
             if len(accum)==2:
                 data = {}
                 data['index'] = i
-                data['filename'] = accum[0].strip()
+                #!!!ATB - changed this because it was choking when a folder or file started with a space.
+                #!!!      now, just strip off the first char in the string
+                data['filename'] = accum[0].rstrip()[1:]
                 info = re_spaces.split(accum[1].strip())
                 data['size'] = int(info[0])
                 attr = info[5]

comictaggerlib/autotagmatchwindow.py

@@ -26,7 +26,10 @@ from PyQt4.QtCore import QUrl, pyqtSignal, QByteArray
 
 from imagefetcher import  ImageFetcher
 from settings import ComicTaggerSettings
-from options import MetaDataStyle
+from comicarchive import MetaDataStyle
+from coverimagewidget import CoverImageWidget
+from comicvinetalker import ComicVineTalker
+import utils
 
 class AutoTagMatchWindow(QtGui.QDialog):
 	
@@ -35,11 +38,27 @@ class AutoTagMatchWindow(QtGui.QDialog):
 	def __init__(self, parent, match_set_list, style, fetch_func):
 		super(AutoTagMatchWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'autotagmatchwindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('autotagmatchwindow.ui' ), self)
 
-		self.skipButton = QtGui.QPushButton(self.tr("Skip"))
+		self.altCoverWidget = CoverImageWidget( self.altCoverContainer, CoverImageWidget.AltCoverMode )
+		gridlayout = QtGui.QGridLayout( self.altCoverContainer )
+		gridlayout.addWidget( self.altCoverWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+
+		self.archiveCoverWidget = CoverImageWidget( self.archiveCoverContainer, CoverImageWidget.ArchiveMode )
+		gridlayout = QtGui.QGridLayout( self.archiveCoverContainer )
+		gridlayout.addWidget( self.archiveCoverWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+
+		utils.reduceWidgetFontSize( self.twList )		
+
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)		
+				
+		self.skipButton = QtGui.QPushButton(self.tr("Skip to Next"))
 		self.buttonBox.addButton(self.skipButton, QtGui.QDialogButtonBox.ActionRole)		
-		self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setText("Accept and Next")		
+		self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setText("Accept and Write Tags")		
 
 		self.match_set_list = match_set_list
 		self.style = style
@@ -57,18 +76,18 @@ class AutoTagMatchWindow(QtGui.QDialog):
 
 		self.current_match_set = self.match_set_list[ self.current_match_set_idx ]
 
-
 		if self.current_match_set_idx + 1 == len( self.match_set_list ):
-			self.skipButton.setDisabled(True)
+			self.buttonBox.button(QtGui.QDialogButtonBox.Cancel).setDisabled(True)	
+			#self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setText("Accept")		
+			self.skipButton.setText(self.tr("Skip"))
 			
 		self.setCoverImage()
 		self.populateTable()
 		self.twList.resizeColumnsToContents()	
-		self.current_row = 0
 		self.twList.selectRow( 0 )
 		
 		path = self.current_match_set.ca.path
-		self.setWindowTitle( u"Select correct match ({0} of {1}): {2}".format(
+		self.setWindowTitle( u"Select correct match or skip ({0} of {1}): {2}".format(
 						self.current_match_set_idx+1,
 						len( self.match_set_list ),
 						os.path.split(path)[1] ))
@@ -87,6 +106,7 @@ class AutoTagMatchWindow(QtGui.QDialog):
 			item_text = match['series']  
 			item = QtGui.QTableWidgetItem(item_text)			
 			item.setData( QtCore.Qt.ToolTipRole, item_text )
+			item.setData( QtCore.Qt.UserRole, (match,))
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 0, item)
 
@@ -99,19 +119,33 @@ class AutoTagMatchWindow(QtGui.QDialog):
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 1, item)
 			
-			item_text = ""
+			month_str = u""
+			year_str = u"????"
 			if match['month'] is not None:
-				item_text = u"{0}/".format(match['month'])
+				month_str = u"-{0:02d}".format(int(match['month']))
 			if match['year'] is not None:
-				item_text += u"{0}".format(match['year'])
-			else:
-				item_text += u"????"
+				year_str = u"{0}".format(match['year'])
+
+			item_text = year_str + month_str			
 			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)
+
+			item_text = match['issue_title']  
+			item = QtGui.QTableWidgetItem(item_text)			
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
+			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
+			self.twList.setItem(row, 3, item)
 			
 			row += 1
+
+		self.twList.resizeColumnsToContents()
+		self.twList.setSortingEnabled(True)
+		self.twList.sortItems( 2 , QtCore.Qt.AscendingOrder )
+		self.twList.selectRow(0)
+		self.twList.resizeColumnsToContents()
+		self.twList.horizontalHeader().setStretchLastSection(True) 
 			
 
 	def cellDoubleClicked( self, r, c ):
@@ -123,34 +157,18 @@ class AutoTagMatchWindow(QtGui.QDialog):
 			return
 		if prev is not None and prev.row() == curr.row():
 				return
-
-		self.current_row = curr.row()
 		
-		# list selection was changed, update the the issue cover				
-		self.labelThumbnail.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
-				
-		self.cover_fetcher = ImageFetcher( )
-		self.cover_fetcher.fetchComplete.connect(self.coverFetchComplete)
-		self.cover_fetcher.fetch( self.current_match_set.matches[self.current_row]['img_url'] )
-				
-	# called when the image is done loading
-	def coverFetchComplete( self, image_data, issue_id ):
-		img = QtGui.QImage()
-		img.loadFromData( image_data )
-		self.labelThumbnail.setPixmap(QtGui.QPixmap(img))
+		self.altCoverWidget.setIssueID( self.currentMatch()['issue_id'] )
 		
 	def setCoverImage( self ):
 		ca = self.current_match_set.ca
-		cover_idx = ca.readMetadata(self.style).getCoverPageIndexList()[0]
-		image_data = ca.getPage( cover_idx )		
-		self.labelCover.setScaledContents(True)
-		if image_data is not None:
-			img = QtGui.QImage()
-			img.loadFromData( image_data )
-			self.labelCover.setPixmap(QtGui.QPixmap(img))
-		else:
-			self.labelCover.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
+		self.archiveCoverWidget.setArchive(ca)
 
+	def currentMatch( self ):
+		row = self.twList.currentRow()
+		match = self.twList.item(row, 0).data( QtCore.Qt.UserRole ).toPyObject()[0]
+		return match
+	
 	def accept(self):
 
 		self.saveMatch()
@@ -184,7 +202,7 @@ class AutoTagMatchWindow(QtGui.QDialog):
 			
 	def saveMatch( self ):
 		
-		match = self.current_match_set.matches[self.current_row]
+		match = self.currentMatch()
 		ca = self.current_match_set.ca
 
 		md = ca.readMetadata( self.style )

comictaggerlib/autotagprogresswindow.py

@@ -22,7 +22,7 @@ import sys
 from PyQt4 import QtCore, QtGui, uic
 import os
 from settings import ComicTaggerSettings
-
+import utils
 
 class AutoTagProgressWindow(QtGui.QDialog):
 	
@@ -30,17 +30,16 @@ class AutoTagProgressWindow(QtGui.QDialog):
 	def __init__(self, parent):
 		super(AutoTagProgressWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'autotagprogresswindow.ui' ), self)
-		self.lblTest.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
-		self.lblArchive.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
+		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.isdone = False
-		
-		# we can't specify relative font sizes in the UI designer, so
-		# make font for scroll window a smidge smaller
-		f = self.textEdit.font()
-		if f.pointSize() > 10:
-			f.setPointSize( f.pointSize() - 2 )
-		self.textEdit.setFont( f )		
+
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)
+
+		utils.reduceWidgetFontSize( self.textEdit )	
 		
 	def setArchiveImage( self, img_data):
 		self.setCoverImage( img_data, self.lblArchive )
@@ -55,7 +54,7 @@ class AutoTagProgressWindow(QtGui.QDialog):
 			label.setPixmap(QtGui.QPixmap(img))
 			label.setScaledContents(True)
 		else:
-			label.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
+			label.setPixmap(QtGui.QPixmap(ComicTaggerSettings.getGraphic('nocover.png')))
 			label.setScaledContents(True)
 		QtCore.QCoreApplication.processEvents()
 		QtCore.QCoreApplication.processEvents()

comictaggerlib/autotagstartwindow.py

@@ -32,9 +32,12 @@ class AutoTagStartWindow(QtGui.QDialog):
 	def __init__( self, parent,  settings, msg ):
 		super(AutoTagStartWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'autotagstartwindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('autotagstartwindow.ui' ), self)
 		self.label.setText( msg )
 
+		self.setWindowFlags(self.windowFlags() &
+									  ~QtCore.Qt.WindowContextHelpButtonHint )
+
 		self.settings = settings
 		
 		self.cbxSaveOnLowConfidence.setCheckState( QtCore.Qt.Unchecked )
@@ -58,7 +61,7 @@ class AutoTagStartWindow(QtGui.QDialog):
 		ssTip = (
 			"""<html>
 			The <b>series search string</b> specifies the search string to be used for all selected archives.
-			Use this only when trying to match archives with hard-to-parse filenames.  All archives selected
+			Use this when trying to match archives with hard-to-parse or incorrect filenames.  All archives selected
 			should be from the same series.
 			</html>"""
 		)

comictaggerlib/cli.py

@@ -0,0 +1,536 @@
+#!/usr/bin/python
+
+"""
+Comic tagger CLI functions
+"""
+
+"""
+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 signal
+import os
+import traceback
+import time
+from pprint import pprint
+import json
+import platform
+import locale
+
+filename_encoding = sys.getfilesystemencoding()
+
+from settings import ComicTaggerSettings
+from options import Options
+from comicarchive import ComicArchive, MetaDataStyle
+from issueidentifier import IssueIdentifier
+from genericmetadata import GenericMetadata
+from comicvinetalker import ComicVineTalker, ComicVineTalkerException
+from filerenamer import FileRenamer
+from cbltransformer import CBLTransformer
+
+import utils
+import codecs
+
+class MultipleMatch():
+	def __init__( self, filename, match_list):
+		self.filename = filename  
+		self.matches = match_list  
+
+class OnlineMatchResults():
+	def __init__(self):
+		self.goodMatches = []  
+		self.noMatches = []    
+		self.multipleMatches = []  
+		self.lowConfidenceMatches = []  
+		self.writeFailures = []
+		self.fetchDataFailures = []
+		
+#-----------------------------
+
+def actual_issue_data_fetch( match, settings ):
+
+	# now get the particular issue data
+	try:
+		cv_md = ComicVineTalker().fetchIssueData( match['volume_id'],  match['issue_number'], settings )
+	except ComicVineTalkerException:
+		print >> sys.stderr, "Network error while getting issue details.  Save aborted"
+		return None
+
+	if settings.apply_cbl_transform_on_cv_import:
+		cv_md = CBLTransformer( cv_md, settings ).apply()
+		
+	return cv_md
+
+def actual_metadata_save( ca, opts, md ):
+
+	if not opts.dryrun:
+		# write out the new data
+		if not ca.writeMetadata( md, opts.data_style ):
+			print >> sys.stderr,"The tag save seemed to fail!"
+			return False
+		else:
+			print >> sys.stderr,"Save complete."				
+	else:
+		if opts.terse:
+			print >> sys.stderr,"dry-run option was set, so nothing was written"
+		else:
+			print >> sys.stderr,"dry-run option was set, so nothing was written, but here is the final set of tags:"
+			print u"{0}".format(md)
+	return True
+
+def display_match_set_for_choice( label, match_set, opts, settings ):
+	print "{0} -- {1}:".format(match_set.filename, label )
+
+	# sort match list by year
+	match_set.matches.sort(key=lambda k: k['year'])			
+	
+	for (counter,m) in enumerate(match_set.matches):
+		counter += 1
+		print u"    {0}. {1} #{2} [{3}] ({4}/{5}) - {6}".format(counter,
+									   m['series'],
+									   m['issue_number'],
+									   m['publisher'],
+									   m['month'],
+									   m['year'],
+									   m['issue_title'])
+	if opts.interactive:
+		while True:
+			i = raw_input("Choose a match #, or 's' to skip: ")
+			if (i.isdigit() and int(i) in range(1,len(match_set.matches)+1)) or i == 's':
+				break
+		if i != 's':
+			i = int(i) - 1
+			# save the data!
+			# we know at this point, that the file is all good to go
+			ca = ComicArchive( match_set.filename, settings )
+			md = create_local_metadata( opts, ca, ca.hasMetadata(opts.data_style) )
+			cv_md = actual_issue_data_fetch(match_set.matches[int(i)], settings)
+			md.overlay( cv_md )
+			actual_metadata_save( ca, opts, md )
+	
+
+def post_process_matches( match_results, opts, settings ):
+	# now go through the match results
+	if opts.show_save_summary:
+		if len( match_results.goodMatches ) > 0:
+			print "\nSuccessful matches:"
+			print "------------------"
+			for f in match_results.goodMatches:
+				print f
+				
+		if len( match_results.noMatches ) > 0:
+			print "\nNo matches:"
+			print "------------------"
+			for f in match_results.noMatches:
+				print f
+	
+		if len( match_results.writeFailures ) > 0:
+			print "\nFile Write Failures:"
+			print "------------------"
+			for f in match_results.writeFailures:
+				print f
+
+		if len( match_results.fetchDataFailures ) > 0:
+			print "\nNetwork Data Fetch Failures:"
+			print "------------------"
+			for f in match_results.fetchDataFailures:
+				print f
+
+	if not opts.show_save_summary and not opts.interactive:
+		#just quit if we're not interactive or showing the summary
+		return
+	
+	if len( match_results.multipleMatches ) > 0:
+		print "\nArchives with multiple high-confidence matches:"
+		print "------------------"
+		for match_set in match_results.multipleMatches:
+			display_match_set_for_choice( "Multiple high-confidence matches", match_set, opts, settings )
+
+	if len( match_results.lowConfidenceMatches ) > 0:
+		print "\nArchives with low-confidence matches:"
+		print "------------------"
+		for match_set in match_results.lowConfidenceMatches:
+			if len( match_set.matches) == 1:
+				label = "Single low-confidence match"
+			else:
+				label = "Multiple low-confidence matches"
+				
+			display_match_set_for_choice( label, match_set, opts, settings )
+
+
+def cli_mode( opts, settings ):
+	if len( opts.file_list ) < 1:
+		print >> sys.stderr,"You must specify at least one filename.  Use the -h option for more info"
+		return
+	
+	match_results = OnlineMatchResults()
+	
+	for f in opts.file_list:
+		if type(f) ==  str:
+			f = f.decode(filename_encoding, 'replace')
+		process_file_cli( f, opts, settings, match_results )
+		sys.stdout.flush()
+		
+	post_process_matches( match_results, opts, settings )	
+
+
+def create_local_metadata( opts, ca, has_desired_tags ):
+	
+	md = GenericMetadata()
+	md.setDefaultPageList( ca.getNumberOfPages() )
+	
+	if has_desired_tags:
+		md = ca.readMetadata( opts.data_style )
+		
+	# now, overlay the parsed filename info	
+	if opts.parse_filename:
+		md.overlay( ca.metadataFromFilename() )
+	
+	# finally, use explicit stuff	
+	if opts.metadata is not None:
+		md.overlay( opts.metadata )
+
+	return md
+
+def process_file_cli( filename, opts, settings, match_results ):
+
+	batch_mode = len( opts.file_list ) > 1
+		
+	ca = ComicArchive(filename, settings)
+	
+	if not os.path.lexists( filename ):
+		print >> sys.stderr,"Cannot find "+ filename
+		return
+		
+	if not ca.seemsToBeAComicArchive():
+		print >> sys.stderr,"Sorry, but "+ filename + "  is not a comic archive!"
+		return
+	
+	#if not ca.isWritableForStyle( opts.data_style ) and ( opts.delete_tags or opts.save_tags or opts.rename_file ):
+	if not ca.isWritable(  ) and ( opts.delete_tags or opts.copy_tags or opts.save_tags or opts.rename_file ):
+		print >> sys.stderr,"This archive is not writable for that tag type"
+		return
+
+	has = [ False, False, False ]
+	if ca.hasCIX(): has[ MetaDataStyle.CIX ] = True
+	if ca.hasCBI(): has[ MetaDataStyle.CBI ] = True
+	if ca.hasCoMet(): has[ MetaDataStyle.COMET ] = True
+
+	if opts.print_tags:
+
+
+		if opts.data_style is None:
+			page_count = ca.getNumberOfPages()
+
+			brief = ""
+
+			if batch_mode:
+				brief = u"{0}: ".format(filename)
+
+			if ca.isZip():      brief += "ZIP archive    "
+			elif ca.isRar():    brief += "RAR archive    "
+			elif ca.isFolder(): brief += "Folder archive "
+				
+			brief += "({0: >3} pages)".format(page_count)			
+			brief += "  tags:[ "
+
+			if not ( has[ MetaDataStyle.CBI ] or has[ MetaDataStyle.CIX ] or has[ MetaDataStyle.COMET ] ):
+				brief += "none "
+			else:
+				if has[ MetaDataStyle.CBI ]: brief += "CBL "
+				if has[ MetaDataStyle.CIX ]: brief += "CR "
+				if has[ MetaDataStyle.COMET ]: brief += "CoMet "
+			brief += "]"
+				
+			print brief
+
+		if opts.terse:
+			return
+
+		print
+		
+		if opts.data_style is None or opts.data_style == MetaDataStyle.CIX:
+			if has[ MetaDataStyle.CIX ]:
+				print "------ComicRack tags--------"
+				if opts.raw:
+					print u"{0}".format(unicode(ca.readRawCIX(), errors='ignore'))
+				else:
+					print u"{0}".format(ca.readCIX())
+				
+		if opts.data_style is None or opts.data_style == MetaDataStyle.CBI:
+			if has[ MetaDataStyle.CBI ]:
+				print "------ComicBookLover tags--------"
+				if opts.raw:
+					pprint(json.loads(ca.readRawCBI()))
+				else:
+					print u"{0}".format(ca.readCBI())
+					
+		if opts.data_style is None or opts.data_style == MetaDataStyle.COMET:
+			if has[ MetaDataStyle.COMET ]:
+				print "------CoMet tags--------"
+				if opts.raw:
+					print u"{0}".format(ca.readRawCoMet())
+				else:
+					print u"{0}".format(ca.readCoMet())
+			
+			
+	elif opts.delete_tags:
+		style_name = MetaDataStyle.name[ opts.data_style ]
+		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 )
+				else:
+					print "{0}: Removed {1} tags.".format( filename, style_name )
+			else:
+				print "{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 )
+
+	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)
+			return
+		if opts.copy_source == opts.data_style:
+			print "{0}: Destination and source are same: {1}.  Nothing to do.".format(filename, dst_style_name)
+			return
+			
+		src_style_name = MetaDataStyle.name[ opts.copy_source ]
+		if has[ opts.copy_source ]:
+			if not opts.dryrun:
+				md = ca.readMetadata( opts.copy_source )
+				
+				if settings.apply_cbl_transform_on_bulk_operation and opts.data_style == MetaDataStyle.CBI:
+					md = CBLTransformer( md, settings ).apply()
+				
+				if not ca.writeMetadata( md, opts.data_style ):
+					print u"{0}: Tag copy seemed to fail!".format( filename )
+				else:
+					print u"{0}: Copied {1} tags to {2} .".format( filename, src_style_name, dst_style_name )
+			else:
+				print u"{0}: dry-run.  {1} tags not copied".format( filename, src_style_name )		
+		else:
+			print u"{0}: This archive doesn't have {1} tags to copy.".format( filename, src_style_name )
+
+		
+	elif opts.save_tags:
+
+		if opts.no_overwrite and has[ opts.data_style ]:
+			print u"{0}: Already has {1} tags.  Not overwriting.".format(filename, MetaDataStyle.name[ opts.data_style ])
+			return
+		
+		if batch_mode:
+			print u"Processing {0}...".format(filename)
+			
+		md = create_local_metadata( opts, ca, has[ opts.data_style ] )
+
+		# now, search online
+		if opts.search_online:
+			if opts.issue_id is not None:
+				# we were given the actual ID to search with
+				try:
+					cv_md = ComicVineTalker().fetchIssueDataByIssueID( opts.issue_id, settings )
+				except ComicVineTalkerException:
+					print >> sys.stderr,"Network error while getting issue details.  Save aborted"
+					match_results.fetchDataFailures.append(filename)
+					return
+				
+				if cv_md is None:
+					print >> sys.stderr,"No match for ID {0} was found.".format(opts.issue_id)
+					match_results.noMatches.append(filename)
+					return
+				
+				if settings.apply_cbl_transform_on_cv_import:
+					cv_md = CBLTransformer( cv_md, settings ).apply()
+			else:
+				ii = IssueIdentifier( ca, settings )
+	
+				if md is None or md.isEmpty:
+					print >> sys.stderr,"No metadata given to search online with!"
+					match_results.noMatches.append(filename)
+					return
+	
+				def myoutput( text ):
+					if opts.verbose:
+						IssueIdentifier.defaultWriteOutput( text )
+					
+				# use our overlayed MD struct to search
+				ii.setAdditionalMetadata( md )
+				ii.onlyUseAdditionalMetaData = True
+				ii.setOutputFunction( myoutput )
+				ii.cover_page_index = md.getCoverPageIndexList()[0]
+				matches = ii.search()
+				
+				result = ii.search_result
+				
+				found_match = False
+				choices = False
+				low_confidence = False
+				
+				if result == ii.ResultNoMatches:
+					pass
+				elif result == ii.ResultFoundMatchButBadCoverScore:
+					low_confidence = True
+					found_match = True
+				elif result == ii.ResultFoundMatchButNotFirstPage :
+					found_match = True
+				elif result == ii.ResultMultipleMatchesWithBadImageScores:
+					low_confidence = True
+					choices = True
+				elif result == ii.ResultOneGoodMatch:
+					found_match = True
+				elif result == ii.ResultMultipleGoodMatches:
+					choices = True
+	
+				if choices:
+					if low_confidence:
+						print >> sys.stderr,"Online search: Multiple low confidence matches.  Save aborted"
+						match_results.lowConfidenceMatches.append(MultipleMatch(filename,matches))
+						return
+					else:
+						print >> sys.stderr,"Online search: Multiple good matches.  Save aborted"
+						match_results.multipleMatches.append(MultipleMatch(filename,matches))
+						return
+				if low_confidence and opts.abortOnLowConfidence:
+					print >> sys.stderr,"Online search: Low confidence match.  Save aborted"
+					match_results.lowConfidenceMatches.append(MultipleMatch(filename,matches))
+					return
+				if not found_match:
+					print >> sys.stderr,"Online search: No match found.  Save aborted"
+					match_results.noMatches.append(filename)
+					return
+	
+	
+				# we got here, so we have a single match
+				
+				# now get the particular issue data
+				cv_md = actual_issue_data_fetch(matches[0], settings)
+				if cv_md is None:
+					match_results.fetchDataFailures.append(filename)
+					return
+			
+			md.overlay( cv_md )
+			
+		# ok, done building our metadata. time to save
+		if not actual_metadata_save( ca, opts, md ):
+				match_results.writeFailures.append(filename)
+		else:
+				match_results.goodMatches.append(filename)
+
+	elif opts.rename_file:
+
+		msg_hdr = ""
+		if batch_mode:
+			msg_hdr = u"{0}: ".format(filename)
+
+		if opts.data_style is not None:
+			use_tags = has[ opts.data_style ]
+		else:
+			use_tags = False
+			
+		md = create_local_metadata( opts, ca, use_tags )
+		
+		if md.series is None:
+			print >> sys.stderr, msg_hdr + "Can't rename without series name"
+			return
+
+		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( settings.rename_template )
+		renamer.setIssueZeroPadding( settings.rename_issue_number_padding )
+		renamer.setSmartCleanup( settings.rename_use_smart_string_cleanup )
+		
+		new_name = renamer.determineName( filename, ext=new_ext )
+			
+		if new_name == os.path.basename(filename):
+			print >> sys.stderr, msg_hdr + "Filename is already good!"
+			return
+		
+		folder = os.path.dirname( os.path.abspath( filename ) )
+		new_abs_path = utils.unique_file( os.path.join( folder, new_name ) )
+
+		suffix = ""
+		if not opts.dryrun:
+			# rename the file
+			os.rename( filename, new_abs_path )
+		else:
+			suffix = " (dry-run, no change)"
+
+		print u"renamed '{0}' -> '{1}' {2}".format(os.path.basename(filename), new_name, suffix)
+
+	elif opts.export_to_zip:
+		msg_hdr = ""
+		if batch_mode:
+			msg_hdr = u"{0}: ".format(filename)
+
+		if not ca.isRar():
+			print >> sys.stderr, msg_hdr + "Archive is not a RAR."
+			return
+		
+		rar_file = os.path.abspath( os.path.abspath( filename ) )
+		new_file = os.path.splitext(rar_file)[0] + ".cbz"
+		
+		if opts.abort_export_on_conflict and os.path.lexists( new_file ):
+			print  msg_hdr + "{0} already exists in the that folder.".format(os.path.split(new_file)[1])
+			return
+		
+		new_file = utils.unique_file( os.path.join( new_file ) )
+	
+		delete_success = False
+		export_success = False
+		if not opts.dryrun:
+			if ca.exportAsZip( new_file ):
+				export_success = True
+				if opts.delete_rar_after_export:
+					try:
+						os.unlink( rar_file )
+					except:
+						print >> sys.stderr, msg_hdr + "Error deleting original RAR after export"
+						delete_success = False
+					else:
+						delete_success = True
+			else:
+				# last export failed, so remove the zip, if it exists
+				if os.path.lexists( new_file ):
+					os.remove( new_file )
+		else:
+			msg = msg_hdr + u"Dry-run:  Would try to create {0}".format(os.path.split(new_file)[1])
+			if opts.delete_rar_after_export:
+				msg += u" and delete orginal."
+			print msg
+			return
+			
+		msg = msg_hdr
+		if export_success:
+			msg += u"Archive exported successfully to: {0}".format( os.path.split(new_file)[1] )
+			if opts.delete_rar_after_export and delete_success:
+				msg += u" (Original deleted) "
+		else:
+			msg += u"Archive failed to export!"
+			
+		print msg
+
+
+
+    
+    

comictaggerlib/comicarchive.py

@@ -40,7 +40,6 @@ sys.path.insert(0, os.path.abspath(".") )
 import UnRAR2
 from UnRAR2.rar_exceptions import *
 
-from options import Options, MetaDataStyle
 from comicinfoxml import ComicInfoXml
 from comicbookinfo import ComicBookInfo
 from comet import CoMet
@@ -48,6 +47,12 @@ from genericmetadata import GenericMetadata, PageType
 from filenameparser import FileNameParser
 from settings import ComicTaggerSettings
 
+class MetaDataStyle:
+	CBI = 0
+	CIX = 1
+	COMET = 2
+	name = [ 'ComicBookLover', 'ComicRack', 'CoMet' ]
+
 class ZipArchiver:
 	
 	def __init__( self, path ):
@@ -68,12 +73,12 @@ class ZipArchiver:
 		try:
 			data = zf.read( archive_file )
 		except zipfile.BadZipfile as e:
-			print "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
+			print >> sys.stderr, "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
 			zf.close()	
 			raise IOError
 		except Exception as e:
 			zf.close()	
-			print "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
+			print >> sys.stderr, "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
 			raise IOError
 		finally:
 			zf.close()
@@ -112,7 +117,7 @@ class ZipArchiver:
 	def rebuildZipFile( self, exclude_list ):
 		
 		# this recompresses the zip archive, without the files in the exclude_list
-		#print "Rebuilding zip {0} without {1}".format( self.path, exclude_list )
+		#print ">> sys.stderr, Rebuilding zip {0} without {1}".format( self.path, exclude_list )
 		
 		# generate temp file
 		tmp_fd, tmp_name = tempfile.mkstemp( dir=os.path.dirname(self.path) )
@@ -215,7 +220,7 @@ class ZipArchiver:
 				if not self.writeZipComment( self.path, comment ):
 					return False
 		except  Exception as e:
-			print "Error while copying to {0}: {1}".format(self.path, e)
+			print >> sys.stderr, "Error while copying to {0}: {1}".format(self.path, e)
 			return False
 		else:
 			return True
@@ -227,9 +232,9 @@ class ZipArchiver:
 class RarArchiver:
 	
 	devnull = None
-	def __init__( self, path ):
+	def __init__( self, path, settings ):
 		self.path = path
-		self.rar_exe_path = None
+		self.settings = settings
 
 		if RarArchiver.devnull is None:
 			RarArchiver.devnull = open(os.devnull, "w")
@@ -252,7 +257,7 @@ class RarArchiver:
 
 	def setArchiveComment( self, comment ):
 
-		if self.rar_exe_path is not None:
+		if self.settings.rar_exe_path is not None:
 			try:
 				# write comment to temp file
 				tmp_fd, tmp_name = tempfile.mkstemp()
@@ -263,7 +268,7 @@ class RarArchiver:
 				working_dir = os.path.dirname( os.path.abspath( self.path ) )
 
 				# use external program to write comment to Rar archive
-				subprocess.call([self.rar_exe_path, 'c', '-w' + working_dir , '-c-', '-z' + tmp_name, self.path], 
+				subprocess.call([self.settings.rar_exe_path, 'c', '-w' + working_dir , '-c-', '-z' + tmp_name, self.path], 
 					startupinfo=self.startupinfo, 
 					stdout=RarArchiver.devnull)
 				
@@ -294,22 +299,22 @@ class RarArchiver:
 				entries = rarc.read_files( archive_file )
 
 				if entries[0][0].size != len(entries[0][1]):
-					print "readArchiveFile(): [file is not expected size: {0} vs {1}]  {2}:{3} [attempt # {4}]".format(
+					print >> sys.stderr, "readArchiveFile(): [file is not expected size: {0} vs {1}]  {2}:{3} [attempt # {4}]".format(
 								entries[0][0].size,len(entries[0][1]), self.path, archive_file, tries)
 					continue
 				
 			except (OSError, IOError) as e:
-				print "readArchiveFile(): [{0}]  {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
+				print >> sys.stderr, "readArchiveFile(): [{0}]  {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
 				time.sleep(1)
 			except Exception as e:
-				print "Unexpected exception in readArchiveFile(): [{0}] for {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
+				print >> sys.stderr, "Unexpected exception in readArchiveFile(): [{0}] for {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
 				break
 
 			else:
 				#Success"
 				#entries is a list of of tuples:  ( rarinfo, filedata)
 				if tries > 1:
-					print "Attempted read_files() {0} times".format(tries)
+					print >> sys.stderr, "Attempted read_files() {0} times".format(tries)
 				if (len(entries) == 1):
 					return entries[0][1]
 				else:
@@ -321,7 +326,7 @@ class RarArchiver:
 		
 	def writeArchiveFile( self, archive_file, data ):
 
-		if self.rar_exe_path is not None:
+		if self.settings.rar_exe_path is not None:
 			try:
 				tmp_folder = tempfile.mkdtemp()
 
@@ -336,7 +341,7 @@ class RarArchiver:
 				f.close()
 				
 				# use external program to write file to Rar archive
-				subprocess.call([self.rar_exe_path, 'a', '-w' + working_dir ,'-c-', '-ep', self.path, tmp_file], 
+				subprocess.call([self.settings.rar_exe_path, 'a', '-w' + working_dir ,'-c-', '-ep', self.path, tmp_file], 
 					startupinfo=self.startupinfo,
 					stdout=RarArchiver.devnull)
 
@@ -352,10 +357,10 @@ class RarArchiver:
 			return False
 			
 	def removeArchiveFile( self, archive_file ):
-		if self.rar_exe_path is not None:
+		if self.settings.rar_exe_path is not None:
 			try:
 				# use external program to remove file from Rar archive
-				subprocess.call([self.rar_exe_path, 'd','-c-', self.path, archive_file], 
+				subprocess.call([self.settings.rar_exe_path, 'd','-c-', self.path, archive_file], 
 					startupinfo=self.startupinfo, 				   
 					stdout=RarArchiver.devnull)
 
@@ -385,7 +390,7 @@ class RarArchiver:
 						namelist.append( item.filename )
 			
 			except (OSError, IOError) as e:
-				print "getArchiveFilenameList(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
+				print >> sys.stderr, "getArchiveFilenameList(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
 				time.sleep(1)
 
 			else:
@@ -403,7 +408,7 @@ class RarArchiver:
 				rarc = UnRAR2.RarFile( self.path )
 			
 			except (OSError, IOError) as e:
-				print "getRARObj(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
+				print >> sys.stderr, "getRARObj(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
 				time.sleep(1)
 
 			else:
@@ -503,11 +508,12 @@ class ComicArchive:
 	class ArchiveType:
 		Zip, Rar, Folder, Unknown = range(4)
     
-	def __init__( self, path ):
+	def __init__( self, path, settings ):
 		self.path = path
 		self.ci_xml_filename = 'ComicInfo.xml'
 		self.comet_default_filename = 'CoMet.xml'
 		self.resetCache()
+		self.settings = settings
 		
 		if self.zipTest():
 			self.archive_type =  self.ArchiveType.Zip
@@ -515,7 +521,7 @@ class ComicArchive:
 			
 		elif self.rarTest(): 
 			self.archive_type =  self.ArchiveType.Rar
-			self.archiver = RarArchiver( self.path )
+			self.archiver = RarArchiver( self.path, settings )
 			
 		elif os.path.isdir( self.path ):
 			self.archive_type =  self.ArchiveType.Folder
@@ -525,9 +531,9 @@ class ComicArchive:
 			self.archiver = UnknownArchiver( self.path )
 
 		if ComicArchive.logo_data is None:
-			fname = os.path.join(ComicTaggerSettings.baseDir(), 'graphics','nocover.png' )
+			fname = ComicTaggerSettings.getGraphic('nocover.png')
 			with open(fname, 'rb') as fd:
-				ComicArchive.logo_data = fd.read()				
+				ComicArchive.logo_data = fd.read()
 
 	# Clears the cached data
 	def resetCache( self ):
@@ -548,10 +554,6 @@ class ComicArchive:
 	def rename( self, path ):
 		self.path = path
 		self.archiver.path = path
-		
-	def setExternalRarProgram( self, rar_exe_path ):
-		if self.isRar():
-			self.archiver.rar_exe_path = rar_exe_path
 
 	def zipTest( self ):
 		return zipfile.is_zipfile( self.path )
@@ -578,7 +580,7 @@ class ComicArchive:
 		if self.archive_type == self.ArchiveType.Unknown :
 			return False
 		
-		elif check_rar_status and self.isRar() and self.archiver.rar_exe_path is None:
+		elif check_rar_status and self.isRar() and self.settings.rar_exe_path is None:
 			return False
 			
 		elif not os.access(self.path, os.W_OK):
@@ -603,7 +605,7 @@ class ComicArchive:
 		ext = os.path.splitext(self.path)[1].lower()
 
 		if ( 
-		      ( self.isZip() or  self.isRar() or self.isFolder() )
+		      ( self.isZip() or  self.isRar() ) #or self.isFolder() )
 		      and
 		      ( self.getNumberOfPages() > 2)
 
@@ -666,7 +668,7 @@ class ComicArchive:
 			try:
 				image_data = self.archiver.readArchiveFile( filename )
 			except IOError:
-				print "Error reading in page.  Substituting logo page."
+				print >> sys.stderr, "Error reading in page.  Substituting logo page."
 				image_data = ComicArchive.logo_data				
 
 		return image_data
@@ -694,7 +696,7 @@ class ComicArchive:
 			# make a sub-list of image files
 			self.page_list = []
 			for name in files:
-				if ( name[-4:].lower() in [ ".jpg", "jpeg", ".png" ] and os.path.basename(name)[0] != "." ):
+				if ( name[-4:].lower() in [ ".jpg", "jpeg", ".png", ".gif" ] and os.path.basename(name)[0] != "." ):
 					self.page_list.append(name)
 				
 		return self.page_list
@@ -851,13 +853,13 @@ class ComicArchive:
 
 	def readRawCoMet( self ):
 		if not self.hasCoMet():
-			print self.path, "doesn't have CoMet data!"
+			print >> sys.stderr, self.path, "doesn't have CoMet data!"
 			return None
 
 		try:
 			raw_comet = self.archiver.readArchiveFile( self.comet_filename )
 		except IOError:
-			print "Error reading in raw CoMet!"
+			print >> sys.stderr, "Error reading in raw CoMet!"
 			raw_comet = ""
 		return  raw_comet
 		
@@ -908,7 +910,7 @@ class ComicArchive:
 						data = self.archiver.readArchiveFile( n )
 					except:
 						data = ""
-						print "Error reading in Comet XML for validation!"
+						print >> sys.stderr, "Error reading in Comet XML for validation!"
 					if CoMet().validateString( data ):
 						# since we found it, save it!
 						self.comet_filename = n

comictaggerlib/comicinfoxml.py

@@ -89,36 +89,21 @@ class ComicInfoXml:
 			if md_entry is not None:
 				ET.SubElement(root, cix_entry).text = u"{0}".format(md_entry)
 
+		assign( 'Title', md.title )
 		assign( 'Series', md.series )
 		assign( 'Number', md.issue )
-		assign( 'Title', md.title )
 		assign( 'Count', md.issueCount )
 		assign( 'Volume', md.volume )
 		assign( 'AlternateSeries', md.alternateSeries )
 		assign( 'AlternateNumber', md.alternateNumber )
+		assign( 'StoryArc', md.storyArc )
+		assign( 'SeriesGroup', md.seriesGroup )
 		assign( 'AlternateCount', md.alternateCount )
 		assign( 'Summary', md.comments )
 		assign( 'Notes', md.notes )
 		assign( 'Year', md.year )
 		assign( 'Month', md.month )
-		assign( 'Publisher', md.publisher )
-		assign( 'Imprint', md.imprint )
-		assign( 'Genre', md.genre )
-		assign( 'Web', md.webLink )
-		assign( 'PageCount', md.pageCount )
-		assign( 'Format', md.format )
-		assign( 'LanguageISO', md.language )
-		assign( 'Manga', md.manga )
-		assign( 'Characters', md.characters )
-		assign( 'Teams', md.teams )
-		assign( 'Locations', md.locations )
-		assign( 'ScanInformation', md.scanInfo )
-		assign( 'StoryArc', md.storyArc )
-		assign( 'SeriesGroup', md.seriesGroup )
-		assign( 'AgeRating', md.maturityRating )
-
-		if md.blackAndWhite is not None and md.blackAndWhite:
-			ET.SubElement(root, 'BlackAndWhite').text = "Yes"
+		assign( 'Day', md.day )
 
 		# need to specially process the credits, since they are structured differently than CIX	
 		credit_writer_list    = list()
@@ -181,7 +166,23 @@ class ComicInfoXml:
 		if len( credit_editor_list ) > 0:
 			node = ET.SubElement(root, 'Editor')
 			node.text = utils.listToString( credit_editor_list )
-		
+
+		assign( 'Publisher', md.publisher )
+		assign( 'Imprint', md.imprint )
+		assign( 'Genre', md.genre )
+		assign( 'Web', md.webLink )
+		assign( 'PageCount', md.pageCount )
+		assign( 'LanguageISO', md.language )
+		assign( 'Format', md.format )
+		assign( 'AgeRating', md.maturityRating )
+		if md.blackAndWhite is not None and md.blackAndWhite:
+			ET.SubElement(root, 'BlackAndWhite').text = "Yes"
+		assign( 'Manga', md.manga )
+		assign( 'Characters', md.characters )
+		assign( 'Teams', md.teams )
+		assign( 'Locations', md.locations )
+		assign( 'ScanInformation', md.scanInfo )
+
 		#  loop and add the page entries under pages node
 		if len( md.pages ) > 0:
 			pages_node = ET.SubElement(root, 'Pages')
@@ -229,6 +230,7 @@ class ComicInfoXml:
 		md.notes =            xlate( 'Notes' )
 		md.year =             xlate( 'Year' )
 		md.month =            xlate( 'Month' )
+		md.day =              xlate( 'Day' )
 		md.publisher =        xlate( 'Publisher' )
 		md.imprint =          xlate( 'Imprint' )
 		md.genre =            xlate( 'Genre' )

comictaggerlib/comicvinecacher.py

@@ -27,6 +27,7 @@ import datetime
 
 import ctversion
 from settings import ComicTaggerSettings
+import utils
 
 class ComicVineCacher:
 
@@ -97,6 +98,13 @@ class ComicVineCacher:
 							"PRIMARY KEY (id) )" 
 						)
 
+			cur.execute("CREATE TABLE AltCovers(" +
+							"issue_id INT," +
+							"url_list TEXT," +
+							"timestamp DATE DEFAULT (datetime('now','localtime')), " + 
+							"PRIMARY KEY (issue_id) )" 
+						)
+
 			cur.execute("CREATE TABLE Issues(" +
 							"id INT," +
 							"volume_id INT," +
@@ -108,6 +116,7 @@ class ComicVineCacher:
 							"thumb_image_hash TEXT," +
 							"publish_month TEXT," +
 							"publish_year TEXT," +
+							"site_detail_url TEXT," +
 							"timestamp DATE DEFAULT (datetime('now','localtime')), " + 
 							"PRIMARY KEY (id ) )" 
 						)
@@ -149,7 +158,7 @@ class ComicVineCacher:
 								url,
 								record['description']) 
 							)
-							
+			
 	def get_search_results( self, search_term ):
 		
 		results = list()
@@ -184,7 +193,52 @@ class ComicVineCacher:
 				
 		return results
 
+	def add_alt_covers( self, issue_id, url_list ):
+		
+		con = lite.connect( self.db_file )
 
+		with con:
+			con.text_factory = unicode					
+			cur = con.cursor()    
+			
+			# remove all previous entries with this search term
+			cur.execute("DELETE FROM AltCovers WHERE issue_id = ?", [ issue_id ])
+			
+			url_list_str = utils.listToString(url_list)
+			# now add in new record				
+			cur.execute("INSERT INTO AltCovers " +
+						"(issue_id, url_list ) " +
+						"VALUES( ?, ? )" ,
+							( issue_id,
+							url_list_str) 
+						)
+
+
+	def get_alt_covers( self, issue_id ):
+		
+		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_month_ago = datetime.datetime.today()-datetime.timedelta(days=30)
+			cur.execute( "DELETE FROM AltCovers WHERE timestamp  < ?", [ str(a_month_ago) ] )
+			
+			cur.execute("SELECT url_list FROM AltCovers WHERE issue_id=?", [ issue_id ])
+			row = cur.fetchone()
+			if row is None :
+				return None
+			else:
+				url_list_str = row[0]
+				if len(url_list_str) == 0:
+					return []
+				raw_list = url_list_str.split(",")
+				url_list = []
+				for item in raw_list:
+					url_list.append( str(item).strip())
+				return url_list
+			
 	def add_volume_info( self, cv_volume_record ):
 		
 		con = lite.connect( self.db_file )
@@ -275,7 +329,7 @@ class ComicVineCacher:
 		return result
 
 
-	def add_issue_select_details( self, issue_id, image_url, thumb_image_url, publish_month, publish_year ):
+	def add_issue_select_details( self, issue_id, image_url, thumb_image_url, publish_month, publish_year, site_detail_url ):
 		
 		con = lite.connect( self.db_file )
 
@@ -289,6 +343,7 @@ class ComicVineCacher:
 			          "thumb_image_url": thumb_image_url, 
 			          "publish_month": publish_month, 
 			          "publish_year": publish_year, 
+			          "site_detail_url": site_detail_url, 
 			          "timestamp": timestamp 
 			       }
 			self.upsert( cur, "issues" , "id", issue_id, data)
@@ -302,13 +357,25 @@ class ComicVineCacher:
 			cur = con.cursor() 
 			con.text_factory = unicode					
 			
-			cur.execute("SELECT image_url,thumb_image_url,publish_month,publish_year FROM Issues WHERE id=?", [ issue_id ])
+			cur.execute("SELECT image_url,thumb_image_url,publish_month,publish_year,site_detail_url FROM Issues WHERE id=?", [ issue_id ])
 			row = cur.fetchone()
 
-			if row[0] is None :
-				return None, None, None, None
+			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['site_detail_url'] = None
+
 			else:
-				return row[0],row[1],row[2],row[3]
+				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]
+				
+			return details
 			
 			
 	def upsert( self, cur, tablename, pkname, pkval, data):

comictaggerlib/comicvinetalker.py

@@ -27,6 +27,7 @@ import re
 import datetime
 import ctversion
 import sys
+from bs4 import BeautifulSoup
 
 try:
 	from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
@@ -67,8 +68,9 @@ class ComicVineTalker(QObject):
 				
 	def writeLog( self , text ):
 		if self.log_func is None:
-			sys.stdout.write(text.encode( errors='replace') )
-			sys.stdout.flush()
+			#sys.stdout.write(text.encode( errors='replace') )
+			#sys.stdout.flush()
+			print >> sys.stderr, text
 		else:
 			self.log_func( text )
 
@@ -182,7 +184,7 @@ class ComicVineTalker(QObject):
 		cv_response = json.loads(content)
 
 		if cv_response[ 'status_code' ] != 1:
-			print ( "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] ))
+			print >> sys.stderr, "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] )
 			return None
 
 		volume_results = cv_response['results']
@@ -210,7 +212,7 @@ class ComicVineTalker(QObject):
 			content = self.getUrlContent(issue_url) 
 			cv_response = json.loads(content)
 			if cv_response[ 'status_code' ] != 1:
-				print ( "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] ))
+				print >> sys.stderr,  "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] )
 				return None
 			issue_results = cv_response['results']
 
@@ -226,7 +228,7 @@ class ComicVineTalker(QObject):
 		content = self.getUrlContent(issue_url)
 		cv_response = json.loads(content)
 		if cv_response[ 'status_code' ] != 1:
-			print ( "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] ))
+			print >> sys.stderr,  "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] )
 			return None
 		
 		issue_results = cv_response['results']
@@ -323,36 +325,55 @@ class ComicVineTalker(QObject):
 		return newstring
 
 	def fetchIssueDate( self, issue_id ):
-		image_url, thumb_url, month,year = self.fetchIssueSelectDetails( issue_id )
-		return month, year
+		details = self.fetchIssueSelectDetails( issue_id )
+		return details['publish_month'], details['publish_year']
 
 	def fetchIssueCoverURLs( self, issue_id ):
-		image_url, thumb_url, month,year = self.fetchIssueSelectDetails( issue_id )
-		return image_url, thumb_url
-		
+		details = self.fetchIssueSelectDetails( issue_id )
+		return details['image_url'], details['thumb_image_url']
+
+	def fetchIssuePageURL( self, issue_id ):
+		details = self.fetchIssueSelectDetails( issue_id )
+		return details['site_detail_url']
+				
 	def fetchIssueSelectDetails( self, issue_id ):
 
-		cached_image_url,cached_thumb_url,cached_month,cached_year = self.fetchCachedIssueSelectDetails( issue_id )
-		if cached_image_url is not None:
-			return cached_image_url,cached_thumb_url, cached_month, cached_year
+		#cached_image_url,cached_thumb_url,cached_month,cached_year = self.fetchCachedIssueSelectDetails( issue_id )
+		cached_details = self.fetchCachedIssueSelectDetails( issue_id )
+		if cached_details['image_url'] is not None:
+			return cached_details
 
-		issue_url = "http://api.comicvine.com/issue/" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json&field_list=image,publish_month,publish_year"
+		issue_url = "http://api.comicvine.com/issue/" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json&field_list=image,publish_month,publish_year,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['site_detail_url'] = None
+		
 		cv_response = json.loads(content)
 		if cv_response[ 'status_code' ] != 1:
-			print ( "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] ))
-			return None, None,None,None
+			print >> sys.stderr, "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] )
+			return details
 		
-		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']
+		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['site_detail_url'] = cv_response['results']['site_detail_url']
 				
-		if image_url is not None:
-			self.cacheIssueSelectDetails( issue_id, image_url,thumb_url, month, year )
-		return image_url,thumb_url,month,year
+		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['site_detail_url'] )
+		#print details['site_detail_url']
+		return details
 		
 	def fetchCachedIssueSelectDetails( self, issue_id ):
 
@@ -361,23 +382,71 @@ class ComicVineTalker(QObject):
 		cvc = ComicVineCacher( )
 		return  cvc.get_issue_select_details( issue_id )
 
-	def cacheIssueSelectDetails( self, issue_id, image_url, thumb_url, month, year ):
+	def cacheIssueSelectDetails( self, issue_id, image_url, thumb_url, month, year, page_url ):
 		cvc = ComicVineCacher( )
-		cvc.add_issue_select_details( issue_id, image_url, thumb_url, month, year )
+		cvc.add_issue_select_details( issue_id, image_url, thumb_url, month, year, page_url )
+
+
+	def fetchAlternateCoverURLs(self, issue_id):
+		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()
+		alt_cover_url_list = self.parseOutAltCoverUrls( content)
+
+		# cache this alt cover URL list
+		self.cacheAlternateCoverURLs( issue_id, alt_cover_url_list )
+
+		return alt_cover_url_list
+	
+	def parseOutAltCoverUrls( self, page_html ):
+		soup = BeautifulSoup( page_html )
+		
+		alt_cover_url_list = []
+		
+		# Using knowledge of the layout of the ComicVine issue page here:
+		#  look for the divs that are in the classes 'content-pod' and 'alt-cover'
+		div_list = soup.find_all( 'div')
+		for d in div_list:
+			if d.has_key('class'):
+				c = d['class']
+				if 'content-pod' in c and 'alt-cover' in c:
+					alt_cover_url_list.append( d.img['src'] )
+					
+		return alt_cover_url_list
+
+	def fetchCachedAlternateCoverURLs( self, issue_id ):
+
+		# before we search online, look in our cache, since we might already
+		# have this info
+		cvc = ComicVineCacher( )
+		url_list = cvc.get_alt_covers( issue_id )
+		if url_list is not None:
+			return url_list
+		else:
+			return None
+
+	def cacheAlternateCoverURLs( self, issue_id, url_list ):
+		cvc = ComicVineCacher( )
+		cvc.add_alt_covers( issue_id, url_list )
+
+	#---------------------------------------------------------------------------
 	urlFetchComplete = pyqtSignal( str , str, int)
 
 	def asyncFetchIssueCoverURLs( self, issue_id ):
 		
 		self.issue_id = issue_id
-		cached_image_url,cached_thumb_url,month,year = self.fetchCachedIssueSelectDetails( issue_id )
-		if cached_image_url is not None:
-			self.urlFetchComplete.emit( cached_image_url,cached_thumb_url, self.issue_id )
+		details = self.fetchCachedIssueSelectDetails( issue_id )
+		if details['image_url'] is not None:
+			self.urlFetchComplete.emit( details['image_url'],details['thumb_image_url'], self.issue_id )
 			return
 
-		issue_url = "http://api.comicvine.com/issue/" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json&field_list=image,publish_month,publish_year"
+		issue_url = "http://api.comicvine.com/issue/" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json&field_list=image,publish_month,publish_year,site_detail_url"
 		self.nam = QNetworkAccessManager()
 		self.nam.finished.connect( self.asyncFetchIssueCoverURLComplete )
 		self.nam.get(QNetworkRequest(QUrl(issue_url)))
@@ -388,16 +457,41 @@ class ComicVineTalker(QObject):
 		data = reply.readAll()
 		cv_response = json.loads(str(data))
 		if cv_response[ 'status_code' ] != 1:
-			print ( "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] ))
+			print >> sys.stderr,  "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] )
 			return 
 		
 		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']
+		page_url = cv_response['results']['site_detail_url']
 
-		self.cacheIssueSelectDetails(  self.issue_id, image_url, thumb_url, month, year )
+		self.cacheIssueSelectDetails(  self.issue_id, image_url, thumb_url, month, year, page_url )
 
 		self.urlFetchComplete.emit( image_url, thumb_url, self.issue_id ) 
 
+	altUrlListFetchComplete = pyqtSignal( list, int)
+
+	def asyncFetchAlternateCoverURLs( self, issue_id, issue_page_url ):
+		# This async version requires the issue page url to be provided!
+		self.issue_id = issue_id
+		url_list = self.fetchCachedAlternateCoverURLs( issue_id )
+		if url_list is not None:
+			self.altUrlListFetchComplete.emit( url_list, int(self.issue_id) )
+			return
+			
+		self.nam = QNetworkAccessManager()
+		self.nam.finished.connect( self.asyncFetchAlternateCoverURLsComplete )
+		self.nam.get(QNetworkRequest(QUrl(str(issue_page_url))))
+		
+
+	def asyncFetchAlternateCoverURLsComplete( self, reply ):
+		# read in the response
+		html = str(reply.readAll())
+		alt_cover_url_list = self.parseOutAltCoverUrls( html )
+
+		# cache this alt cover URL list
+		self.cacheAlternateCoverURLs( self.issue_id, alt_cover_url_list )
+
+		self.altUrlListFetchComplete.emit( alt_cover_url_list, int(self.issue_id) ) 		
 

comictaggerlib/coverimagewidget.py

@@ -0,0 +1,290 @@
+"""
+A PyQt4 widget display cover images from either local archive, or from ComicVine
+"""
+
+"""
+Copyright 2012  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 os
+
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from PyQt4 import uic
+
+from settings import ComicTaggerSettings
+from genericmetadata import GenericMetadata, PageType
+from comicarchive import MetaDataStyle
+from comicvinetalker import ComicVineTalker, ComicVineTalkerException
+from imagefetcher import  ImageFetcher
+from pageloader import PageLoader
+from imagepopup import ImagePopup
+import utils
+
+# helper func to allow a label to be clickable
+def clickable(widget):
+
+	class Filter(QObject):
+	
+		dblclicked = pyqtSignal()
+		
+		def eventFilter(self, obj, event):
+		
+			if obj == widget:
+				if event.type() == QEvent.MouseButtonDblClick:
+					self.dblclicked.emit()
+					return True
+			
+			return False
+	
+	filter = Filter(widget)
+	widget.installEventFilter(filter)
+	return filter.dblclicked
+
+
+class CoverImageWidget(QWidget):
+	
+	ArchiveMode = 0
+	AltCoverMode = 1
+	URLMode = 1
+	
+	def __init__(self, parent, mode ):
+		super(CoverImageWidget, self).__init__(parent)
+		
+		uic.loadUi(ComicTaggerSettings.getUIFile('coverimagewidget.ui' ), self)
+
+		utils.reduceWidgetFontSize( self.label )
+
+		self.mode = mode
+		self.comicVine = ComicVineTalker()
+		self.page_loader = None
+		self.showControls = True
+
+		self.btnLeft.setIcon(QIcon(ComicTaggerSettings.getGraphic('left.png')))
+		self.btnRight.setIcon(QIcon(ComicTaggerSettings.getGraphic('right.png')))
+		
+		self.btnLeft.clicked.connect( self.decrementImage )
+		self.btnRight.clicked.connect( self.incrementImage )
+		self.resetWidget()
+		clickable(self.lblImage).connect(self.showPopup)
+
+		self.updateContent()
+
+	def resetWidget(self):
+		self.comic_archive = None
+		self.issue_id = None
+		self.comicVine = None
+		self.cover_fetcher = None
+		self.url_list = []
+		if self.page_loader is not None:
+			self.page_loader.abandoned = True
+		self.page_loader = None
+		self.imageIndex = -1
+		self.imageCount = 1
+		
+	def clear( self ):
+		self.resetWidget()
+		self.updateContent()
+			
+	def incrementImage( self ):
+		self.imageIndex += 1
+		if self.imageIndex == self.imageCount:
+			self.imageIndex = 0
+		self.updateContent()
+
+	def decrementImage( self ):
+		self.imageIndex -= 1
+		if self.imageIndex == -1:
+			self.imageIndex = self.imageCount -1
+		self.updateContent()
+			
+	def setArchive( self, ca, page=0 ):
+		if self.mode == CoverImageWidget.ArchiveMode:
+			self.resetWidget()
+			self.comic_archive = ca
+			self.imageIndex = page
+			self.imageCount = ca.getNumberOfPages()
+			self.updateContent()
+
+	def setURL( self, url ):
+		if self.mode == CoverImageWidget.URLMode:
+			self.resetWidget()
+			self.updateContent()
+			
+			self.url_list = [ url ] 
+			self.imageIndex = 0
+			self.imageCount = 1
+			self.updateContent()
+
+	def setIssueID( self, issue_id ):
+		if self.mode == CoverImageWidget.AltCoverMode:
+			self.resetWidget()
+			self.updateContent()
+			
+			self.issue_id = issue_id
+
+			self.comicVine = ComicVineTalker()
+			self.comicVine.urlFetchComplete.connect( self.primaryUrlFetchComplete )	
+			self.comicVine.asyncFetchIssueCoverURLs( int(self.issue_id) )
+	
+	def primaryUrlFetchComplete( self, primary_url, thumb_url, issue_id ):
+		self.url_list.append(str(primary_url))
+		self.imageIndex = 0
+		self.imageCount = len(self.url_list)
+		self.updateContent()
+
+		#defer the alt cover search 		
+		QTimer.singleShot(1, self.startAltCoverSearch)
+
+	def startAltCoverSearch( self ):
+
+		# now we need to get the list of alt cover URLs
+		self.label.setText("Searching for alt. covers...")
+		
+		# page URL should already be cached, so no need to defer
+		self.comicVine = ComicVineTalker()
+		issue_page_url = self.comicVine.fetchIssuePageURL( self.issue_id )
+		self.comicVine.altUrlListFetchComplete.connect( self.altCoverUrlListFetchComplete )	
+		self.comicVine.asyncFetchAlternateCoverURLs( int(self.issue_id),  issue_page_url)
+		
+	def altCoverUrlListFetchComplete( self, url_list, issue_id ):
+		if len(url_list) > 0:
+			self.url_list.extend(url_list)
+			self.imageCount = len(self.url_list)
+		self.updateControls()
+
+	def setPage( self, pagenum ):
+		if self.mode == CoverImageWidget.ArchiveMode:
+			self.imageIndex = pagenum
+			self.updateContent()
+	
+	def updateContent( self ):
+		self.updateImage()
+		self.updateControls()
+		
+	def updateImage( self ):
+		if self.imageIndex == -1:
+			self.loadDefault()
+		elif self.mode in [ CoverImageWidget.AltCoverMode,  CoverImageWidget.URLMode ]:
+			self.loadURL()
+		else:
+			self.loadPage()
+	
+	def updateControls( self ):
+		if not self.showControls:
+			self.btnLeft.hide()
+			self.btnRight.hide()
+			self.label.hide()
+			return
+			
+		if self.imageIndex == -1  or self.imageCount == 1:
+			self.btnLeft.setEnabled(False)
+			self.btnRight.setEnabled(False)
+			self.btnLeft.hide()
+			self.btnRight.hide()
+		else:
+			self.btnLeft.setEnabled(True)
+			self.btnRight.setEnabled(True)
+			self.btnLeft.show()
+			self.btnRight.show()
+		
+		if self.imageIndex == -1  or self.imageCount == 1:
+			self.label.setText("")		
+		elif self.mode == CoverImageWidget.AltCoverMode:		
+			self.label.setText("Cover {0} ( of {1} )".format(self.imageIndex+1, self.imageCount))
+		else:
+			self.label.setText("Page {0} ( of {1} )".format(self.imageIndex+1, self.imageCount))
+	
+	def loadURL( self ):
+		self.loadDefault()
+		self.cover_fetcher = ImageFetcher( )
+		self.cover_fetcher.fetchComplete.connect(self.coverRemoteFetchComplete)
+		self.cover_fetcher.fetch( self.url_list[self.imageIndex] )
+		#print "ATB cover fetch started...."
+				
+	# called when the image is done loading from internet
+	def coverRemoteFetchComplete( self, image_data, issue_id ):
+		img = QImage()
+		img.loadFromData( image_data )
+		self.current_pixmap = QPixmap(img)
+		self.setDisplayPixmap( 0, 0)
+		#print "ATB cover fetch complete!"
+
+	def loadPage( self ):
+		if self.comic_archive is not None:
+			if self.page_loader is not None:
+				self.page_loader.abandoned = True
+			self.page_loader = PageLoader( self.comic_archive, self.imageIndex )
+			self.page_loader.loadComplete.connect( self.pageLoadComplete )	
+			self.page_loader.start()
+
+	def pageLoadComplete( self, img ):
+		self.current_pixmap = QPixmap(img)
+		self.setDisplayPixmap( 0, 0)
+		self.page_loader = None
+					
+	def loadDefault( self ):
+		self.current_pixmap = QPixmap(ComicTaggerSettings.getGraphic('nocover.png'))
+		#print "loadDefault called"
+		self.setDisplayPixmap( 0, 0)
+
+	def resizeEvent( self, resize_event ):
+		if self.current_pixmap is not None:
+			delta_w = resize_event.size().width() - resize_event.oldSize().width()
+			delta_h = resize_event.size().height() - resize_event.oldSize().height()
+			#print "ATB resizeEvent deltas", resize_event.size().width(), resize_event.size().height()
+			self.setDisplayPixmap( delta_w , delta_h )
+							
+	def setDisplayPixmap( self, delta_w , delta_h ):
+			# the deltas let us know what the new width and height of the label will be
+			"""
+			new_h = self.frame.height() + delta_h
+			new_w = self.frame.width() + delta_w
+			print "ATB setDisplayPixmap deltas", delta_w , delta_h
+			print "ATB self.frame", self.frame.width(), self.frame.height()
+			print "ATB self.", self.width(), self.height()
+			
+			frame_w = new_w
+			frame_h = new_h
+			"""
+			new_h = self.frame.height() 
+			new_w = self.frame.width() 
+			frame_w = self.frame.width() 
+			frame_h = self.frame.height() 
+
+			new_h -= 4
+			new_w -= 4
+			
+			if new_h < 0:
+				new_h = 0;
+			if new_w < 0:
+				new_w = 0;
+
+			#print "ATB setDisplayPixmap deltas", delta_w , delta_h
+			#print "ATB self.frame", frame_w, frame_h
+			#print "ATB new size", new_w, new_h
+			
+			# scale the pixmap to fit in the frame
+			scaled_pixmap = self.current_pixmap.scaled(new_w, new_h, Qt.KeepAspectRatio)			
+			self.lblImage.setPixmap( scaled_pixmap )
+			
+			# move and resize the label to be centered in the fame
+			img_w = scaled_pixmap.width()
+			img_h = scaled_pixmap.height()
+			self.lblImage.resize( img_w, img_h )
+			self.lblImage.move( (frame_w - img_w)/2, (frame_h - img_h)/2 )
+			
+	def showPopup( self ):
+		self.popup = ImagePopup(self, self.current_pixmap)

comictaggerlib/crediteditorwindow.py

@@ -33,7 +33,7 @@ class CreditEditorWindow(QtGui.QDialog):
 	def __init__(self, parent, mode, role, name, primary ):
 		super(CreditEditorWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'crediteditorwindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('crediteditorwindow.ui' ), self)
 		
 		self.mode = mode
 		

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.0.3-beta"
+version="1.1.2a-beta"

comictaggerlib/exportwindow.py

@@ -36,9 +36,12 @@ class ExportWindow(QtGui.QDialog):
 	def __init__( self, parent,  settings, msg ):
 		super(ExportWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'exportwindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('exportwindow.ui' ), self)
 		self.label.setText( msg )
 
+		self.setWindowFlags(self.windowFlags() &
+									  ~QtCore.Qt.WindowContextHelpButtonHint )
+
 		self.settings = settings
 		
 		self.cbxDeleteOriginal.setCheckState( QtCore.Qt.Unchecked )

comictaggerlib/filenameparser.py

@@ -30,8 +30,11 @@ import os
 from urllib import unquote
 
 class FileNameParser:
-	def fixSpaces( self, string ):
-		placeholders = ['[-_]','  +']
+	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()
@@ -151,7 +154,7 @@ class FileNameParser:
 		# finding it easier
 		
 		filename = filename.replace("+", " ")
-		tmpstr = self.fixSpaces(filename)
+		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("#", " ")

comictaggerlib/filerenamer.py

@@ -95,6 +95,19 @@ class FileRenamer:
 					dt = datetime.datetime( 1970, int(md.month), 1, 0, 0)
 					month_name = dt.strftime("%B")
 		new_name = self.replaceToken( new_name, month_name, '%month_name%')
+
+		new_name = self.replaceToken( new_name, md.genre, '%genre%')
+		new_name = self.replaceToken( new_name, md.language, '%language_code%')
+		new_name = self.replaceToken( new_name, md.criticalRating , '%criticalrating%')
+		new_name = self.replaceToken( new_name, md.alternateSeries, '%alternateseries%')
+		new_name = self.replaceToken( new_name, md.alternateNumber, '%alternatenumber%')
+		new_name = self.replaceToken( new_name, md.alternateCount, '%alternatecount%')
+		new_name = self.replaceToken( new_name, md.imprint, '%imprint%')
+		new_name = self.replaceToken( new_name, md.format, '%format%')
+		new_name = self.replaceToken( new_name, md.maturityRating, '%maturityrating%')
+		new_name = self.replaceToken( new_name, md.storyArc, '%storyarc%')
+		new_name = self.replaceToken( new_name, md.seriesGroup, '%seriesgroup%')
+		new_name = self.replaceToken( new_name, md.scanInfo, '%scaninfo%')
 			
 		if self.smart_cleanup:
 			

comictaggerlib/fileselectionlist.py

@@ -29,8 +29,9 @@ from PyQt4.QtCore import pyqtSignal
 
 from settings import ComicTaggerSettings
 from comicarchive import ComicArchive
+from comicarchive import MetaDataStyle
 from genericmetadata import GenericMetadata, PageType
-from options import MetaDataStyle
+import utils
 
 class FileTableWidget( QTableWidget ):
 
@@ -70,14 +71,12 @@ class FileSelectionList(QWidget):
 	def __init__(self, parent , settings ):
 		super(FileSelectionList, self).__init__(parent)
 
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'fileselectionlist.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('fileselectionlist.ui' ), self)
 		
 		self.settings = settings
-		#self.twList = FileTableWidget( self )
-		#gridlayout = QGridLayout( self )
-		#gridlayout.addWidget( self.twList )
+
+		utils.reduceWidgetFontSize( self.twList )
 		
-		#self.twList.itemSelectionChanged.connect( self.itemSelectionChangedCB )
 		self.twList.currentItemChanged.connect( self.currentItemChangedCB )
 		
 		self.currentItem = None
@@ -160,26 +159,15 @@ class FileSelectionList(QWidget):
 			self.listCleared.emit()
 	
 	def addPathList( self, pathlist ):
-		filelist = []
-		for p in pathlist:
-			# if path is a folder, walk it recursivly, and all files underneath
-			if type(p) == str:
-				#make sure string is unicode
-				filename_encoding = sys.getfilesystemencoding()
-				p = p.decode(filename_encoding, 'replace')
-			
-			if os.path.isdir( unicode(p)):
-				for root,dirs,files in os.walk( unicode(p) ):
-					for f in files:
-						filelist.append(os.path.join(root,unicode(f)))
-			else:
-				filelist.append(unicode(p))
+		
+		filelist = utils.get_recursive_filelist( pathlist )
 			
 		# we now have a list of files to add
 
 		progdialog = QProgressDialog("", "Cancel", 0, len(filelist), self)
 		progdialog.setWindowTitle( "Adding Files" )
-		progdialog.setWindowModality(Qt.WindowModal)
+		#progdialog.setWindowModality(Qt.WindowModal)
+		progdialog.setWindowModality(Qt.ApplicationModal)		
 		progdialog.show()
 		
 		firstAdded = None
@@ -190,6 +178,7 @@ class FileSelectionList(QWidget):
 				break
 			progdialog.setValue(idx)
 			progdialog.setLabelText(f)
+			utils.centerWindowOnParent( progdialog )
 			QCoreApplication.processEvents()
 			row = self.addPathItem( f )
 			if firstAdded is None and row is not None:
@@ -230,12 +219,9 @@ class FileSelectionList(QWidget):
 		if self.isListDupe(path):
 			return None
 		
-		ca = ComicArchive( path )
-		if self.settings.rar_exe_path != "":
-			ca.setExternalRarProgram( self.settings.rar_exe_path )
+		ca = ComicArchive( path, self.settings )
 			
 		if ca.seemsToBeAComicArchive() :
-			
 			row = self.twList.rowCount()
 			self.twList.insertRow( row )
 			

comictaggerlib/genericmetadata.py

@@ -63,6 +63,7 @@ class GenericMetadata:
 		self.publisher          = None
 		self.month              = None
 		self.year               = None
+		self.day                = None
 		self.issueCount         = None
 		self.volume             = None
 		self.genre              = None
@@ -125,6 +126,7 @@ class GenericMetadata:
 		assign( "issueCount",        new_md.issueCount )
 		assign( "title",             new_md.title )
 		assign( "publisher",         new_md.publisher )
+		assign( "day",               new_md.day )
 		assign( "month",             new_md.month )
 		assign( "year",              new_md.year )
 		assign( "volume",            new_md.volume )
@@ -256,8 +258,9 @@ class GenericMetadata:
 		add_attr_string( "issueCount" )
 		add_attr_string( "title" )
 		add_attr_string( "publisher" )
-		add_attr_string( "month" )
 		add_attr_string( "year" )
+		add_attr_string( "month" )
+		add_attr_string( "day" )
 		add_attr_string( "volume" )
 		add_attr_string( "volumeCount" )
 		add_attr_string( "genre" )

comictaggerlib/imagehasher.py

@@ -1,4 +1,22 @@
+"""
+A pthyon class to manage creating image content hashes, and calculate hamming distances
+"""
 
+"""
+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 StringIO
 import sys
 

comictaggerlib/imagepopup.py

@@ -0,0 +1,86 @@
+"""
+A PyQT4 widget to display a popup image
+"""
+
+"""
+Copyright 2012  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
+from PyQt4 import QtCore, QtGui, uic
+import os
+from settings import ComicTaggerSettings
+
+
+class ImagePopup(QtGui.QDialog):
+	
+	def __init__(self, parent, image_pixmap):
+		super(ImagePopup, self).__init__(parent)
+		
+		uic.loadUi(ComicTaggerSettings.getUIFile('imagepopup.ui' ), self)
+
+		QtGui.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.WaitCursor))
+
+		#self.setWindowModality(QtCore.Qt.WindowModal)
+		self.setWindowFlags(QtCore.Qt.Popup)
+		self.setWindowState(QtCore.Qt.WindowFullScreen)
+	
+		self.imagePixmap = image_pixmap
+		
+		screen_size = QtGui.QDesktopWidget().screenGeometry()
+		self.resize(screen_size.width(), screen_size.height())
+		self.move( 0, 0)
+		
+		# This is a total hack.  Uses a snapshot of the desktop, and overlays a
+		# translucent screen over it.  Probably can do it better by setting opacity of a
+		# widget
+		self.desktopBg = QtGui.QPixmap.grabWindow(QtGui.QApplication.desktop ().winId(), 
+			0,0, screen_size.width(), screen_size.height())
+		bg = QtGui.QPixmap(ComicTaggerSettings.getGraphic('popup_bg.png')) 
+		self.clientBgPixmap = bg.scaled(screen_size.width(), screen_size.height())		
+		self.setMask(self.clientBgPixmap.mask())
+
+		self.applyImagePixmap()
+		self.showFullScreen()
+		self.raise_(  )
+		QtGui.QApplication.restoreOverrideCursor()		
+
+	def paintEvent (self, event):
+		self.painter = QtGui.QPainter(self)
+		self.painter.setRenderHint(QtGui.QPainter.Antialiasing)
+		self.painter.drawPixmap(0, 0, self.desktopBg)
+		self.painter.drawPixmap(0, 0, self.clientBgPixmap)
+		self.painter.end()		
+
+	def applyImagePixmap( self ):
+		win_h = self.height()
+		win_w = self.width() 
+	
+		if self.imagePixmap.width() >  win_w or self.imagePixmap.height() > win_h:
+			# scale the pixmap to fit in the frame
+			display_pixmap = self.imagePixmap.scaled(win_w, win_h, QtCore.Qt.KeepAspectRatio)			
+			self.lblImage.setPixmap( display_pixmap )
+		else:
+			display_pixmap = self.imagePixmap
+		self.lblImage.setPixmap( display_pixmap )
+			
+		# move and resize the label to be centered in the fame
+		img_w = display_pixmap.width()
+		img_h = display_pixmap.height()
+		self.lblImage.resize( img_w, img_h )
+		self.lblImage.move( (win_w - img_w)/2, (win_h - img_h)/2 )
+
+	def	mousePressEvent( self , event):
+		self.close()

comictaggerlib/issueidentifier.py

@@ -38,6 +38,11 @@ from issuestring import IssueString
 
 import utils 
 
+class IssueIdentifierNetworkError(Exception):
+	pass
+class IssueIdentifierCancelled(Exception):
+	pass
+
 class IssueIdentifier:
 	
 	ResultNoMatches                         = 0
@@ -54,7 +59,10 @@ class IssueIdentifier:
 		self.onlyUseAdditionalMetaData = False
 
 		# a decent hamming score, good enough to call it a match
-		self.min_score_thresh = 20
+		self.min_score_thresh = 16
+
+		# for alternate covers, be more stringent, since we're a bit more scattershot in comparisons
+		self.min_alternate_score_thresh = 12
 		
 		# the min distance a hamming score must be to separate itself from closest neighbor
 		self.min_score_distance = 4
@@ -74,6 +82,7 @@ class IssueIdentifier:
 		self.coverUrlCallback = None
 		self.search_result = self.ResultNoMatches
 		self.cover_page_index = 0
+		self.cancel = False
 		
 	def setScoreMinThreshold( self, thresh ):
 		self.min_score_thresh = thresh
@@ -215,6 +224,104 @@ class IssueIdentifier:
 		if newline:
 			self.output_function("\n")
 	
+	def getIssueCoverMatchScore( self, comicVine, issue_id, localCoverHashList, useRemoteAlternates = False , useLog=True):
+
+		# localHashes is a list of pre-calculated hashs.
+		# useRemoteAlternates - indicates to use alternate covers from CV
+		
+		# first get the primary cover image
+		primary_img_url, primary_thumb_url = comicVine.fetchIssueCoverURLs( issue_id )
+				
+		try:
+			url_image_data = ImageFetcher().fetch(primary_thumb_url, blocking=True)
+		except ImageFetcherException:
+			self.log_msg( "Network issue while fetching cover image from ComicVine.  Aborting...")
+			raise IssueIdentifierNetworkError
+
+		if self.cancel == True:
+			raise IssueIdentifierCancelled
+			
+		# alert the GUI, if needed
+		if self.coverUrlCallback is not None:
+			self.coverUrlCallback( url_image_data )
+
+		remote_cover_list = []
+		item = dict()
+		item['url'] = primary_img_url
+
+		item['hash'] = self.calculateHash( url_image_data )
+		remote_cover_list.append( item )
+
+		if self.cancel == True:
+			raise IssueIdentifierCancelled
+		
+		if useRemoteAlternates:
+			alt_img_url_list = comicVine.fetchAlternateCoverURLs( issue_id )
+			
+			for alt_url in alt_img_url_list:
+				try:
+					alt_url_image_data = ImageFetcher().fetch(alt_url, blocking=True)
+				except ImageFetcherException:
+					self.log_msg( "Network issue while fetching alt. cover image from ComicVine.  Aborting...")
+					raise IssueIdentifierNetworkError
+
+				if self.cancel == True:
+					raise IssueIdentifierCancelled
+					
+				# alert the GUI, if needed
+				if self.coverUrlCallback is not None:
+					self.coverUrlCallback( alt_url_image_data )
+
+				item = dict()
+				item['url'] = alt_url
+				item['hash'] = self.calculateHash( alt_url_image_data )
+				remote_cover_list.append( item )
+				
+				if self.cancel == True:
+					raise IssueIdentifierCancelled
+				
+		if useLog and useRemoteAlternates:
+			self.log_msg( "[{0} alt. covers]".format(len(remote_cover_list)-1), False )
+		if useLog:
+			self.log_msg( "[ ", False )
+			
+		score_list = []
+		done = False
+		for local_cover_hash in localCoverHashList:
+			for remote_cover_item in remote_cover_list:
+				score = ImageHasher.hamming_distance(local_cover_hash, remote_cover_item['hash'] )
+				score_item = dict()
+				score_item['score'] = score
+				score_item['url'] = remote_cover_item['url']
+				score_item['hash'] = remote_cover_item['hash']
+				score_list.append( score_item )
+				if useLog:
+					self.log_msg( "{0} ".format(score), False )
+				
+				if score <= self.strong_score_thresh:
+					# such a good score, we can quit now, since for sure we have a winner
+					done = True
+					break
+			if done:
+				break
+				
+		if useLog:
+			self.log_msg( " ]", False )
+
+		best_score_item = min(score_list, key=lambda x:x['score'])
+
+		return best_score_item	
+
+	"""
+	def validate( self, issue_id ):
+		# create hash list
+		score = self.getIssueMatchScore( issue_id, hash_list, useRemoteAlternates = True )
+		if score < 20:
+			return True
+		else:
+			return False
+	"""
+	
 	def search( self ):
 	
 		ca = self.comic_archive
@@ -242,7 +349,6 @@ class IssueIdentifier:
 			right_side_image_data = self.cropCover( cover_image_data )
 			if right_side_image_data is not None:
 				narrow_cover_hash = self.calculateHash( right_side_image_data )
-				self.log_msg(unicode(str(narrow_cover_hash)))
 				
 		#self.log_msg( "Cover hash = {0:016x}".format(cover_hash) )
 
@@ -279,7 +385,7 @@ class IssueIdentifier:
 		if self.cancel == True:
 			return []
 		
-		series_shortlist = []
+		series_second_round_list = []
 		
 		#self.log_msg( "Removing results with too long names, banned publishers, or future start dates" )
 		for item in cv_search_results:
@@ -305,34 +411,33 @@ class IssueIdentifier:
 					publisher_approved = False
 
 			if length_approved and publisher_approved and date_approved:
-				series_shortlist.append(item)
+				series_second_round_list.append(item)
 		
 		# if we don't think it's an issue number 1, remove any series' that are one-shots
-		if keys['issue_number'] != '1':
+		if keys['issue_number'] not in [ '1', '0' ]:
 			#self.log_msg( "Removing one-shots" )
-			series_shortlist[:] = [x for x in series_shortlist if not x['count_of_issues'] == 1]	
+			series_second_round_list[:] = [x for x in series_second_round_list if not x['count_of_issues'] == 1]	
 
-		self.log_msg( "Searching in " + str(len(series_shortlist)) +" series" )
+		self.log_msg( "Searching in " + str(len(series_second_round_list)) +" series" )
 		
 		if self.callback is not None:
-			self.callback( 0, len(series_shortlist))
+			self.callback( 0, len(series_second_round_list))
 			
 		# now sort the list by name length
-		series_shortlist.sort(key=lambda x: len(x['name']), reverse=False)
-		
-		# Now we've got a list of series that we can dig into, 
-		# and look for matching issue number, date, and cover image
+		series_second_round_list.sort(key=lambda x: len(x['name']), reverse=False)
 		
+		# Now we've got a list of series that we can dig into look for matching issue number
 		counter = 0
-		for series in series_shortlist:
+		shortlist = []
+		for series in series_second_round_list:
 			if self.callback is not None:
+				self.callback( counter, len(series_second_round_list)*3)
 				counter += 1
-				self.callback( counter, len(series_shortlist))
 				
 			self.log_msg( u"Fetching info for  ID: {0} {1} ({2}) ...".format(
 			               series['id'], 
 			               series['name'], 
-			               series['start_year']), newline=False )
+			               series['start_year']), newline=True )
 
 			try:
 				cv_series_results = comicVine.fetchVolumeData( series['id'] )
@@ -346,59 +451,67 @@ class IssueIdentifier:
 				
 				# look for a matching issue number
 				if num_s == keys['issue_number']:
-					# found a matching issue number!  now get the issue data 
-					img_url, thumb_url = comicVine.fetchIssueCoverURLs( issue['id'] )
-					month, year = comicVine.fetchIssueDate( issue['id'] )
 
-					if self.cancel == True:
-						self.match_list = []
-						return self.match_list
-							
 					# now, if we have an issue year key given, reject this one if not a match
+					month, year = comicVine.fetchIssueDate( issue['id'] )					
 					if keys['year'] is not None:
-						if keys['year'] != year:
+						if unicode(keys['year']) != unicode(year):
 							break
-					try:
-						url_image_data = ImageFetcher().fetch(thumb_url, blocking=True)
-					except ImageFetcherException:
-						self.log_msg( "Network issue while fetching cover image from ComicVine.  Aborting...")
-						return []
-						
-					if self.cancel == True:
-						self.match_list = []
-						return self.match_list
-
-					if self.coverUrlCallback is not None:
-						self.coverUrlCallback( url_image_data )
-
-					url_image_hash = self.calculateHash( url_image_data )
-					score = ImageHasher.hamming_distance(cover_hash, url_image_hash)
+				
+					# found a matching issue number!  add it to short list
+					shortlist.append( (series, cv_series_results, issue) )
 					
-					# if we have a cropped version of the cover, check that one also, and use the best score
-					if narrow_cover_hash is not None:
-						score2 = ImageHasher.hamming_distance(narrow_cover_hash, url_image_hash)
-						score = min( score, score2 )
+		if keys['year'] is None:
+			self.log_msg( "Found {0} series that have an issue #{1}".format(len(shortlist), keys['issue_number']) )
+		else:
+			self.log_msg( "Found {0} series that have an issue #{1} from {2}".format(len(shortlist), keys['issue_number'], keys['year'] ))
+		
+			
+		# now we have a shortlist of volumes with the desired issue number
+		# Do first round of cover matching
+		counter = len(shortlist)
+		for series, cv_series_results, issue in  shortlist:		
+			if self.callback is not None:
+				self.callback( counter, len(shortlist)*3)
+				counter += 1
+			
+			self.log_msg( u"Examining covers for  ID: {0} {1} ({2}) ...".format(
+			               series['id'], 
+			               series['name'], 
+			               series['start_year']), newline=False )
+			
+			# now, if we have an issue year key given, reject this one if not a match
+			month, year = comicVine.fetchIssueDate( issue['id'] )					
 
-					match = dict()
-					match['series'] = u"{0} ({1})".format(series['name'], series['start_year'])
-					match['distance'] = score
-					match['issue_number'] = num_s
-					match['url_image_hash'] = url_image_hash
-					match['issue_title'] = issue['name']
-					match['img_url'] = img_url
-					match['issue_id'] = issue['id']
-					match['volume_id'] = series['id']
-					match['month'] = month
-					match['year'] = year
-					match['publisher'] = None
-					if series['publisher'] is not None:
-						match['publisher'] = series['publisher']['name']
-						
-					self.match_list.append(match)
+			# Now check the cover match against the primary image
+			hash_list = [ cover_hash ]
+			if narrow_cover_hash is not None:
+				hash_list.append(narrow_cover_hash)
+			try:	
+				score_item = self.getIssueCoverMatchScore( comicVine, issue['id'], hash_list, useRemoteAlternates = False )
+			except:
+				self.match_list = []
+				return self.match_list
+
+			match = dict()
+			match['series'] = u"{0} ({1})".format(series['name'], series['start_year'])
+			match['distance'] = score_item['score']
+			match['issue_number'] = keys['issue_number']
+			match['url_image_hash'] = score_item['hash']
+			match['issue_title'] = issue['name']
+			match['img_url'] = score_item['url']
+			match['issue_id'] = issue['id']
+			match['volume_id'] = series['id']
+			match['month'] = month
+			match['year'] = year
+			match['publisher'] = None
+			if series['publisher'] is not None:
+				match['publisher'] = series['publisher']['name']
+				
+			self.match_list.append(match)
+
+			self.log_msg( " --> {0}".format(match['distance']), newline=False )
 
-					self.log_msg( " --> {0}".format(match['distance']), newline=False )
-					
-					break
 			self.log_msg( "" )
 		
 		if len(self.match_list) == 0:
@@ -414,7 +527,7 @@ class IssueIdentifier:
 		for i in self.match_list:
 			l.append( i['distance'] )
 
-		self.log_msg( "Compared {0} covers".format(len(self.match_list)), newline=False)
+		self.log_msg( "Compared to covers in {0} issue(s):".format(len(self.match_list)), newline=False)
 		self.log_msg( str(l))
 
 		def print_match(item):
@@ -428,43 +541,66 @@ class IssueIdentifier:
 		
 		best_score = self.match_list[0]['distance']
 
-		if len(self.match_list) == 1:
-			self.search_result = self.ResultOneGoodMatch
-			if best_score > self.min_score_thresh:
-				self.log_msg( "Very weak score for the cover.  Maybe it's not the cover..." )
-
-				self.log_msg( "Comparing to some other archive pages now..." )
-				found = False
-				for i in range( min(3, ca.getNumberOfPages())):
-					image_data = ca.getPage(i)
-					page_hash = self.calculateHash( image_data )
-					distance = ImageHasher.hamming_distance(page_hash, self.match_list[0]['url_image_hash'])
-					if distance <= self.strong_score_thresh:
-						self.log_msg(  "Found a great match (score = {0}) on page {1}!".format(distance, i+1) )
-						found = True
-						break
-					elif distance < self.min_score_thresh:
-						self.log_msg( "Found a good match (score = {0}) on page {1}".format(distance, i) )
-						found = True
-					self.log_msg( ".", newline=False )
+		if best_score >= self.min_score_thresh:
+			# we have 1 or more low-confidence matches (all bad cover scores)
+			# look at a few more pages in the archive, and also alternate covers online
+			self.log_msg( "Very weak scores for the cover.  Analyzing alternate pages and covers..." )
+			hash_list = [ cover_hash ]
+			if narrow_cover_hash is not None:
+				hash_list.append(narrow_cover_hash)
+			for i in range( 1, min(3, ca.getNumberOfPages())):
+				image_data = ca.getPage(i)
+				page_hash = self.calculateHash( image_data )
+				hash_list.append( page_hash )
+				
+			second_match_list = []
+			counter = 2*len(self.match_list)
+			for m in self.match_list:
+				if self.callback is not None:
+					self.callback( counter, len(self.match_list)*3)
+					counter += 1
+				self.log_msg( u"Examining alternate covers for ID: {0} {1} ...".format(
+							   m['volume_id'], 
+							   m['series']), newline=False )
+				try:	
+					score_item = self.getIssueCoverMatchScore( comicVine, m['issue_id'], hash_list, useRemoteAlternates = True )
+				except:
+					self.match_list = []
+					return self.match_list
+				self.log_msg("--->{0}".format(score_item['score']))
 				self.log_msg( "" )
-				if not found:
-					self.log_msg( "No matching pages in the issue." )
-					self.search_result = self.ResultFoundMatchButBadCoverScore
 
-			self.log_msg( u"--------------------------------------------------")
-			print_match(self.match_list[0])
-			self.log_msg( u"--------------------------------------------------")
-			return self.match_list
-
-		elif best_score > self.min_score_thresh and len(self.match_list) > 1:
-			self.log_msg( u"--------------------------------------------------")
-			self.log_msg( u"Multiple bad cover matches!  Need to use other info..." )
-			self.log_msg( u"--------------------------------------------------")
-			self.search_result = self.ResultMultipleMatchesWithBadImageScores
+				if score_item['score'] < self.min_alternate_score_thresh:
+					second_match_list.append(m)
+					m['distance'] = score_item['score']
 					
-			return self.match_list
-
+			if len(	second_match_list ) == 0:
+				if len( self.match_list) == 1:
+					self.log_msg( "No matching pages in the issue." )
+					self.log_msg( u"--------------------------------------------------")
+					print_match(self.match_list[0])
+					self.log_msg( u"--------------------------------------------------")
+					self.search_result = self.ResultFoundMatchButBadCoverScore
+				else:
+					self.log_msg( u"--------------------------------------------------")
+					self.log_msg( u"Multiple bad cover matches!  Need to use other info..." )
+					self.log_msg( u"--------------------------------------------------")
+					self.search_result = self.ResultMultipleMatchesWithBadImageScores
+				return self.match_list
+			else:
+				# We did good, found something!
+				self.log_msg( "Success in secondary/alternate cover matching!" )
+				
+				self.match_list = second_match_list
+				# sort new list by image match scores
+				self.match_list.sort(key=lambda k: k['distance'])		
+				best_score = self.match_list[0]['distance']
+				self.log_msg("[Second round cover matching: best score = {0}]".format(best_score))
+				# now drop down into the rest of the processing
+				
+		if self.callback is not None:
+			self.callback( 99, 100)
+		
 		#now pare down list, remove any item more than specified distant from the top scores
 		for item in reversed(self.match_list):
 			if item['distance'] > best_score + self.min_score_distance:
@@ -482,7 +618,6 @@ class IssueIdentifier:
 			self.log_msg( u"--------------------------------------------------")
 			self.search_result = self.ResultNoMatches
 		else:
-			print 
 			self.log_msg( "More than one likley candiate." )
 			self.search_result = self.ResultMultipleGoodMatches
 			self.log_msg( u"--------------------------------------------------")

comictaggerlib/issueselectionwindow.py

@@ -29,6 +29,8 @@ from comicvinetalker import ComicVineTalker, ComicVineTalkerException
 from  imagefetcher import  ImageFetcher
 from settings import ComicTaggerSettings
 from issuestring import IssueString
+from coverimagewidget import CoverImageWidget
+import utils
 
 class IssueSelectionWindow(QtGui.QDialog):
 	
@@ -37,8 +39,19 @@ class IssueSelectionWindow(QtGui.QDialog):
 	def __init__(self, parent, settings, series_id, issue_number):
 		super(IssueSelectionWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'issueselectionwindow.ui' ), self)
-		
+		uic.loadUi(ComicTaggerSettings.getUIFile('issueselectionwindow.ui' ), self)
+
+		self.coverWidget = CoverImageWidget( self.coverImageContainer, CoverImageWidget.AltCoverMode )
+		gridlayout = QtGui.QGridLayout( self.coverImageContainer )
+		gridlayout.addWidget( self.coverWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+
+		utils.reduceWidgetFontSize( self.twList )		
+
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)		
+
 		self.series_id  = series_id
 		self.settings = settings
 		self.url_fetch_thread = None
@@ -121,35 +134,13 @@ class IssueSelectionWindow(QtGui.QDialog):
 			return
 		if prev is not None and prev.row() == curr.row():
 				return
-
 		
 		self.issue_id, b = self.twList.item( curr.row(), 0 ).data( QtCore.Qt.UserRole ).toInt()
 
 		# list selection was changed, update the the issue cover
 		for record in self.issue_list: 
-			if record['id'] == self.issue_id:
-				
+			if record['id'] == self.issue_id:				
 				self.issue_number = record['issue_number']
-
-				self.labelThumbnail.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
-
-				self.cv = ComicVineTalker( )
-				self.cv.urlFetchComplete.connect( self.urlFetchComplete )	
-				self.cv.asyncFetchIssueCoverURLs( int(self.issue_id) )
-				
+				self.coverWidget.setIssueID( int(self.issue_id) )
 				break
-
-	# called when the cover URL has been fetched 
-	def urlFetchComplete( self, image_url, thumb_url, issue_id ):
-
-		self.cover_fetcher = ImageFetcher( )
-		self.cover_fetcher.fetchComplete.connect(self.coverFetchComplete)
-		self.cover_fetcher.fetch( str(image_url), user_data=issue_id )
-				
-	# called when the image is done loading
-	def coverFetchComplete( self, image_data, issue_id ):
-		if self.issue_id == issue_id:
-			img = QtGui.QImage()
-			img.loadFromData( image_data )
-			self.labelThumbnail.setPixmap(QtGui.QPixmap(img))
 		

comictaggerlib/logwindow.py

@@ -30,9 +30,11 @@ class LogWindow(QtGui.QDialog):
 	def __init__(self, parent):
 		super(LogWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'logwindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('logwindow.ui' ), self)
 		
-
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)
 
 	def setText( self, text ):
 		self.textEdit.setPlainText( text ) 

comictaggerlib/main.py

@@ -0,0 +1,79 @@
+"""
+A python app to (automatically) tag comic archives
+"""
+
+"""
+Copyright 2012  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 signal
+import os
+import traceback
+import platform
+
+import utils
+import cli
+from settings import ComicTaggerSettings
+from options import Options
+
+try:
+	qt_available = True
+	from PyQt4 import QtCore, QtGui
+	from taggerwindow import TaggerWindow
+except ImportError as e:
+	qt_available = False
+#---------------------------------------
+
+def ctmain():
+	utils.fix_output_encoding()
+	settings = ComicTaggerSettings()
+
+	opts = Options()
+	opts.parseCmdLineArgs()
+
+	signal.signal(signal.SIGINT, signal.SIG_DFL)
+	
+	if not qt_available and not opts.no_gui:
+		opts.no_gui = True
+		print >> sys.stderr, "PyQt4 is not available.  ComicTagger is limited to command-line mode."
+	
+	if opts.no_gui:
+		cli.cli_mode( opts, settings )
+	else:
+		app = QtGui.QApplication(sys.argv)
+		
+		if platform.system() != "Linux":
+			img =  QtGui.QPixmap(ComicTaggerSettings.getGraphic('tags.png'))
+			
+			splash = QtGui.QSplashScreen(img)
+			splash.show()
+			splash.raise_()
+			app.processEvents()
+	
+		try:			
+			tagger_window = TaggerWindow( opts.file_list, settings )
+			tagger_window.show()
+
+			if platform.system() != "Linux":
+				splash.finish( tagger_window )
+
+			sys.exit(app.exec_())
+		except Exception, e:
+			QtGui.QMessageBox.critical(QtGui.QMainWindow(), "Error", "Unhandled exception in app:\n" + traceback.format_exc() )
+
+    
+    
+    

comictaggerlib/matchselectionwindow.py

@@ -26,26 +26,55 @@ from PyQt4.QtCore import QUrl, pyqtSignal, QByteArray
 
 from imagefetcher import  ImageFetcher
 from settings import ComicTaggerSettings
+from comicarchive import MetaDataStyle
+from coverimagewidget import CoverImageWidget
+from comicvinetalker import ComicVineTalker
+import utils
 
 class MatchSelectionWindow(QtGui.QDialog):
 	
 	volume_id = 0
 	
-	def __init__(self, parent, matches):
+	def __init__(self, parent, matches, comic_archive):
 		super(MatchSelectionWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'matchselectionwindow.ui' ), self)
-		
+		uic.loadUi(ComicTaggerSettings.getUIFile('matchselectionwindow.ui' ), self)
+
+		self.altCoverWidget = CoverImageWidget( self.altCoverContainer, CoverImageWidget.AltCoverMode )
+		gridlayout = QtGui.QGridLayout( self.altCoverContainer )
+		gridlayout.addWidget( self.altCoverWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+
+		self.archiveCoverWidget = CoverImageWidget( self.archiveCoverContainer, CoverImageWidget.ArchiveMode )
+		gridlayout = QtGui.QGridLayout( self.archiveCoverContainer )
+		gridlayout.addWidget( self.archiveCoverWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+
+		utils.reduceWidgetFontSize( self.twList )		
+
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)		
+
 		self.matches = matches
-		self.populateTable( )
-		self.twList.resizeColumnsToContents()	
+		self.comic_archive = comic_archive
+		
 		self.twList.currentItemChanged.connect(self.currentItemChanged)	
 		self.twList.cellDoubleClicked.connect(self.cellDoubleClicked)
-		
-		self.current_row = 0
-		self.twList.selectRow( 0 )
 
-					
+		self.updateData()		
+
+	def updateData( self):
+			
+		self.setCoverImage()
+		self.populateTable()
+		self.twList.resizeColumnsToContents()	
+		self.twList.selectRow( 0 )
+		
+		path = self.comic_archive.path
+		self.setWindowTitle( u"Select correct match: {0}".format(
+						os.path.split(path)[1] ))
+		
 	def populateTable( self  ):
 
 		while self.twList.rowCount() > 0:
@@ -60,15 +89,10 @@ class MatchSelectionWindow(QtGui.QDialog):
 			item_text = match['series']  
 			item = QtGui.QTableWidgetItem(item_text)			
 			item.setData( QtCore.Qt.ToolTipRole, item_text )
+			item.setData( QtCore.Qt.UserRole, (match,))
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 0, item)
-			
-			"""
-			item_text = u"{0}".format(match['issue_number'])  
-			item = QtGui.QTableWidgetItem(item_text)			
-			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
-			self.twList.setItem(row, 1, item)
-			"""
+
 			if match['publisher'] is not None:
 				item_text = u"{0}".format(match['publisher'])
 			else:
@@ -78,19 +102,33 @@ class MatchSelectionWindow(QtGui.QDialog):
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 1, item)
 			
-			item_text = ""
+			month_str = u""
+			year_str = u"????"
 			if match['month'] is not None:
-				item_text = u"{0}/".format(match['month'])
+				month_str = u"-{0:02d}".format(int(match['month']))
 			if match['year'] is not None:
-				item_text += u"{0}".format(match['year'])
-			else:
-				item_text += u"????"
+				year_str = u"{0}".format(match['year'])
+
+			item_text = year_str + month_str			
 			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)
+
+			item_text = match['issue_title']  
+			item = QtGui.QTableWidgetItem(item_text)			
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
+			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
+			self.twList.setItem(row, 3, item)
 			
 			row += 1
+
+		self.twList.resizeColumnsToContents()
+		self.twList.setSortingEnabled(True)
+		self.twList.sortItems( 2 , QtCore.Qt.AscendingOrder )
+		self.twList.selectRow(0)
+		self.twList.resizeColumnsToContents()
+		self.twList.horizontalHeader().setStretchLastSection(True) 
 			
 
 	def cellDoubleClicked( self, r, c ):
@@ -102,19 +140,14 @@ class MatchSelectionWindow(QtGui.QDialog):
 			return
 		if prev is not None and prev.row() == curr.row():
 				return
+		
+		self.altCoverWidget.setIssueID( self.currentMatch()['issue_id'] )
+		
+	def setCoverImage( self ):
+		self.archiveCoverWidget.setArchive( self.comic_archive)
+
+	def currentMatch( self ):
+		row = self.twList.currentRow()
+		match = self.twList.item(row, 0).data( QtCore.Qt.UserRole ).toPyObject()[0]
+		return match
 
-		self.current_row = curr.row()
-		
-		# list selection was changed, update the the issue cover				
-		self.labelThumbnail.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
-				
-		self.cover_fetcher = ImageFetcher( )
-		self.cover_fetcher.fetchComplete.connect(self.coverFetchComplete)
-		self.cover_fetcher.fetch( self.matches[self.current_row]['img_url'] )
-				
-	# called when the image is done loading
-	def coverFetchComplete( self, image_data, issue_id ):
-		img = QtGui.QImage()
-		img.loadFromData( image_data )
-		self.labelThumbnail.setPixmap(QtGui.QPixmap(img))
-		

comictaggerlib/options.py

@@ -22,22 +22,11 @@ import sys
 import getopt
 import platform
 import os
-
+import traceback
 import ctversion
+import utils
 from genericmetadata import GenericMetadata
-
-class Enum(set):
-    def __getattr__(self, name):
-        if name in self:
-            return name
-        raise AttributeError
-
-class MetaDataStyle:
-	CBI = 0
-	CIX = 1
-	COMET = 2
-	name = [ 'ComicBookLover', 'ComicRack', 'CoMet' ]
-
+from comicarchive import MetaDataStyle
 
 class Options:
 	help_text = """	
@@ -78,12 +67,21 @@ If no options are given, {0} will run in windowed mode
                              Some names that can be used:
                                  series, issue, issueCount, year, publisher, title
   -r, --rename               Rename the file based on specified tag style.
-      --noabort              Don't abort save operation when online match is of low confidence  
+      --noabort              Don't abort save operation when online match is of low confidence
+  -e, --export-to-zip        Export RAR archive to Zip format
+      --delete-rar           Delete original RAR archive after successful export to Zip
+      --abort-on-conflict    Don't export to zip if intended new filename exists (Otherwise, creates
+                             a new unique filename)
+  -S, --script=FILE          Run an "add-on" python script that uses the comictagger library for custom
+                             processing.  Script arguments can follow the script name  
+  -R, --recursive            Recursively include files in sub-folders                            
   -v, --verbose              Be noisy when doing what it does                            
       --terse                Don't say much (for print mode)                            
       --version              Display version                            
-  -h, --help                 Display this message                            
-		"""
+  -h, --help                 Display this message
+  
+For more help visit the wiki at: http://code.google.com/p/comictagger/
+	"""
 
 
 	def __init__(self):
@@ -96,6 +94,9 @@ If no options are given, {0} will run in windowed mode
 		self.print_tags = False
 		self.copy_tags = False
 		self.delete_tags = False
+		self.export_to_zip = False
+		self.abort_export_on_conflict = False
+		self.delete_rar_after_export = False
 		self.search_online = False
 		self.dryrun = False
 		self.abortOnLowConfidence = True
@@ -107,6 +108,9 @@ If no options are given, {0} will run in windowed mode
 		self.no_overwrite = False
 		self.interactive = False
 		self.issue_id = None
+		self.recursive = False
+		self.run_script = False
+		self.script = None
 		self.file_list = []
 		
 	def display_msg_and_quit( self, msg, code, show_help=False ):
@@ -179,20 +183,26 @@ If no options are given, {0} will run in windowed mode
 		# parse command line options
 		try:
 			opts, args = getopt.getopt( input_args, 
-			           "hpdt:fm:vonsrc:i", 
+			           "hpdt:fm:vonsrc:ieRS:", 
 			           [ "help", "print", "delete", "type=", "copy=", "parsefilename", "metadata=", "verbose",
 			            "online", "dryrun", "save", "rename" , "raw", "noabort", "terse", "nooverwrite",
-			            "interactive", "nosummary", "version", "id=" ])
-			           
+			            "interactive", "nosummary", "version", "id=" , "recursive", "script=",
+			            "export-to-zip", "delete-rar", "abort-on-conflict" ] )
+
 		except getopt.GetoptError as err:
 			self.display_msg_and_quit( str(err), 2 )
-			
+		
 		# process options
 		for o, a in opts:
 			if o in ("-h", "--help"):
 				self.display_msg_and_quit( None, 0, show_help=True )
 			if o in ("-v", "--verbose"):
 				self.verbose = True
+			if o in ("-S", "--script"):
+				self.run_script = True
+				self.script = a
+			if o in ("-R", "--recursive"):
+				self.recursive = True
 			if o in ("-p", "--print"):
 				self.print_tags = True
 			if o in ("-d", "--delete"):
@@ -219,6 +229,12 @@ If no options are given, {0} will run in windowed mode
 				self.save_tags = True
 			if o in ("-r", "--rename"):
 				self.rename_file = True
+			if o in ("-e", "--export_to_zip"):
+				self.export_to_zip = True
+			if o  == "--delete-rar":
+				self.delete_rar_after_export = True
+			if o  == "--abort-on-conflict":
+				self.abort_export_on_conflict = True				
 			if o in ("-f", "--parsefilename"):
 				self.parse_filename = True
 			if o == "--id":
@@ -246,19 +262,56 @@ If no options are given, {0} will run in windowed mode
 					self.data_style = MetaDataStyle.COMET
 				else:
 					self.display_msg_and_quit( "Invalid tag type", 1 )
-			
-		if self.print_tags or self.delete_tags or self.save_tags or self.copy_tags or self.rename_file:
+						
+		if self.print_tags or self.delete_tags or self.save_tags or self.copy_tags or self.rename_file or self.export_to_zip:
 			self.no_gui = True
 
 		count = 0
+		if self.run_script: count += 1
 		if self.print_tags: count += 1
 		if self.delete_tags: count += 1
 		if self.save_tags: count += 1
 		if self.copy_tags: count += 1
 		if self.rename_file: count += 1
+		if self.export_to_zip: count +=1
 		
 		if count > 1:
-			self.display_msg_and_quit( "Must choose only one action of print, delete, save, copy, or rename", 1 )
+			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)
 		
 		if len(args) > 0:
 			if platform.system() == "Windows":
@@ -267,13 +320,14 @@ If no options are given, {0} will run in windowed mode
 				self.file_list = []
 				for item in args:
 					self.file_list.extend(glob.glob(item))
-				self.filename = self.file_list[0]
+				if len(self.file_list) > 0:
+					self.filename = self.file_list[0]
 			else:
 				self.filename = args[0]
 				self.file_list = args
 
 		if self.no_gui and self.filename is None:
-			self.display_msg_and_quit( "Command requires a filename!", 1 )
+			self.display_msg_and_quit( "Command requires at least one filename!", 1 )
 			
 		if self.delete_tags and self.data_style is None:
 			self.display_msg_and_quit( "Please specify the type to delete with -t", 1 )
@@ -287,3 +341,5 @@ If no options are given, {0} will run in windowed mode
 		#if self.rename_file and self.data_style is None:
 		#	self.display_msg_and_quit( "Please specify the type to use for renaming with -t", 1 )
 		
+		if self.recursive:
+			self.file_list = utils.get_recursive_filelist( self.file_list )

comictaggerlib/pagebrowser.py

@@ -18,27 +18,43 @@ See the License for the specific language governing permissions and
 limitations under the License.
 """
 
+import platform
 import sys
 from PyQt4 import QtCore, QtGui, uic
 import os
 from settings import ComicTaggerSettings
-
+from coverimagewidget import CoverImageWidget
 
 class PageBrowserWindow(QtGui.QDialog):
 	
 	def __init__(self, parent, metadata):
 		super(PageBrowserWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'pagebrowser.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('pagebrowser.ui' ), self)
+		
+		self.pageWidget = CoverImageWidget( self.pageContainer, CoverImageWidget.ArchiveMode )
+		gridlayout = QtGui.QGridLayout( self.pageContainer )
+		gridlayout.addWidget( self.pageWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+		self.pageWidget.showControls = False
+
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)
 		
-		self.lblPage.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
-		self.lblPage.setSizePolicy(QtGui.QSizePolicy.Ignored, QtGui.QSizePolicy.Ignored)
 		self.comic_archive = None
-		self.current_pixmap = None
 		self.page_count = 0
 		self.current_page_num = 0
 		self.metadata = metadata
 		
+		self.buttonBox.button(QtGui.QDialogButtonBox.Close).setDefault(True)	
+		if platform.system() == "Darwin":
+			self.btnPrev.setText("<<")
+			self.btnNext.setText(">>")
+		else:
+			self.btnPrev.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('left.png' )))
+			self.btnNext.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('right.png')))
+		
 		self.btnNext.clicked.connect( self.nextPage )
 		self.btnPrev.clicked.connect( self.prevPage )
 		self.show()
@@ -46,72 +62,49 @@ class PageBrowserWindow(QtGui.QDialog):
 		self.btnNext.setEnabled( False )
 		self.btnPrev.setEnabled( False )
 		
+	def reset( self ):
+		self.comic_archive = None
+		self.page_count = 0
+		self.current_page_num = 0
+		self.metadata = None
+		
+		self.btnNext.setEnabled( False )
+		self.btnPrev.setEnabled( False )
+		self.pageWidget.clear()
+
 	def setComicArchive(self, ca):
 
 		self.comic_archive = ca
 		self.page_count = ca.getNumberOfPages()
 		self.current_page_num = 0
-		
+		self.pageWidget.setArchive( self.comic_archive )
 		self.setPage()
+	
+		if 	self.page_count > 1:
+			self.btnNext.setEnabled( True )
+			self.btnPrev.setEnabled( True )
 
 	def nextPage(self):
 		
 		if self.current_page_num + 1 < self.page_count:
 			self.current_page_num += 1
+		else:
+			self.current_page_num = 0
 		self.setPage()
 
 	def prevPage(self):
 		
 		if self.current_page_num - 1 >= 0:
 			self.current_page_num -= 1
+		else:
+			self.current_page_num = self.page_count - 1
 		self.setPage()
 			
 	def setPage( self ):
-		archive_page_index = self.metadata.getArchivePageIndex( self.current_page_num )
-		image_data = self.comic_archive.getPage( archive_page_index )
-
-		if  image_data is not None:
-			self.setCurrentPixmap( image_data )
-			self.setDisplayPixmap( 0, 0)
+		if self.metadata is not None:
+			archive_page_index = self.metadata.getArchivePageIndex( self.current_page_num )
+		else:
+			archive_page_index =  self.current_page_num
+			
+		self.pageWidget.setPage( archive_page_index )
 		self.setWindowTitle("Page Browser - Page {0} (of {1}) ".format(self.current_page_num+1, self.page_count ) )
-		
-		if self.current_page_num + 1 < self.page_count:
-			self.btnNext.setEnabled( True )
-		else:
-			self.btnNext.setEnabled( False )
-
-		if self.current_page_num - 1 >= 0:
-			self.btnPrev.setEnabled( True )
-		else:
-			self.btnPrev.setEnabled( False )
-
-		
-	def setCurrentPixmap( self, image_data ):
-		if image_data is not None:
-			img = QtGui.QImage()
-			img.loadFromData( image_data )
-			self.current_pixmap = QtGui.QPixmap(QtGui.QPixmap(img))
-		
-	def resizeEvent( self, resize_event ):
-		if self.current_pixmap is not None:
-			delta_w = resize_event.size().width() - resize_event.oldSize().width()
-			delta_h = resize_event.size().height() - resize_event.oldSize().height()
-			
-			self.setDisplayPixmap( delta_w , delta_h )
-
-	def setDisplayPixmap( self, delta_w , delta_h ):
-			# the deltas let us know what the new width and height of the label will be
-			new_h = self.lblPage.height() + delta_h
-			new_w = self.lblPage.width() + delta_w
-			
-			if new_h < 0:
-				new_h = 0;
-			if new_w < 0:
-				new_w = 0;
-			scaled_pixmap = self.current_pixmap.scaled(new_w, new_h, QtCore.Qt.KeepAspectRatio)			
-			self.lblPage.setPixmap( scaled_pixmap )
-			#QtCore.QCoreApplication.processEvents()
-
-			
-
-			

comictaggerlib/pagelisteditor.py

@@ -26,8 +26,10 @@ from PyQt4 import uic
 
 from settings import ComicTaggerSettings
 from genericmetadata import GenericMetadata, PageType
-from options import MetaDataStyle
+from comicarchive import MetaDataStyle
 from pageloader import PageLoader
+from coverimagewidget import CoverImageWidget
+
 
 def itemMoveEvents( widget ):
 
@@ -76,11 +78,13 @@ class PageListEditor(QWidget):
 	def __init__(self, parent ):
 		super(PageListEditor, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'pagelisteditor.ui' ), self )
+		uic.loadUi(ComicTaggerSettings.getUIFile('pagelisteditor.ui' ), self)
 
-		self.comic_archive = None
-		self.pages_list = None
-		self.page_loader = None
+		self.pageWidget = CoverImageWidget( self.pageContainer, CoverImageWidget.ArchiveMode )
+		gridlayout = QGridLayout( self.pageContainer )
+		gridlayout.addWidget( self.pageWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+		self.pageWidget.showControls = False
 
 		self.resetPage()
 	
@@ -107,8 +111,10 @@ class PageListEditor(QWidget):
 		self.first_front_page = None
 
 	def resetPage( self ):
-		self.current_pixmap = QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' ))
-		self.setDisplayPixmap( 0, 0)
+		self.pageWidget.clear()
+		self.comboBox.setDisabled(True)
+		self.comic_archive = None
+		self.pages_list = None
 		
 	def moveCurrentUp( self ):
 		row = self.listWidget.currentRow()
@@ -157,18 +163,8 @@ class PageListEditor(QWidget):
 		#idx = int(str (self.listWidget.item( row ).text()))
 		idx = int(self.listWidget.item( row ).data(Qt.UserRole).toPyObject()[0]['Image'])
 
-		if self.page_loader is not None:
-			self.page_loader.abandoned = True
-
 		if self.comic_archive is not None:
-			self.page_loader = PageLoader( self.comic_archive, idx )
-			self.page_loader.loadComplete.connect( self.actualChangePageImage )	
-			self.page_loader.start()
-
-	def actualChangePageImage( self, img ):
-		self.page_loader = None
-		self.current_pixmap = QPixmap(img)
-		self.setDisplayPixmap( 0, 0)
+			self.pageWidget.setArchive( self.comic_archive, idx )
 
 	def getFirstFrontCover( self ):
 		frontCover = 0
@@ -203,44 +199,13 @@ class PageListEditor(QWidget):
 		# wrap the dict in a tuple to keep from being converted to QStrings
 		item.setData(Qt.UserRole, (page_dict,) )
 		item.setText( self.listEntryText( page_dict ) )
-
-
-	def resizeEvent( self, resize_event ):
-		if self.current_pixmap is not None:
-			delta_w = resize_event.size().width() - resize_event.oldSize().width()
-			delta_h = resize_event.size().height() - resize_event.oldSize().height()
-			self.setDisplayPixmap( delta_w , delta_h )
-			
-	def setDisplayPixmap( self, delta_w , delta_h ):
-			# the deltas let us know what the new width and height of the label will be
-			new_h = self.frame.height() + delta_h
-			new_w = self.frame.width() + delta_w
-
-			frame_w = new_w
-			frame_h = new_h
-
-			new_h -= 4
-			new_w -= 4
-			
-			if new_h < 0:
-				new_h = 0;
-			if new_w < 0:
-				new_w = 0;
-				
-			# scale the pixmap to fit in the frame
-			scaled_pixmap = self.current_pixmap.scaled(new_w, new_h, Qt.KeepAspectRatio)			
-			self.label.setPixmap( scaled_pixmap )
-			
-			# ,pve and resize the label to be centered in the fame
-			img_w = scaled_pixmap.width()
-			img_h = scaled_pixmap.height()
-			self.label.resize( img_w, img_h )
-			self.label.move( (frame_w - img_w)/2, (frame_h - img_h)/2 )
 			
 
 	def setData( self, comic_archive, pages_list ):
 		self.comic_archive = comic_archive
 		self.pages_list = pages_list
+		if pages_list is not None and len(pages_list) > 0:
+			self.comboBox.setDisabled(False)
 
 		self.listWidget.itemSelectionChanged.disconnect( self.changePage )
 
@@ -256,7 +221,7 @@ class PageListEditor(QWidget):
 		self.listWidget.setCurrentRow ( 0 )
 
 	def listEntryText(self, page_dict):
-		text =  page_dict['Image']
+		text =  str(int(page_dict['Image']) + 1)
 		if 'Type' in page_dict:
 			text += " (" + self.pageTypeNames[page_dict['Type']] + ")"
 		return text
@@ -278,9 +243,9 @@ class PageListEditor(QWidget):
 		# depending on the current data style, certain fields are disabled
 		
 		inactive_color = QColor(255, 170, 150)
-		active_palette = self.label.palette()
+		active_palette = self.comboBox.palette()
 		
-		inactive_palette3 = self.label.palette()
+		inactive_palette3 = self.comboBox.palette()
 		inactive_palette3.setColor(QPalette.Base, inactive_color)
 
 
@@ -302,8 +267,7 @@ class PageListEditor(QWidget):
 			
 		elif data_style == MetaDataStyle.CoMet:
 			pass
-			
-	def showEvent( self, event ):
-		# make sure to adjust the size and pos of the pixmap based on frame size
-		self.setDisplayPixmap( 0,0 )
-
+		
+		# make sure combo is disabled when no list
+		if self.comic_archive is None:
+			self.comboBox.setEnabled( False )

comictaggerlib/progresswindow.py

@@ -22,7 +22,7 @@ import sys
 from PyQt4 import QtCore, QtGui, uic
 import os
 from settings import ComicTaggerSettings
-
+import utils
 
 class IDProgressWindow(QtGui.QDialog):
 	
@@ -30,14 +30,13 @@ class IDProgressWindow(QtGui.QDialog):
 	def __init__(self, parent):
 		super(IDProgressWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'progresswindow.ui' ), self)
-		
-		# we can't specify relative font sizes in the UI designer, so
-		# make font for scroll window a smidge smaller
-		f = self.textEdit.font()
-		if f.pointSize() > 10:
-			f.setPointSize( f.pointSize() - 2 )
-		self.textEdit.setFont( f )	
+		uic.loadUi(ComicTaggerSettings.getUIFile('progresswindow.ui' ), self)
+
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)
+
+		utils.reduceWidgetFontSize( self.textEdit )
 
 
 		

comictaggerlib/renamewindow.py

@@ -23,7 +23,7 @@ from PyQt4 import QtCore, QtGui, uic
 from settings import ComicTaggerSettings
 from settingswindow import SettingsWindow
 from filerenamer import FileRenamer
-from options import MetaDataStyle
+from comicarchive import MetaDataStyle
 
 import os
 import utils
@@ -33,9 +33,13 @@ class RenameWindow(QtGui.QDialog):
 	def __init__( self, parent, comic_archive_list, data_style, settings ):
 		super(RenameWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'renamewindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('renamewindow.ui' ), self)
 		self.label.setText("Preview (based on {0} tags):".format(MetaDataStyle.name[data_style]))
 
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)
+
 		self.settings = settings
 		self.comic_archive_list = comic_archive_list
 		self.data_style = data_style

comictaggerlib/settings.py

@@ -35,14 +35,31 @@ class ComicTaggerSettings:
 		else:
 			return os.path.join( os.path.expanduser('~') , '.ComicTagger')
 
+	frozen_win_exe_path = None
+	
 	@staticmethod
 	def baseDir():
-		if platform.system() == "Darwin" and getattr(sys, 'frozen', None):
-			return sys._MEIPASS
+		if getattr(sys, 'frozen', None):
+			if platform.system() == "Darwin":
+				return sys._MEIPASS
+			else: # Windows
+				#Preserve this value, in case sys.argv gets changed importing a plugin script
+				if ComicTaggerSettings.frozen_win_exe_path is None:
+					ComicTaggerSettings.frozen_win_exe_path = os.path.dirname( os.path.abspath( sys.argv[0] ) )
+				return ComicTaggerSettings.frozen_win_exe_path
 		else:
-			#print "ATB basename", os.path.dirname( os.path.abspath( sys.argv[0] ) )
-			return os.path.dirname( os.path.abspath( sys.argv[0] ) )
+			return os.path.dirname( os.path.abspath( __file__) )
+
+	@staticmethod
+	def getGraphic( filename ):
+		graphic_folder = os.path.join(ComicTaggerSettings.baseDir(), 'graphics')
+		return os.path.join( graphic_folder, filename )
 		
+	@staticmethod
+	def getUIFile( filename ):
+		ui_folder = os.path.join(ComicTaggerSettings.baseDir(), 'ui')
+		return os.path.join( ui_folder, filename )
+
 	def setDefaultValues( self ):
 
 		# General Settings
@@ -63,7 +80,7 @@ class ComicTaggerSettings:
 		
 		# identifier settings
 		self.id_length_delta_thresh = 5
-		self.id_publisher_blacklist = "Panini Comics, Abril, Scholastic Book Services, Editorial Televisa"
+		self.id_publisher_blacklist = "Panini Comics, Abril, Planeta DeAgostini, Editorial Televisa"
 		
 		# Show/ask dialog flags
 		self.ask_about_cbi_in_rar = True
@@ -131,6 +148,10 @@ class ComicTaggerSettings:
 					self.unrar_exe_path = utils.which("unrar")
 			if self.unrar_exe_path != "":
 				self.save()
+				
+		# make sure unrar/rar program is now in the path for the UnRAR class to use
+		utils.addtopath(os.path.dirname(self.unrar_exe_path))
+		utils.addtopath(os.path.dirname(self.rar_exe_path))
 
 	def reset( self ):
 		os.unlink( self.settings_file )
@@ -262,3 +283,5 @@ class ComicTaggerSettings:
 		with open( self.settings_file, 'wb') as configfile:
 			self.config.write(configfile)    
 
+#make sure the basedir is cached, in case we're  on windows running a script from frozen binary
+ComicTaggerSettings.baseDir()

comictaggerlib/settingswindow.py

@@ -54,10 +54,12 @@ class SettingsWindow(QtGui.QDialog):
 	def __init__(self, parent, settings ):
 		super(SettingsWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'settingswindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('settingswindow.ui' ), self)
 
-		self.settings = settings
-		
+		self.setWindowFlags(self.windowFlags() &
+									  ~QtCore.Qt.WindowContextHelpButtonHint )
+
+		self.settings = settings		
 		self.name = "Settings"
 				
 		if platform.system() == "Windows":
@@ -151,8 +153,9 @@ class SettingsWindow(QtGui.QDialog):
 		self.settings.rar_exe_path = str(self.leRarExePath.text())
 		self.settings.unrar_exe_path = str(self.leUnrarExePath.text())
 		
-		# make sure unrar program is now in the path for the UnRAR class
+		# make sure unrar/rar program is now in the path for the UnRAR class
 		utils.addtopath(os.path.dirname(self.settings.unrar_exe_path))
+		utils.addtopath(os.path.dirname(self.settings.rar_exe_path))
 		
 		if not str(self.leNameLengthDeltaThresh.text()).isdigit():
 			self.leNameLengthDeltaThresh.setText("0")

comictaggerlib/taggerwindow.py

@@ -1,6 +1,6 @@
 # coding=utf-8
 """
-The main window of the comictagger app
+The main window of the ComicTagger app
 """
 
 """
@@ -32,7 +32,7 @@ import webbrowser
 import re
 
 from volumeselectionwindow import VolumeSelectionWindow
-from options import MetaDataStyle
+from comicarchive import MetaDataStyle
 from comicinfoxml import ComicInfoXml
 from genericmetadata import GenericMetadata
 from comicvinetalker import ComicVineTalker, ComicVineTalkerException
@@ -54,6 +54,8 @@ from issueidentifier import IssueIdentifier
 from autotagstartwindow import AutoTagStartWindow
 from autotagprogresswindow import AutoTagProgressWindow
 from autotagmatchwindow import AutoTagMatchWindow
+from coverimagewidget import CoverImageWidget
+
 import utils
 import ctversion
 
@@ -62,6 +64,7 @@ class OnlineMatchResults():
 		self.goodMatches = []  
 		self.noMatches = []    
 		self.multipleMatches = []  
+		self.lowConfidenceMatches = []  
 		self.writeFailures = []
 		self.fetchDataFailures = []
 		
@@ -69,31 +72,6 @@ class MultipleMatch():
 	def __init__( self, ca, match_list):
 		self.ca = ca  
 		self.matches = match_list  		
-		
-# this reads the environment and inits the right locale
-locale.setlocale(locale.LC_ALL, "")
-
-# helper func to allow a label to be clickable
-def clickable(widget):
-
-	class Filter(QtCore.QObject):
-	
-		dblclicked = pyqtSignal()
-		
-		def eventFilter(self, obj, event):
-		
-			if obj == widget:
-				if event.type() == QtCore.QEvent.MouseButtonDblClick:
-					self.dblclicked.emit()
-					return True
-			
-			return False
-	
-	filter = Filter(widget)
-	widget.installEventFilter(filter)
-	return filter.dblclicked
-
-
 
 class TaggerWindow( QtGui.QMainWindow):
 	
@@ -103,9 +81,14 @@ class TaggerWindow( QtGui.QMainWindow):
 	def __init__(self, file_list, settings, parent = None):
 		super(TaggerWindow, self).__init__(parent)
 
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'taggerwindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('taggerwindow.ui' ), self)
 		self.settings = settings
-		
+
+		self.archiveCoverWidget = CoverImageWidget( self.coverImageContainer, CoverImageWidget.ArchiveMode )
+		gridlayout = QtGui.QGridLayout( self.coverImageContainer )
+		gridlayout.addWidget( self.archiveCoverWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+					
 		self.pageListEditor = PageListEditor( self.tabPages )
 		gridlayout = QtGui.QGridLayout( self.tabPages )
 		gridlayout.addWidget( self.pageListEditor ) 
@@ -117,11 +100,6 @@ class TaggerWindow( QtGui.QMainWindow):
 		
 		self.fileSelectionList.selectionChanged.connect( self.fileListSelectionChanged )
 		self.fileSelectionList.listCleared.connect( self.fileListCleared )
-			
-		# ATB: Disable the list...
-		#self.splitter.setSizes([100,0])
-		#self.splitter.setHandleWidth(0)
-		#self.splitter.handle(1).setDisabled(True)
 
 		# we can't specify relative font sizes in the UI designer, so
 		# walk through all the lablels in the main form, and make them
@@ -133,14 +111,11 @@ class TaggerWindow( QtGui.QMainWindow):
 					f.setPointSize( f.pointSize() - 2 )
 				f.setItalic( True )
 				child.setFont( f )
-						
 
 		self.scrollAreaWidgetContents.adjustSize()
 		
-		self.setWindowIcon(QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/app.png' )))
-		
-		self.lblCover.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
-		
+		self.setWindowIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('app.png')))
+
 		self.save_data_style = settings.last_selected_save_data_style
 		self.load_data_style = settings.last_selected_load_data_style
 
@@ -149,6 +124,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.statusBar()	
 		self.populateComboBoxes()	
 
+		self.page_browser = None
 		self.resetApp()
 		
 		# set up some basic field validators
@@ -167,7 +143,13 @@ class TaggerWindow( QtGui.QMainWindow):
 		
 		#TODO set up an RE validator for issueNum that allows
 		# for all sorts of wacky things
-		
+
+		# tweak some control fonts	
+		utils.reduceWidgetFontSize( self.lblFilename, 1 )
+		utils.reduceWidgetFontSize( self.lblArchiveType )
+		utils.reduceWidgetFontSize( self.lblTagList )
+		utils.reduceWidgetFontSize( self.lblPageCount )
+
 		#make sure some editable comboboxes don't take drop actions
 		self.cbFormat.lineEdit().setAcceptDrops(False)
 		self.cbMaturityRating.lineEdit().setAcceptDrops(False)
@@ -179,13 +161,11 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.btnAddCredit.clicked.connect(self.addCredit)	
 		self.btnRemoveCredit.clicked.connect(self.removeCredit)	
 		self.twCredits.cellDoubleClicked.connect(self.editCredit)
-		clickable(self.lblCover).connect(self.showPageBrowser)
-
 		self.connectDirtyFlagSignals()
-		self.pageListEditor.modified.connect(self.setDirtyFlag)
-
+		self.pageListEditor.modified.connect(self.setDirtyFlag)		
 		self.pageListEditor.firstFrontCoverChanged.connect( self.frontCoverChanged )
 		self.pageListEditor.listOrderChanged.connect( self.pageListOrderChanged )
+		self.tabWidget.currentChanged.connect( self.tabChanged )
 		
 		self.updateStyleTweaks()
 
@@ -230,19 +210,18 @@ class TaggerWindow( QtGui.QMainWindow):
 
 	def resetApp( self ):
 
-		self.lblCover.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
-
+		self.archiveCoverWidget.clear()
 		self.comic_archive = None
 		self.dirtyFlag = False
 		self.clearForm()
 		self.pageListEditor.resetPage()
-
+		if self.page_browser is not None:
+			self.page_browser.reset()
 		self.updateAppTitle()
 		self.updateMenus()
 		self.updateInfoBox()
 		
 		self.droppedFile = None
-		self.page_browser = None
 		self.page_loader = None
 
 		
@@ -313,6 +292,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.actionRename.setStatusTip( 'Rename archive based on tags' )
 		self.actionRename.triggered.connect( self.renameArchive )
 		
+		self.actionSettings.setShortcut( 'Ctrl+Shift+S' )
 		self.actionSettings.setStatusTip( 'Configure ComicTagger' )
 		self.actionSettings.triggered.connect( self.showSettings )
 		
@@ -349,16 +329,16 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.actionComicTaggerForum.triggered.connect( self.showForum )
 	
 		# ToolBar
-	
-		self.actionLoad.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/open.png')) )
-		self.actionLoadFolder.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/longbox.png')) )
-		self.actionWrite_Tags.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/save.png')) )
-		self.actionParse_Filename.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/parse.png')) )
-		self.actionSearchOnline.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/search.png')) )
-		self.actionAutoIdentify.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/auto.png')) )
-		self.actionAutoTag.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/autotag.png')) )
-		self.actionClearEntryForm.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/clear.png')) )
-		self.actionPageBrowser.setIcon( QtGui.QIcon(os.path.join(ComicTaggerSettings.baseDir(),'graphics/browse.png') ))
+
+		self.actionLoad.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('open.png')))
+		self.actionLoadFolder.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('longbox.png')))
+		self.actionWrite_Tags.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('save.png')))
+		self.actionParse_Filename.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('parse.png')))
+		self.actionSearchOnline.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('search.png')))
+		self.actionAutoIdentify.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('auto.png')))
+		self.actionAutoTag.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('autotag.png')))
+		self.actionClearEntryForm.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('clear.png')))
+		self.actionPageBrowser.setIcon(QtGui.QIcon( ComicTaggerSettings.getGraphic('browse.png')))
 		
 		self.toolBar.addAction( self.actionLoad )
 		self.toolBar.addAction( self.actionLoadFolder )
@@ -394,7 +374,7 @@ class TaggerWindow( QtGui.QMainWindow):
 					
 			progdialog = QtGui.QProgressDialog("", "Cancel", 0, rar_count, self)
 			progdialog.setWindowTitle( "Exporting as ZIP" )
-			progdialog.setWindowModality(QtCore.Qt.WindowModal)
+			progdialog.setWindowModality(QtCore.Qt.ApplicationModal)
 			progdialog.show()
 			prog_idx = 0
 		
@@ -412,6 +392,7 @@ class TaggerWindow( QtGui.QMainWindow):
 					progdialog.setValue(prog_idx)
 					prog_idx += 1
 					progdialog.setLabelText( ca.path )
+					utils.centerWindowOnParent( progdialog )
 					QtCore.QCoreApplication.processEvents()
 
 					original_path = os.path.abspath( ca.path )
@@ -470,7 +451,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		msgBox = QtGui.QMessageBox()
 		msgBox.setWindowTitle( self.tr("About " + self.appName ) )
 		msgBox.setTextFormat( QtCore.Qt.RichText )
-		msgBox.setIconPixmap( QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/about.png' )) )
+		msgBox.setIconPixmap( QtGui.QPixmap(ComicTaggerSettings.getGraphic('about.png')) )
 		msgBox.setText( "<br><br><br>" 
 		               + self.appName + " v" + self.version + "<br>" 
 		               + "(c)2012 Anthony Beville<br><br>"
@@ -518,21 +499,11 @@ class TaggerWindow( QtGui.QMainWindow):
 		self.clearDirtyFlag()  # also updates the app title
 		self.updateInfoBox()
 		self.updateMenus()
+		self.updateAppTitle()
 
 	def updateCoverImage( self ):
-		if self.page_loader is not None:
-			self.page_loader.abandoned = True
-			
 		cover_idx = self.metadata.getCoverPageIndexList()[0]
-			
-		self.page_loader = PageLoader( self.comic_archive, cover_idx )
-		self.page_loader.loadComplete.connect( self.actualUpdateCoverImage )	
-		self.page_loader.start()
-		
-	def actualUpdateCoverImage( self, img ):
-		self.page_loader = None
-		self.lblCover.setPixmap(QtGui.QPixmap(img))
-		self.lblCover.setScaledContents(True)
+		self.archiveCoverWidget.setArchive( self.comic_archive, cover_idx)
 
 	def updateMenus( self ):
 		
@@ -589,7 +560,7 @@ class TaggerWindow( QtGui.QMainWindow):
 			
 		filename = os.path.basename( ca.path )
 		filename = os.path.splitext(filename)[0]
-		filename = FileNameParser().fixSpaces(filename)
+		filename = FileNameParser().fixSpaces(filename, False)
 
 		self.lblFilename.setText( filename )
 
@@ -1408,7 +1379,7 @@ class TaggerWindow( QtGui.QMainWindow):
 			if reply == QtGui.QMessageBox.Yes:
 				progdialog = QtGui.QProgressDialog("", "Cancel", 0, has_md_count, self)
 				progdialog.setWindowTitle( "Removing Tags" )
-				progdialog.setWindowModality(QtCore.Qt.WindowModal)
+				progdialog.setWindowModality(QtCore.Qt.ApplicationModal)
 				progdialog.show()				
 				prog_idx = 0
 				
@@ -1422,6 +1393,7 @@ class TaggerWindow( QtGui.QMainWindow):
 						progdialog.setValue(prog_idx)
 						prog_idx += 1
 						progdialog.setLabelText( ca.path )
+						utils.centerWindowOnParent( progdialog )
 						QtCore.QCoreApplication.processEvents()
 					
 					if ca.hasMetadata( style ) and ca.isWritable():
@@ -1445,6 +1417,7 @@ class TaggerWindow( QtGui.QMainWindow):
 				dlg = LogWindow( self )
 				dlg.setText( summary )
 				dlg.setWindowTitle( "Tag Remove Summary" )
+				#dlg.adjustSize()
 				dlg.exec_()			
 				
 	def copyTags( self ):
@@ -1483,7 +1456,7 @@ class TaggerWindow( QtGui.QMainWindow):
 			if reply == QtGui.QMessageBox.Yes:
 				progdialog = QtGui.QProgressDialog("", "Cancel", 0, has_src_count, self)
 				progdialog.setWindowTitle( "Copying Tags" )
-				progdialog.setWindowModality(QtCore.Qt.WindowModal)
+				progdialog.setWindowModality(QtCore.Qt.ApplicationModal)
 				progdialog.show()
 				prog_idx = 0
 				
@@ -1497,6 +1470,7 @@ class TaggerWindow( QtGui.QMainWindow):
 						progdialog.setValue(prog_idx)
 						prog_idx += 1
 						progdialog.setLabelText( ca.path )
+						utils.centerWindowOnParent( progdialog )
 						QtCore.QCoreApplication.processEvents()
 					
 					if ca.hasMetadata( src_style ) and ca.isWritable():
@@ -1594,6 +1568,7 @@ class TaggerWindow( QtGui.QMainWindow):
 		found_match = False
 		choices = False
 		low_confidence = False
+		no_match = False
 		
 		if result == ii.ResultNoMatches:
 			pass
@@ -1611,18 +1586,22 @@ class TaggerWindow( QtGui.QMainWindow):
 			choices = True
 	
 		if choices:
-			self.autoTagLog( "Online search: Multiple matches.  Save aborted\n" ) 
-			match_results.multipleMatches.append(MultipleMatch(ca,matches))
+			if low_confidence:
+				self.autoTagLog( "Online search: Multiple low-confidence matches.  Save aborted\n" )
+				match_results.lowConfidenceMatches.append(MultipleMatch(ca,matches))
+			else:
+				self.autoTagLog( "Online search: Multiple matches.  Save aborted\n" ) 
+				match_results.multipleMatches.append(MultipleMatch(ca,matches))
 		elif low_confidence and not dlg.autoSaveOnLow:
 			self.autoTagLog(  "Online search: Low confidence match.  Save aborted\n" )
-			match_results.noMatches.append(ca.path)
+			match_results.lowConfidenceMatches.append(MultipleMatch(ca,matches))
 		elif not found_match:
 			self.autoTagLog(  "Online search: No match found.  Save aborted\n" )
 			match_results.noMatches.append(ca.path)
 		else:
 			#  a single match!
 			if low_confidence:
-				self.autoTagLog(  "Online search: Low confidence match, but saving anyways, as incdicated...\n" )				
+				self.autoTagLog(  "Online search: Low confidence match, but saving anyways, as indicated...\n" )				
 			
 			# now get the particular issue data
 			cv_md = self.actualIssueDataFetch( matches[0] )
@@ -1691,6 +1670,7 @@ class TaggerWindow( QtGui.QMainWindow):
 			self.atprogdialog.progressBar.setValue( prog_idx )
 			prog_idx += 1
 			self.atprogdialog.label.setText( ca.path )
+			utils.centerWindowOnParent( self.atprogdialog )
 			QtCore.QCoreApplication.processEvents()
 			
 			if ca.isWritable():
@@ -1713,6 +1693,8 @@ class TaggerWindow( QtGui.QMainWindow):
 
 		if len ( match_results.multipleMatches ) > 0:
 			summary += u"Archives with multiple matches: {0}\n".format( len(match_results.multipleMatches))
+		if len ( match_results.lowConfidenceMatches ) > 0:
+			summary += u"Archives with one or more low-confidence matches: {0}\n".format( len(match_results.lowConfidenceMatches))
 		if len ( match_results.noMatches ) > 0:
 			summary += u"Archives with no matches: {0}\n".format( len(match_results.noMatches))
 		if len ( match_results.fetchDataFailures ) > 0:
@@ -1721,15 +1703,17 @@ class TaggerWindow( QtGui.QMainWindow):
 			summary += u"Archives that failed due to file writing errors: {0}\n".format( len(match_results.writeFailures))
 
 		self.autoTagLog( summary )			
-				
-		if len ( match_results.multipleMatches ) > 0:
-			summary += u"\n\nDo you want to manually select the ones with multiple matches now?"
+		
+		sum_selectable = len ( match_results.multipleMatches ) + len(match_results.lowConfidenceMatches)
+		if sum_selectable > 0:
+			summary += u"\n\nDo you want to manually select the ones with multiple matches and/or low-confidence matches now?"
 		
 			reply = QtGui.QMessageBox.question(self, 
 			     self.tr(u"Auto-Tag Summary"), 
 			     self.tr(summary),
 			     QtGui.QMessageBox.Yes, QtGui.QMessageBox.No )
-			     
+			
+			match_results.multipleMatches.extend( match_results.lowConfidenceMatches )
 			if reply == QtGui.QMessageBox.Yes:
 				matchdlg = AutoTagMatchWindow( self, match_results.multipleMatches, style, self.actualIssueDataFetch)
 				matchdlg.setModal( True )
@@ -1867,3 +1851,7 @@ class TaggerWindow( QtGui.QMainWindow):
 	def resizeEvent( self, ev ):
 		self.splitterMovedEvent( 0, 0)
 
+	def tabChanged( self, idx ):
+		if idx == 0:
+			self.splitterMovedEvent( 0, 0)
+

comictaggerlib/ui/autotagmatchwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>831</width>
-    <height>506</height>
+    <width>907</width>
+    <height>507</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -18,32 +18,27 @@
     <layout class="QVBoxLayout" name="verticalLayout">
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>0</number>
+       </property>
        <item>
-        <widget class="QLabel" name="labelCover">
+        <widget class="QWidget" name="archiveCoverContainer" native="true">
          <property name="minimumSize">
           <size>
            <width>200</width>
-           <height>0</height>
+           <height>350</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>200</width>
-           <height>300</height>
+           <height>350</height>
           </size>
          </property>
-         <property name="text">
-          <string>TextLabel</string>
-         </property>
         </widget>
        </item>
        <item>
         <widget class="QTableWidget" name="twList">
-         <property name="font">
-          <font>
-           <pointsize>9</pointsize>
-          </font>
-         </property>
          <property name="selectionMode">
           <enum>QAbstractItemView::SingleSelection</enum>
          </property>
@@ -54,7 +49,7 @@
           <number>0</number>
          </property>
          <property name="columnCount">
-          <number>3</number>
+          <number>4</number>
          </property>
          <attribute name="horizontalHeaderStretchLastSection">
           <bool>true</bool>
@@ -77,34 +72,27 @@
            <string>Date</string>
           </property>
          </column>
+         <column>
+          <property name="text">
+           <string>Title</string>
+          </property>
+         </column>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="labelThumbnail">
+        <widget class="QWidget" name="altCoverContainer" native="true">
          <property name="minimumSize">
           <size>
            <width>200</width>
-           <height>0</height>
+           <height>350</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
            <width>200</width>
-           <height>300</height>
+           <height>350</height>
           </size>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::Panel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
         </widget>
        </item>
       </layout>

comictaggerlib/ui/coverimagewidget.ui

@@ -0,0 +1,123 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>coverImageWidget</class>
+ <widget class="QWidget" name="coverImageWidget">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>292</width>
+    <height>353</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>4</number>
+   </property>
+   <property name="margin">
+    <number>0</number>
+   </property>
+   <item row="1" column="0">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <property name="spacing">
+      <number>2</number>
+     </property>
+     <item>
+      <widget class="QPushButton" name="btnLeft">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>30</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="MinimumExpanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="alignment">
+        <set>Qt::AlignCenter</set>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btnRight">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>30</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0">
+    <widget class="QFrame" name="frame">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="frameShape">
+      <enum>QFrame::NoFrame</enum>
+     </property>
+     <property name="frameShadow">
+      <enum>QFrame::Raised</enum>
+     </property>
+     <widget class="QLabel" name="lblImage">
+      <property name="geometry">
+       <rect>
+        <x>60</x>
+        <y>50</y>
+        <width>91</width>
+        <height>61</height>
+       </rect>
+      </property>
+      <property name="toolTip">
+       <string>Double-click to expand</string>
+      </property>
+      <property name="text">
+       <string>TextLabel</string>
+      </property>
+     </widget>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

comictaggerlib/ui/imagepopup.ui

@@ -0,0 +1,38 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>Form</class>
+ <widget class="QDialog" name="Form">
+  <property name="windowModality">
+   <enum>Qt::ApplicationModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>817</width>
+    <height>455</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <property name="windowOpacity">
+   <double>1.000000000000000</double>
+  </property>
+  <widget class="QLabel" name="lblImage">
+   <property name="geometry">
+    <rect>
+     <x>300</x>
+     <y>120</y>
+     <width>66</width>
+     <height>17</height>
+    </rect>
+   </property>
+   <property name="text">
+    <string/>
+   </property>
+  </widget>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

comictaggerlib/ui/issueselectionwindow.ui

@@ -20,11 +20,6 @@
       <layout class="QHBoxLayout" name="horizontalLayout">
        <item>
         <widget class="QTableWidget" name="twList">
-         <property name="font">
-          <font>
-           <pointsize>9</pointsize>
-          </font>
-         </property>
          <property name="selectionMode">
           <enum>QAbstractItemView::SingleSelection</enum>
          </property>
@@ -59,11 +54,11 @@
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="labelThumbnail">
+        <widget class="QWidget" name="coverImageContainer" native="true">
          <property name="minimumSize">
           <size>
            <width>300</width>
-           <height>0</height>
+           <height>450</height>
           </size>
          </property>
          <property name="maximumSize">
@@ -72,18 +67,6 @@
            <height>450</height>
           </size>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::Panel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
         </widget>
        </item>
       </layout>

comictaggerlib/ui/matchselectionwindow.ui

@@ -6,25 +6,39 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>831</width>
-    <height>506</height>
+    <width>907</width>
+    <height>507</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string>Select Match</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="0" column="0">
+   <item row="0" column="1">
     <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">
+          <size>
+           <width>200</width>
+           <height>350</height>
+          </size>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>200</width>
+           <height>350</height>
+          </size>
+         </property>
+        </widget>
+       </item>
        <item>
         <widget class="QTableWidget" name="twList">
-         <property name="font">
-          <font>
-           <pointsize>9</pointsize>
-          </font>
-         </property>
          <property name="selectionMode">
           <enum>QAbstractItemView::SingleSelection</enum>
          </property>
@@ -35,7 +49,7 @@
           <number>0</number>
          </property>
          <property name="columnCount">
-          <number>3</number>
+          <number>4</number>
          </property>
          <attribute name="horizontalHeaderStretchLastSection">
           <bool>true</bool>
@@ -58,34 +72,27 @@
            <string>Date</string>
           </property>
          </column>
+         <column>
+          <property name="text">
+           <string>Title</string>
+          </property>
+         </column>
         </widget>
        </item>
        <item>
-        <widget class="QLabel" name="labelThumbnail">
+        <widget class="QWidget" name="altCoverContainer" native="true">
          <property name="minimumSize">
           <size>
-           <width>300</width>
-           <height>0</height>
+           <width>200</width>
+           <height>350</height>
           </size>
          </property>
          <property name="maximumSize">
           <size>
-           <width>300</width>
-           <height>450</height>
+           <width>200</width>
+           <height>350</height>
           </size>
          </property>
-         <property name="frameShape">
-          <enum>QFrame::Panel</enum>
-         </property>
-         <property name="frameShadow">
-          <enum>QFrame::Sunken</enum>
-         </property>
-         <property name="text">
-          <string/>
-         </property>
-         <property name="scaledContents">
-          <bool>true</bool>
-         </property>
         </widget>
        </item>
       </layout>

comictaggerlib/ui/pagebrowser.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>429</width>
-    <height>637</height>
+    <width>369</width>
+    <height>582</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -20,10 +20,31 @@
    <string>Page Browser</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
+   <property name="leftMargin">
+    <number>0</number>
+   </property>
+   <property name="topMargin">
+    <number>0</number>
+   </property>
+   <property name="rightMargin">
+    <number>0</number>
+   </property>
+   <property name="bottomMargin">
+    <number>4</number>
+   </property>
+   <property name="horizontalSpacing">
+    <number>0</number>
+   </property>
+   <property name="verticalSpacing">
+    <number>2</number>
+   </property>
    <item row="0" column="0">
     <layout class="QVBoxLayout" name="verticalLayout">
+     <property name="spacing">
+      <number>0</number>
+     </property>
      <item>
-      <widget class="QLabel" name="lblPage">
+      <widget class="QWidget" name="pageContainer" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
          <horstretch>0</horstretch>
@@ -36,37 +57,47 @@
          <height>300</height>
         </size>
        </property>
-       <property name="frameShape">
-        <enum>QFrame::Box</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Sunken</enum>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="scaledContents">
-        <bool>false</bool>
-       </property>
-       <property name="alignment">
-        <set>Qt::AlignCenter</set>
-       </property>
       </widget>
      </item>
      <item>
       <layout class="QHBoxLayout" name="horizontalLayout">
+       <property name="spacing">
+        <number>20</number>
+       </property>
        <property name="sizeConstraint">
         <enum>QLayout::SetMaximumSize</enum>
        </property>
+       <property name="topMargin">
+        <number>4</number>
+       </property>
+       <item>
+        <spacer name="horizontalSpacer">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
        <item>
         <widget class="QPushButton" name="btnPrev">
          <property name="text">
-          <string>&lt;&lt;</string>
+          <string/>
          </property>
         </widget>
        </item>
        <item>
         <widget class="QDialogButtonBox" name="buttonBox">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Fixed" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
          <property name="orientation">
           <enum>Qt::Horizontal</enum>
          </property>
@@ -81,10 +112,26 @@
        <item>
         <widget class="QPushButton" name="btnNext">
          <property name="text">
-          <string>&gt;&gt;</string>
+          <string/>
+         </property>
+         <property name="autoDefault">
+          <bool>false</bool>
          </property>
         </widget>
        </item>
+       <item>
+        <spacer name="horizontalSpacer_2">
+         <property name="orientation">
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
       </layout>
      </item>
     </layout>

comictaggerlib/ui/pagelisteditor.ui

@@ -98,32 +98,13 @@
       </layout>
      </item>
      <item>
-      <widget class="QFrame" name="frame">
+      <widget class="QWidget" name="pageContainer" native="true">
        <property name="sizePolicy">
         <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
          <horstretch>0</horstretch>
          <verstretch>90</verstretch>
         </sizepolicy>
        </property>
-       <property name="frameShape">
-        <enum>QFrame::StyledPanel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Sunken</enum>
-       </property>
-       <widget class="QLabel" name="label">
-        <property name="geometry">
-         <rect>
-          <x>10</x>
-          <y>10</y>
-          <width>151</width>
-          <height>141</height>
-         </rect>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
       </widget>
      </item>
     </layout>

comictaggerlib/ui/settingswindow.ui

@@ -449,7 +449,20 @@
            <item row="1" column="1">
             <widget class="QLineEdit" name="leRenameTemplate">
              <property name="toolTip">
-              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The template for the new filename. Accepts the following variables:&lt;/p&gt;&lt;p&gt;%series%&lt;br/&gt;%issue%&lt;br/&gt;%volume%&lt;br/&gt;%issuecount%&lt;br/&gt;%year%&lt;br/&gt;%month%&lt;br/&gt;%month_name%&lt;br/&gt;%publisher%&lt;br/&gt;%title%&lt;/p&gt;&lt;p&gt;Examples:&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;%series% %issue% (%year%)&lt;/span&gt;&lt;br/&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;%series% #%issue% - %title%&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;The template for the new filename. Accepts the following variables:&lt;/p&gt;&lt;p&gt;%series%&lt;br/&gt;%issue%&lt;br/&gt;%volume%&lt;br/&gt;%issuecount%&lt;br/&gt;%year%&lt;br/&gt;%month%&lt;br/&gt;%month_name%&lt;br/&gt;%publisher%&lt;br/&gt;%title%&lt;br/&gt;
+%genre%&lt;br/&gt;
+%language_code%&lt;br/&gt;
+%criticalrating%&lt;br/&gt;
+%alternateseries%&lt;br/&gt;
+%alternatenumber%&lt;br/&gt;
+%alternatecount%&lt;br/&gt;
+%imprint%&lt;br/&gt;
+%format%&lt;br/&gt;
+%maturityrating%&lt;br/&gt;
+%storyarc%&lt;br/&gt;
+%seriesgroup%&lt;br/&gt;
+%scaninfo%
+&lt;/p&gt;&lt;p&gt;Examples:&lt;/p&gt;&lt;p&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;%series% %issue% (%year%)&lt;/span&gt;&lt;br/&gt;&lt;span style=&quot; font-style:italic;&quot;&gt;%series% #%issue% - %title%&lt;/span&gt;&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
              </property>
             </widget>
            </item>

comictaggerlib/ui/taggerwindow.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>1096</width>
-    <height>571</height>
+    <height>621</height>
    </rect>
   </property>
   <property name="sizePolicy">
@@ -91,23 +91,26 @@
             </property>
             <property name="minimumSize">
              <size>
-              <width>220</width>
+              <width>230</width>
               <height>0</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
-              <width>220</width>
+              <width>230</width>
               <height>16777215</height>
              </size>
             </property>
             <property name="frameShape">
-             <enum>QFrame::StyledPanel</enum>
+             <enum>QFrame::Panel</enum>
             </property>
             <property name="frameShadow">
-             <enum>QFrame::Raised</enum>
+             <enum>QFrame::Sunken</enum>
             </property>
             <layout class="QVBoxLayout" name="verticalLayout_4">
+             <property name="margin">
+              <number>6</number>
+             </property>
              <item>
               <widget class="QLabel" name="lblFilename">
                <property name="sizePolicy">
@@ -202,7 +205,7 @@
            </widget>
           </item>
           <item>
-           <widget class="QLabel" name="lblCover">
+           <widget class="QWidget" name="coverImageContainer" native="true">
             <property name="sizePolicy">
              <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
               <horstretch>0</horstretch>
@@ -211,31 +214,16 @@
             </property>
             <property name="minimumSize">
              <size>
-              <width>220</width>
-              <height>330</height>
+              <width>230</width>
+              <height>380</height>
              </size>
             </property>
             <property name="maximumSize">
              <size>
-              <width>220</width>
-              <height>330</height>
+              <width>230</width>
+              <height>380</height>
              </size>
             </property>
-            <property name="frameShape">
-             <enum>QFrame::Panel</enum>
-            </property>
-            <property name="frameShadow">
-             <enum>QFrame::Sunken</enum>
-            </property>
-            <property name="text">
-             <string/>
-            </property>
-            <property name="scaledContents">
-             <bool>true</bool>
-            </property>
-            <property name="alignment">
-             <set>Qt::AlignCenter</set>
-            </property>
            </widget>
           </item>
           <item>
@@ -1107,7 +1095,7 @@
      <x>0</x>
      <y>0</y>
      <width>1096</width>
-     <height>21</height>
+     <height>22</height>
     </rect>
    </property>
    <widget class="QMenu" name="menuComicTagger">

comictaggerlib/ui/volumeselectionwindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>801</width>
-    <height>470</height>
+    <width>849</width>
+    <height>476</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -20,7 +20,7 @@
    <item row="0" column="0">
     <layout class="QHBoxLayout" name="horizontalLayout_2">
      <item>
-      <widget class="QLabel" name="labelThumbnail">
+      <widget class="QWidget" name="imageContainer" native="true">
        <property name="minimumSize">
         <size>
          <width>300</width>
@@ -33,18 +33,6 @@
          <height>450</height>
         </size>
        </property>
-       <property name="frameShape">
-        <enum>QFrame::Panel</enum>
-       </property>
-       <property name="frameShadow">
-        <enum>QFrame::Sunken</enum>
-       </property>
-       <property name="text">
-        <string/>
-       </property>
-       <property name="scaledContents">
-        <bool>true</bool>
-       </property>
       </widget>
      </item>
      <item>
@@ -67,11 +55,6 @@
             <height>250</height>
            </size>
           </property>
-          <property name="font">
-           <font>
-            <pointsize>9</pointsize>
-           </font>
-          </property>
           <property name="selectionMode">
            <enum>QAbstractItemView::SingleSelection</enum>
           </property>
@@ -130,11 +113,6 @@
             <height>200</height>
            </size>
           </property>
-          <property name="font">
-           <font>
-            <pointsize>9</pointsize>
-           </font>
-          </property>
           <property name="readOnly">
            <bool>true</bool>
           </property>
@@ -149,7 +127,7 @@
          <item>
           <widget class="QPushButton" name="btnAutoSelect">
            <property name="text">
-            <string>Auto-Select</string>
+            <string>Auto-Identify</string>
            </property>
           </widget>
          </item>

comictaggerlib/utils.py

@@ -19,9 +19,62 @@ 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 platform
+import locale
+import codecs
+	
+class UtilsVars:
+	already_fixed_encoding = False
 
+def fix_output_encoding( ):
+	if not UtilsVars.already_fixed_encoding:
+		# this reads the environment and inits the right locale
+		locale.setlocale(locale.LC_ALL, "")
+
+		# try to make stdout/stderr encodings happy for unicode printing
+		preferred_encoding = locale.getpreferredencoding()
+		if getattr(sys, 'frozen', None) and platform.system() == "Darwin":	
+			preferred_encoding = "utf-8"
+			sys.stdout = codecs.getwriter(preferred_encoding)(sys.stdout)
+			sys.stderr = codecs.getwriter(preferred_encoding)(sys.stderr)
+		elif platform.system() == "Windows":	
+			sys.stdout = codecs.getwriter(preferred_encoding)(sys.stdout)
+			sys.stderr = codecs.getwriter(preferred_encoding)(sys.stderr)
+		UtilsVars.already_fixed_encoding = True
+
+def get_recursive_filelist( pathlist ):
+	"""
+	Get a recursive list of of all files under all path items in the list
+	"""
+	filename_encoding = sys.getfilesystemencoding()	
+	filelist = []
+	for p in pathlist:
+		# if path is a folder, walk it recursivly, and all files underneath
+		if type(p) == str:
+			#make sure string is unicode
+			p = p.decode(filename_encoding) #, 'replace')
+		elif type(p) != unicode:
+			#it's probably a QString
+			p = unicode(p)
+		
+		if os.path.isdir( p ):
+			for root,dirs,files in os.walk( p ):
+				for f in files:
+					if type(f) == str:
+						#make sure string is unicode
+						f = f.decode(filename_encoding, 'replace')
+					elif type(f) != unicode:
+						#it's probably a QString
+						f = unicode(f)
+					filelist.append(os.path.join(root,f))
+		else:
+			filelist.append(p)
+	
+	return filelist
+	
 def listToString( l ):
 	string = ""
 	if l is not None:
@@ -31,10 +84,16 @@ def listToString( l ):
 			string += item 
 	return string
 		
-def addtopath( dir ):
-	# TODO only add if not there already
-	if dir is not None and dir != "": 
-		os.environ['PATH'] = dir + os.pathsep + os.environ['PATH']
+def addtopath( dirname ):
+	if dirname is not None and dirname != "":
+		
+		# verify that path doesn't already contain the given dirname
+		tmpdirname = re.escape(dirname)
+		pattern = r"{sep}{dir}$|^{dir}{sep}|{sep}{dir}{sep}|^{dir}$".format( dir=tmpdirname, sep=os.pathsep)
+		
+		match = re.search(pattern, os.environ['PATH'])
+		if not match:	
+			os.environ['PATH'] = dirname + os.pathsep + os.environ['PATH']
 
 # returns executable path, if it exists
 def which(program):
@@ -520,3 +579,49 @@ def getLanguageFromISO( iso ):
 	else:
 		return lang_dict[ iso ]
 
+
+try: 
+	from PyQt4 import QtGui
+	qt_available = True
+except ImportError:
+	qt_available = False
+	
+if qt_available:
+	def reduceWidgetFontSize( widget , delta = 2):
+		f = widget.font()
+		if f.pointSize() > 10:
+			f.setPointSize( f.pointSize() - delta )
+		widget.setFont( f )
+		
+	def centerWindowOnScreen( window ):
+		"""
+		Center the window on screen. This implemention will handle the window
+		being resized or the screen resolution changing.
+		"""
+		# Get the current screens' dimensions...
+		screen = QtGui.QDesktopWidget().screenGeometry()
+		# ... and get this windows' dimensions
+		mysize = window.geometry()
+		# The horizontal position is calulated as screenwidth - windowwidth /2
+		hpos = ( screen.width() - window.width() ) / 2
+		# And vertical position the same, but with the height dimensions
+		vpos = ( screen.height() - window.height() ) / 2
+		# And the move call repositions the window
+		window.move(hpos, vpos)		
+
+	def centerWindowOnParent( window ):
+
+		top_level = window
+		while top_level.parent() is not None:
+			top_level = top_level.parent()
+			
+		# Get the current screens' dimensions...
+		main_window_size = top_level.geometry()
+		# ... and get this windows' dimensions
+		mysize = window.geometry()
+		# The horizontal position is calulated as screenwidth - windowwidth /2
+		hpos = ( main_window_size.width() - window.width() ) / 2
+		# And vertical position the same, but with the height dimensions
+		vpos = ( main_window_size.height() - window.height() ) / 2
+		# And the move call repositions the window
+		window.move(hpos + main_window_size.left(), vpos + main_window_size.top())	

comictaggerlib/volumeselectionwindow.py

@@ -34,6 +34,8 @@ from imagefetcher import  ImageFetcher
 from progresswindow import IDProgressWindow
 from settings import ComicTaggerSettings
 from matchselectionwindow import MatchSelectionWindow
+from coverimagewidget import CoverImageWidget
+import utils
 
 class SearchThread( QtCore.QThread):
 
@@ -88,8 +90,20 @@ class VolumeSelectionWindow(QtGui.QDialog):
 	def __init__(self, parent, series_name, issue_number, year, cover_index_list, comic_archive, settings, autoselect=False):
 		super(VolumeSelectionWindow, self).__init__(parent)
 		
-		uic.loadUi(os.path.join(ComicTaggerSettings.baseDir(), 'volumeselectionwindow.ui' ), self)
+		uic.loadUi(ComicTaggerSettings.getUIFile('volumeselectionwindow.ui' ), self)
 		
+		self.imageWidget = CoverImageWidget( self.imageContainer, CoverImageWidget.URLMode )
+		gridlayout = QtGui.QGridLayout( self.imageContainer )
+		gridlayout.addWidget( self.imageWidget )
+		gridlayout.setContentsMargins(0,0,0,0)
+
+		utils.reduceWidgetFontSize( self.teDetails, 1 )
+		utils.reduceWidgetFontSize( self.twList )		
+		
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)
+
 		self.settings = settings
 		self.series_name = series_name
 		self.issue_number = issue_number
@@ -108,7 +122,7 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		self.btnAutoSelect.clicked.connect(self.autoSelect)	
 		
 		self.updateButtons()
-		self.performQuery()		
+		self.performQuery()
 		self.twList.selectRow(0)
 
 	def updateButtons( self ):
@@ -180,54 +194,43 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		result = self.ii.search_result
 		match_index = 0
 		
-		found_match = False
+		found_match = None
 		choices = False
 		if result == self.ii.ResultNoMatches:
 			QtGui.QMessageBox.information(self,"Auto-Select Result", " No matches found :-(")
 		elif result == self.ii.ResultFoundMatchButBadCoverScore:
 			QtGui.QMessageBox.information(self,"Auto-Select Result", " Found a match, but cover doesn't seem the same.  Verify before commiting!")
-			found_match = True
+			found_match = matches[0]
 		elif result == self.ii.ResultFoundMatchButNotFirstPage :
 			QtGui.QMessageBox.information(self,"Auto-Select Result", " Found a match, but not with the first page of the archive.")
-			found_match = True
+			found_match = matches[0]
 		elif result == self.ii.ResultMultipleMatchesWithBadImageScores:
 			QtGui.QMessageBox.information(self,"Auto-Select Result", " Found some possibilities, but no confidence. Proceed manually.")
 			choices = True
 		elif result == self.ii.ResultOneGoodMatch:
-			found_match = True
+			found_match = matches[0]
 		elif result == self.ii.ResultMultipleGoodMatches:
 			QtGui.QMessageBox.information(self,"Auto-Select Result", " Found multiple likely matches.  Please select.")
 			choices = True
 
 		if choices:
-			selector = MatchSelectionWindow( self, matches )
+			selector = MatchSelectionWindow( self, matches, self.comic_archive )
 			selector.setModal(True)
-			
-			title = self.series_name
-			title += " #" + self.issue_number
-			if self.year is not None:
-				title += " (" + str(self.year) + ")"
-			title += " - "
-					
-			selector.setWindowTitle( title + "Select Match")
 			selector.exec_()
 			if selector.result():
 				#we should now have a list index
-				found_match = True
-				match_index = selector.current_row			
+				found_match = selector.currentMatch()			
 		
-		if found_match:
+		if found_match is not None:
 			self.iddialog.accept()
 
-			self.volume_id = matches[match_index]['volume_id']
-			self.issue_number = matches[match_index]['issue_number']
+			self.volume_id = found_match['volume_id']
+			self.issue_number = found_match['issue_number']
 			self.selectByID()
 			self.showIssues()
 
 	def showIssues( self ):
 		selector = IssueSelectionWindow( self, self.settings, self.volume_id, self.issue_number )
-		selector.setModal(True)
-		
 		title = ""
 		for record in self.cv_search_results:
 			if record['id'] ==  self.volume_id:
@@ -237,6 +240,7 @@ class VolumeSelectionWindow(QtGui.QDialog):
 				break
 				
 		selector.setWindowTitle( title + "Select Issue")
+		selector.setModal( True )
 		selector.exec_()
 		if selector.result():
 			#we should now have a volume ID
@@ -367,21 +371,5 @@ class VolumeSelectionWindow(QtGui.QDialog):
 			if record['id'] == self.volume_id:
 
 				self.teDetails.setText ( record['description'] )
-
-				self.labelThumbnail.setPixmap(QtGui.QPixmap(os.path.join(ComicTaggerSettings.baseDir(), 'graphics/nocover.png' )))
-				
-				url = record['image']['super_url']
-				self.fetcher = ImageFetcher( )
-				self.fetcher.fetchComplete.connect(self.finishRequest)
-				self.fetcher.fetch( url, user_data=record['id'] )
-
-
-	def finishRequest(self, image_data, user_data):
-		# called when the image is done loading
-		img = QtGui.QImage()
-		img.loadFromData( image_data )	
-		self.setCover( img )	
-
-
-	def setCover( self, img ):
-		self.labelThumbnail.setPixmap(QtGui.QPixmap(img))
+				self.imageWidget.setURL( record['image']['super_url'] )
+				break

google/googlecode_upload.py

@@ -0,0 +1,256 @@
+#!/usr/bin/env python
+#
+# Copyright 2006, 2007 Google Inc. All Rights Reserved.
+# Author: danderson@google.com (David Anderson)
+#
+# Script for uploading files to a Google Code project.
+#
+# This is intended to be both a useful script for people who want to
+# streamline project uploads and a reference implementation for
+# uploading files to Google Code projects.
+#
+# To upload a file to Google Code, you need to provide a path to the
+# file on your local machine, a small summary of what the file is, a
+# project name, and a valid account that is a member or owner of that
+# project.  You can optionally provide a list of labels that apply to
+# the file.  The file will be uploaded under the same name that it has
+# in your local filesystem (that is, the "basename" or last path
+# component).  Run the script with '--help' to get the exact syntax
+# and available options.
+#
+# Note that the upload script requests that you enter your
+# googlecode.com password.  This is NOT your Gmail account password!
+# This is the password you use on googlecode.com for committing to
+# Subversion and uploading files.  You can find your password by going
+# to http://code.google.com/hosting/settings when logged in with your
+# Gmail account. If you have already committed to your project's
+# Subversion repository, the script will automatically retrieve your
+# credentials from there (unless disabled, see the output of '--help'
+# for details).
+#
+# If you are looking at this script as a reference for implementing
+# your own Google Code file uploader, then you should take a look at
+# the upload() function, which is the meat of the uploader.  You
+# basically need to build a multipart/form-data POST request with the
+# right fields and send it to https://PROJECT.googlecode.com/files .
+# Authenticate the request using HTTP Basic authentication, as is
+# shown below.
+#
+# Licensed under the terms of the Apache Software License 2.0:
+#  http://www.apache.org/licenses/LICENSE-2.0
+#
+# Questions, comments, feature requests and patches are most welcome.
+# Please direct all of these to the Google Code users group:
+#  http://groups.google.com/group/google-code-hosting
+
+"""Google Code file uploader script.
+"""
+
+__author__ = 'danderson@google.com (David Anderson)'
+
+import httplib
+import os.path
+import optparse
+import getpass
+import base64
+import sys
+
+
+def upload(file, project_name, user_name, password, summary, labels=None):
+  """Upload a file to a Google Code project's file server.
+
+  Args:
+    file: The local path to the file.
+    project_name: The name of your project on Google Code.
+    user_name: Your Google account name.
+    password: The googlecode.com password for your account.
+              Note that this is NOT your global Google Account password!
+    summary: A small description for the file.
+    labels: an optional list of label strings with which to tag the file.
+
+  Returns: a tuple:
+    http_status: 201 if the upload succeeded, something else if an
+                 error occured.
+    http_reason: The human-readable string associated with http_status
+    file_url: If the upload succeeded, the URL of the file on Google
+              Code, None otherwise.
+  """
+  # The login is the user part of user@gmail.com. If the login provided
+  # is in the full user@domain form, strip it down.
+  if user_name.endswith('@gmail.com'):
+    user_name = user_name[:user_name.index('@gmail.com')]
+
+  form_fields = [('summary', summary)]
+  if labels is not None:
+    form_fields.extend([('label', l.strip()) for l in labels])
+
+  content_type, body = encode_upload_request(form_fields, file)
+
+  upload_host = '%s.googlecode.com' % project_name
+  upload_uri = '/files'
+  auth_token = base64.b64encode('%s:%s'% (user_name, password))
+  headers = {
+    'Authorization': 'Basic %s' % auth_token,
+    'User-Agent': 'Googlecode.com uploader v0.9.4',
+    'Content-Type': content_type,
+    }
+
+  server = httplib.HTTPSConnection(upload_host)
+  server.request('POST', upload_uri, body, headers)
+  resp = server.getresponse()
+  server.close()
+
+  if resp.status == 201:
+    location = resp.getheader('Location', None)
+  else:
+    location = None
+  return resp.status, resp.reason, location
+
+
+def encode_upload_request(fields, file_path):
+  """Encode the given fields and file into a multipart form body.
+
+  fields is a sequence of (name, value) pairs. file is the path of
+  the file to upload. The file will be uploaded to Google Code with
+  the same file name.
+
+  Returns: (content_type, body) ready for httplib.HTTP instance
+  """
+  BOUNDARY = '----------Googlecode_boundary_reindeer_flotilla'
+  CRLF = '\r\n'
+
+  body = []
+
+  # Add the metadata about the upload first
+  for key, value in fields:
+    body.extend(
+      ['--' + BOUNDARY,
+       'Content-Disposition: form-data; name="%s"' % key,
+       '',
+       value,
+       ])
+
+  # Now add the file itself
+  file_name = os.path.basename(file_path)
+  f = open(file_path, 'rb')
+  file_content = f.read()
+  f.close()
+
+  body.extend(
+    ['--' + BOUNDARY,
+     'Content-Disposition: form-data; name="filename"; filename="%s"'
+     % file_name,
+     # The upload server determines the mime-type, no need to set it.
+     'Content-Type: application/octet-stream',
+     '',
+     file_content,
+     ])
+
+  # Finalize the form body
+  body.extend(['--' + BOUNDARY + '--', ''])
+
+  return 'multipart/form-data; boundary=%s' % BOUNDARY, CRLF.join(body)
+
+
+def upload_find_auth(file_path, project_name, summary, labels=None,
+                     user_name=None, password=None, tries=3):
+  """Find credentials and upload a file to a Google Code project's file server.
+
+  file_path, project_name, summary, and labels are passed as-is to upload.
+
+  Args:
+    file_path: The local path to the file.
+    project_name: The name of your project on Google Code.
+    summary: A small description for the file.
+    labels: an optional list of label strings with which to tag the file.
+    config_dir: Path to Subversion configuration directory, 'none', or None.
+    user_name: Your Google account name.
+    tries: How many attempts to make.
+  """
+  if user_name is None or password is None:
+    from netrc import netrc
+    authenticators = netrc().authenticators("code.google.com")
+    if authenticators:
+      if user_name is None:
+        user_name = authenticators[0]
+      if password is None:
+        password = authenticators[2]
+
+  while tries > 0:
+    if user_name is None:
+      # Read username if not specified or loaded from svn config, or on
+      # subsequent tries.
+      sys.stdout.write('Please enter your googlecode.com username: ')
+      sys.stdout.flush()
+      user_name = sys.stdin.readline().rstrip()
+    if password is None:
+      # Read password if not loaded from svn config, or on subsequent tries.
+      print 'Please enter your googlecode.com password.'
+      print '** Note that this is NOT your Gmail account password! **'
+      print 'It is the password you use to access Subversion repositories,'
+      print 'and can be found here: http://code.google.com/hosting/settings'
+      password = getpass.getpass()
+
+    status, reason, url = upload(file_path, project_name, user_name, password,
+                                 summary, labels)
+    # Returns 403 Forbidden instead of 401 Unauthorized for bad
+    # credentials as of 2007-07-17.
+    if status in [httplib.FORBIDDEN, httplib.UNAUTHORIZED]:
+      # Rest for another try.
+      user_name = password = None
+      tries = tries - 1
+    else:
+      # We're done.
+      break
+
+  return status, reason, url
+
+
+def main():
+  parser = optparse.OptionParser(usage='googlecode-upload.py -s SUMMARY '
+                                 '-p PROJECT [options] FILE')
+  parser.add_option('-s', '--summary', dest='summary',
+                    help='Short description of the file')
+  parser.add_option('-p', '--project', dest='project',
+                    help='Google Code project name')
+  parser.add_option('-u', '--user', dest='user',
+                    help='Your Google Code username')
+  parser.add_option('-w', '--password', dest='password',
+                    help='Your Google Code password')
+  parser.add_option('-l', '--labels', dest='labels',
+                    help='An optional list of comma-separated labels to attach '
+                    'to the file')
+
+  options, args = parser.parse_args()
+
+  if not options.summary:
+    parser.error('File summary is missing.')
+  elif not options.project:
+    parser.error('Project name is missing.')
+  elif len(args) < 1:
+    parser.error('File to upload not provided.')
+  elif len(args) > 1:
+    parser.error('Only one file may be specified.')
+
+  file_path = args[0]
+
+  if options.labels:
+    labels = options.labels.split(',')
+  else:
+    labels = None
+
+  status, reason, url = upload_find_auth(file_path, options.project,
+                                         options.summary, labels,
+                                         options.user, options.password)
+  if url:
+    print 'The file was uploaded successfully.'
+    print 'URL: %s' % url
+    return 0
+  else:
+    print 'An error occurred. Your file was not uploaded.'
+    print 'Google Code upload server said: %s (%s)' % (reason, status)
+    return 1
+
+
+if __name__ == '__main__':
+  sys.exit(main())

mac/Makefile

@@ -1,10 +1,9 @@
 PYINSTALLER_CMD := python $(HOME)/pyinstaller-2.0/pyinstaller.py
 TAGGER_BASE := $(HOME)/Dropbox/tagger/comictagger
+TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib
 
 APP_NAME := ComicTagger
-VERSION_STR := $(shell grep version $(TAGGER_BASE)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
-
-
+VERSION_STR := $(shell grep version $(TAGGER_SRC)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
 
 MAC_BASE := $(TAGGER_BASE)/mac
 DIST_DIR := $(MAC_BASE)/dist
@@ -17,9 +16,11 @@ all: clean dist diskimage
 
 dist:
 	$(PYINSTALLER_CMD) $(TAGGER_BASE)/comictagger.py -o $(MAC_BASE) -w -n $(APP_NAME) -s 
-	cp $(TAGGER_BASE)/*.ui $(APP_BUNDLE)/Contents/MacOS
-	cp -a $(TAGGER_BASE)/graphics $(APP_BUNDLE)/Contents/MacOS
+	cp -a $(TAGGER_SRC)/ui $(APP_BUNDLE)/Contents/MacOS
+	cp -a $(TAGGER_SRC)/graphics $(APP_BUNDLE)/Contents/MacOS
 	cp $(MAC_BASE)/app.icns $(APP_BUNDLE)/Contents/Resources/icon-windowed.icns
+	# fix the version string in the Info.plist
+	sed -i -e 's/0\.0\.0/$(VERSION_STR)/' $(MAC_BASE)/dist/ComicTagger.app/Contents/Info.plist
 	
 clean:
 	rm -rf $(DIST_DIR) $(MAC_BASE)/build
@@ -60,5 +61,6 @@ diskimage:
 	rm -f raw-$(DMG_FILE)
 	
 	#move finished product to release folder
+	mkdir -p $(TAGGER_BASE)/release
 	mv $(DMG_FILE) $(TAGGER_BASE)/release
 	

release_notes.txt

@@ -1,11 +1,31 @@
+---------------------------------  
+1.1.2-beta - 14-Feb-2013
+---------------------------------
+Changes:
+	* Source is now packaged using Python distutils
+	* Recursive mode for CLI
+	* Run custom add-on scripts from CLI
+	* Minor UI tweaks
+	* Misc bug fixes
 
 ---------------------------------  
-1.0.3-beta - ??-Jan-2013
+1.1.0-beta - 06-Feb-2013
+---------------------------------
+Changes:
+	* Enhanced identification process to use alternative covers from ComicVine
+	* Post auto-tag manual matching now includes single low-confidence matches (CLI & GUI)
+	* Page and cover view mini-browser available throughout app.  Most images can be
+         double-clicked for embiggened view
+	* Export-to-zip in CLI (very handy in scripts!)
+	* More rename template variables
+	* Misc GUI & CLI Tweaks
+
+---------------------------------  
+1.0.3-beta - 31-Jan-2013
 ---------------------------------
 Changes:
 	Misc bug fixes and enhancements
-
-
+	
 ---------------------------------  
 1.0.2-beta - 25-Jan-2013
 ---------------------------------
@@ -93,4 +113,4 @@ Note:
 ---------------------------------  
 0.9.0-beta - 30-Nov-2012
 ---------------------------------
-Initial beta release
+Initial beta release

requirements.txt

@@ -0,0 +1,2 @@
+beautifulsoup4 >= 4.1
+PIL >= 1.1.6

scripts/README.txt

@@ -0,0 +1,30 @@
+This folder contains a set of example scripts that be used to extend the
+capabilities of the ComicTagger app.  They can be run either directly through
+the python interpreter, or via the ComicTagger app.
+
+To run via python directly, install ComicTagger source on your system using
+the setup.py file.
+
+To run via the ComicTagger app, invoke:
+
+# comictagger.py -S script.py [script args]
+
+(This will work also for binary distributions on Mac and Windows.  No need for
+an extra python install.)
+
+The script must have an entry point function called "main()" to be invoked
+via the app.
+
+-----------------------------------------------------------------------------
+
+This feature is UNSUPPORTED, and is for the convenience of development-minded
+users of ComicTagger.  The comictaggerlib module will remain largely
+undocumented, and it will up to the crafty script developer to look through
+the code to discern APIs and such.
+
+That said, if there are questions, please post in the forums, and hopefully we
+can get your add-on scripts working!
+
+http://comictagger.forumotion.com/
+
+

scripts/find_dupes.py

@@ -0,0 +1,84 @@
+#!/usr/bin/python
+"""
+find all duplicate comics
+"""
+
+import sys
+
+from comictaggerlib.comicarchive import *
+from comictaggerlib.settings import *
+from comictaggerlib.issuestring import *
+import comictaggerlib.utils
+
+
+def main():
+	utils.fix_output_encoding()
+	settings = ComicTaggerSettings()
+
+	style = MetaDataStyle.CIX
+
+	if len(sys.argv) < 2:
+		print >> sys.stderr, "usage:  {0} comic_folder ".format(sys.argv[0])
+		return
+		
+	filelist = utils.get_recursive_filelist( sys.argv[1:] )
+	
+	#first find all comics with metadata
+	print >> sys.stderr, "reading in all comics..."
+	comic_list = []
+	max_name_len = 2
+	for filename in filelist:
+		ca = ComicArchive(filename, settings )
+		if ca.seemsToBeAComicArchive() and ca.hasMetadata( style ):
+			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()
+			comic_list.append((filename, ca.readMetadata( style )))
+
+	print >> sys.stderr, fmt_str.format( "" ) + "\r",
+	print "-----------------------------------------------"
+	print "Found {0} comics with {1} tags".format( len(comic_list), MetaDataStyle.name[style])
+	print "-----------------------------------------------"
+
+	#sort the list by series+issue+year, to put all the dupes together
+	def makeKey(x):
+		return "<" + unicode(x[1].series) + u" #" + unicode( x[1].issue ) +  u" - " + unicode( x[1].year ) + ">" 
+	comic_list.sort(key=makeKey, reverse=False)
+
+	# look for duplicate blocks
+	dupe_set_list = list()
+	dupe_set = list()
+	prev_key = ""
+	for filename, md in comic_list:
+		print >> sys.stderr, fmt_str.format( filename ) + "\r",
+		sys.stderr.flush()
+		
+		new_key = makeKey((filename, md))
+
+		#if the new key same as the last, add to to dupe set
+		if new_key == prev_key:
+			dupe_set.append(filename)
+			
+		#else we're on a new potential block
+		else:
+			# only add if the dupe list has 2 or more
+			if len (dupe_set) > 1:
+				dupe_set_list.append( dupe_set )
+			dupe_set = list()
+			dupe_set.append(filename)
+			
+		prev_key = new_key
+		
+	print >> sys.stderr, fmt_str.format( "" ) + "\r",
+	print "Found {0} duplicate sets".format( len(dupe_set_list))
+
+	for dupe_set in dupe_set_list:
+		ca = ComicArchive(dupe_set[0], settings )
+		md = ca.readMetadata( style )
+		print "{0} #{1} ({2})".format( md.series, md.issue, md.year )
+		for filename in dupe_set:
+			print "------------->{0}".format( filename )
+
+if __name__ == '__main__':
+	main()