more python packaging tweaks

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

MANIFEST.in

@@ -0,0 +1,2 @@
+include readme.txt
+include release_notes.txt

Makefile

@@ -1,20 +1,57 @@
 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
+	cd comictagger; rm -f *~ *.pyc *.pyo
+	sudo rm -rf dist MANIFEST
+	rm -rf *.deb
+	rm -rf logdict*.log
+	make -C mac clean
+	make -C windows clean
+
 zip:
 	cd release; \
 		rm -rf *zip comictagger-src-$(VERSION_STR) ;  \
-		svn checkout https://comictagger.googlecode.com/svn/trunk/ 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)
 	
 	@echo When satisfied with release, do this:
-	@echo svn fpoooo $(VERSION_STR)
+	@echo make svn_tag
+
+pydist:
+	python setup.py sdist --formats=gztar,zip
+
+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 >= 1.1.7' \
+		-d 'python-bs4 >= 4.1' \
+		setup.py 
+
+		# For now, don't require PyQt, since command-line is available without it
+		#-d 'python-qt4 >= 4.8' 
+
+svn_tag:
+	svn copy https://comictagger.googlecode.com/svn/trunk \
+      https://comictagger.googlecode.com/svn/tags/$(VERSION_STR) -m "Release $(VERSION_STR)"
+
+upload:
+	$(UPLOAD_TOOL) -p comictagger -s "ComicTagger $(VERSION_STR) Source" -l Featured,Type-Source -u beville -w $(PASSWORD) "release/comictagger-src-$(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"

comicarchive.py

@@ -1,629 +0,0 @@
-"""
-A python class to represent a single comic, be it file or folder of images
-"""
-
-"""
-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 zipfile
-import os
-import struct
-import sys
-import tempfile
-import subprocess
-import platform
-if platform.system() == "Windows":
-	import _subprocess
-import time
-
-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 genericmetadata import GenericMetadata
-from filenameparser import FileNameParser
-
-
-class ZipArchiver:
-	
-	def __init__( self, path ):
-		self.path = path
-	
-	def getArchiveComment( self ):
-		zf = zipfile.ZipFile( self.path, 'r' )
-		comment = zf.comment
-		zf.close()
-		return comment
-
-	def setArchiveComment( self, comment ):
-		return self.writeZipComment( self.path, comment )
-
-	def readArchiveFile( self, archive_file ):
-		zf = zipfile.ZipFile( self.path, 'r' )
-		data = zf.read( archive_file )
-		zf.close()
-		return data
-
-	def removeArchiveFile( self, archive_file ):
-		try:
-			self.rebuildZipFile(  [ archive_file ] )
-		except:
-			return False
-		else:
-			return True
-			
-	def writeArchiveFile( self, archive_file, data ):
-		#  At the moment, no other option but to rebuild the whole 
-		#  zip archive w/o the indicated file. Very sucky, but maybe 
-		# another solution can be found
-		try:
-			self.rebuildZipFile(  [ archive_file ] )
-			
-			#now just add the archive file as a new one
-			zf = zipfile.ZipFile(self.path, mode='a', compression=zipfile.ZIP_DEFLATED ) 
-			zf.writestr( archive_file, data )
-			zf.close()
-			return True
-		except:
-			return False
-			
-	def getArchiveFilenameList( self ):		
-		zf = zipfile.ZipFile( self.path, 'r' )
-		namelist = zf.namelist()
-		zf.close()
-		return namelist
-	
-	# zip helper func
-	def rebuildZipFile( self, exclude_list ):
-		
-		# TODO: use tempfile.mkstemp
-		# this recompresses the zip archive, without the files in the exclude_list
-		#print "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) )
-		os.close( tmp_fd )
-		
-		zin = zipfile.ZipFile (self.path, 'r')
-		zout = zipfile.ZipFile (tmp_name, 'w')
-		for item in zin.infolist():
-			buffer = zin.read(item.filename)
-			if ( item.filename not in exclude_list ):
-				zout.writestr(item, buffer)
-		
-		#preserve the old comment
-		zout.comment = zin.comment
-		
-		zout.close()
-		zin.close()
-		
-		# replace with the new file 
-		os.remove( self.path )
-		os.rename( tmp_name, self.path )
-
-
-	def writeZipComment( self, filename, comment ):
-		"""
-		This is a custom function for writing a comment to a zip file,
-		since the built-in one doesn't seem to work on Windows and Mac OS/X
-
-		Fortunately, the zip comment is at the end of the file, and it's
-		easy to manipulate.  See this website for more info:
-		see: http://en.wikipedia.org/wiki/Zip_(file_format)#Structure
-		"""
-
-		#get file size
-		statinfo = os.stat(filename)
-		file_length = statinfo.st_size
-
-		try:
-			fo = open(filename, "r+b")
-
-			#the starting position, relative to EOF
-			pos = -4
-
-			found = False
-			value = bytearray()
-		
-			# walk backwards to find the "End of Central Directory" record
-			while ( not found ) and ( -pos != file_length ):
-				# seek, relative to EOF	
-				fo.seek( pos,  2)
-
-				value = fo.read( 4 )
-
-				#look for the end of central directory signature
-				if bytearray(value) == bytearray([ 0x50, 0x4b, 0x05, 0x06 ]):
-					found = True
-				else:
-					# not found, step back another byte
-					pos = pos - 1
-				#print pos,"{1} int: {0:x}".format(bytearray(value)[0], value)
-			
-			if found:
-				
-				# now skip forward 20 bytes to the comment length word
-				pos += 20
-				fo.seek( pos,  2)
-
-				# Pack the length of the comment string
-				format = "H"                   # one 2-byte integer
-				comment_length = struct.pack(format, len(comment)) # pack integer in a binary string
-				
-				# write out the length
-				fo.write( comment_length )
-				fo.seek( pos+2,  2)
-				
-				# write out the comment itself
-				fo.write( comment )
-				fo.truncate()
-				fo.close()
-			else:
-				raise Exception('Failed to write comment to zip file!')
-		except:
-			return False
-		else:
-			return True
-		
-#------------------------------------------
-# RAR implementation
-	
-class RarArchiver:
-	
-	def __init__( self, path ):
-		self.path = path
-		self.rar_exe_path = None
-		self.devnull = open(os.devnull, "w")
-
-		# windows only, keeps the cmd.exe from popping up
-		if platform.system() == "Windows":
-			self.startupinfo = subprocess.STARTUPINFO()
-			self.startupinfo.dwFlags |= _subprocess.STARTF_USESHOWWINDOW
-		else:
-			self.startupinfo = None
-
-	def __del__(self):
-		self.devnull.close()
-		
-	def getArchiveComment( self ):
-		
-		rarc = UnRAR2.RarFile( self.path )
-		return rarc.comment		
-
-	def setArchiveComment( self, comment ):
-
-		if self.rar_exe_path is not None:
-			try:
-				# write comment to temp file
-				tmp_fd, tmp_name = tempfile.mkstemp()
-				f = os.fdopen(tmp_fd, 'w+b')
-				f.write( comment )		
-				f.close()
-
-				# use external program to write comment to Rar archive
-				subprocess.call([self.rar_exe_path, 'c', '-c-', '-z' + tmp_name, self.path], 
-					startupinfo=self.startupinfo, 
-					stdout=self.devnull)
-				
-				if platform.system() == "Darwin":
-					time.sleep(1)
-					
-				os.remove( tmp_name)
-			except:
-				return False
-			else:
-				return True
-		else:
-			return False
-			
-	def readArchiveFile( self, archive_file ):
-
-		entries = UnRAR2.RarFile( self.path ).read_files( archive_file )
-
-		#entries is a list of of tuples:  ( rarinfo, filedata)
-		if (len(entries) == 1):
-			return entries[0][1]
-		else:
-			return ""
-
-	def writeArchiveFile( self, archive_file, data ):
-
-		if self.rar_exe_path is not None:
-			try:
-				tmp_folder = tempfile.mkdtemp()
-
-				tmp_file = os.path.join( tmp_folder, archive_file )
-
-				f = open(tmp_file, 'w')
-				f.write( data )		
-				f.close()
-
-				# use external program to write file to Rar archive
-				subprocess.call([self.rar_exe_path, 'a', '-c-', '-ep', self.path, tmp_file], 
-					startupinfo=self.startupinfo,
-					stdout=self.devnull)
-
-				if platform.system() == "Darwin":
-					time.sleep(1)
-				os.remove( tmp_file)
-				os.rmdir( tmp_folder)
-			except:
-				return False
-			else:
-				return True
-		else:
-			return False
-			
-	def removeArchiveFile( self, archive_file ):
-		if self.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], 
-					startupinfo=self.startupinfo, 				   
-					stdout=self.devnull)
-
-				if platform.system() == "Darwin":
-					time.sleep(1)
-			except:
-				return False
-			else:
-				return True
-		else:
-			return False
-			
-	def getArchiveFilenameList( self ):
-
-		rarc = UnRAR2.RarFile( self.path )
-
-		return [ item.filename for item in rarc.infolist() ]
-
-#------------------------------------------
-# Folder implementation
-class FolderArchiver:
-	
-	def __init__( self, path ):
-		self.path = path
-		self.comment_file_name = "ComicTaggerFolderComment.txt" 
-
-	def getArchiveComment( self ):
-		return self.readArchiveFile( self.comment_file_name )
-	
-	def setArchiveComment( self, comment ):
-		return self.writeArchiveFile( self.comment_file_name, comment )
-		
-	def readArchiveFile( self, archive_file ):
-		
-		data = ""
-		fname = os.path.join( self.path, archive_file )
-		try:
-			with open( fname, 'rb' ) as f: 
-				data = f.read()
-				f.close()			
-		except IOError as e:
-			pass
-		
-		return data
-
-	def writeArchiveFile( self, archive_file, data ):
-
-		fname = os.path.join( self.path, archive_file )
-		try:
-			with open(fname, 'w+') as f: 
-				f.write( data )
-				f.close()
-		except:
-			return False
-		else:
-			return True
-		
-	def removeArchiveFile( self, archive_file ):
-
-		fname = os.path.join( self.path, archive_file )
-		try:
-			os.remove( fname )
-		except:
-			return False
-		else:
-			return True
-		
-	def getArchiveFilenameList( self ):
-		return self.listFiles( self.path )
-		
-	def listFiles( self, folder ):
-		
-		itemlist = list()
-
-		for item in os.listdir( folder ):
-			itemlist.append( item )
-			if os.path.isdir( item ):
-				itemlist.extend( self.listFiles( os.path.join( folder, item ) ))
-
-		return itemlist
-
-#------------------------------------------
-# Unknown implementation
-class UnknownArchiver:
-	
-	def __init__( self, path ):
-		self.path = path
-
-	def getArchiveComment( self ):
-		return ""
-	def setArchiveComment( self, comment ):
-		return False
-	def readArchiveFilen( self ):
-		return ""
-	def writeArchiveFile( self, archive_file, data ):
-		return False
-	def removeArchiveFile( self, archive_file ):
-		return False
-	def getArchiveFilenameList( self ):
-		return []
-
-#------------------------------------------------------------------
-class ComicArchive:
-	
-	class ArchiveType:
-		Zip, Rar, Folder, Unknown = range(4)
-    
-	def __init__( self, path ):
-		self.path = path
-		self.ci_xml_filename = 'ComicInfo.xml'
-
-		if self.zipTest():
-			self.archive_type =  self.ArchiveType.Zip
-			self.archiver = ZipArchiver( self.path )
-			
-		elif self.rarTest(): 
-			self.archive_type =  self.ArchiveType.Rar
-			self.archiver = RarArchiver( self.path )
-			
-		elif os.path.isdir( self.path ):
-			self.archive_type =  self.ArchiveType.Folder
-			self.archiver = FolderArchiver( self.path )			
-		else:
-			self.archive_type =  self.ArchiveType.Unknown
-			self.archiver = UnknownArchiver( self.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 )
-
-	def rarTest( self ):
-		try:
-			rarc = UnRAR2.RarFile( self.path )
-		except: # InvalidRARArchive:
-			return False
-		else:
-			return True
-
-			
-	def isZip( self ):
-		return self.archive_type ==  self.ArchiveType.Zip
-		
-	def isRar( self ):
-		return self.archive_type ==  self.ArchiveType.Rar
-	
-	def isFolder( self ):
-		return self.archive_type ==  self.ArchiveType.Folder
-
-	def isWritable( self ):	
-		if self.archive_type == self.ArchiveType.Unknown :
-			return False
-		
-		elif self.isRar() and self.archiver.rar_exe_path is None:
-			return False
-			
-		elif not os.access(self.path, os.W_OK):
-			return False
-		
-		elif ((self.archive_type != self.ArchiveType.Folder) and 
-		        (not os.access( os.path.dirname( os.path.abspath(self.path)), os.W_OK ))):
-			return False
-
-		return True
-
-	def isWritableForStyle( self, data_style ):
-
-		if self.isRar() and data_style == MetaDataStyle.CBI:
-			return False
-
-		return self.isWritable()
-
-	def seemsToBeAComicArchive( self ):
-
-		# Do we even care about extensions??
-		ext = os.path.splitext(self.path)[1].lower()
-
-		if ( 
-		      ( self.isZip() or  self.isRar() or self.isFolder() )
-		      and
-		      ( self.getNumberOfPages() > 2)
-
-			):
-			return True
-		else:	
-			return False
-
-	def readMetadata( self, style ):
-		
-		if style == MetaDataStyle.CIX:
-			return self.readCIX()
-		elif style == MetaDataStyle.CBI:
-			return self.readCBI()
-		else:
-			return GenericMetadata()
-
-	def writeMetadata( self, metadata, style ):
-		
-		if style == MetaDataStyle.CIX:
-			return self.writeCIX( metadata )
-		elif style == MetaDataStyle.CBI:
-			return self.writeCBI( metadata )
-
-	def hasMetadata( self, style ):
-		
-		if style == MetaDataStyle.CIX:
-			return self.hasCIX()
-		elif style == MetaDataStyle.CBI:
-			return self.hasCBI()
-		else:
-			return False
-	
-	def removeMetadata( self, style ):
-		if style == MetaDataStyle.CIX:
-			return self.removeCIX()
-		elif style == MetaDataStyle.CBI:
-			return self.removeCBI()
-
-	def getCoverPage(self):
-		
-		# assume first page is the cover (for now)
-		return self.getPage( 0 )
-	
-	def getPage( self, index ):
-		
-		image_data = None
-		
-		filename = self.getPageName( index )
-
-		if filename is not None:
-			image_data = self.archiver.readArchiveFile( filename )
-
-		return image_data
-
-	def getPageName( self, index ):
-		
-		page_list = self.getPageNameList()
-		
-		num_pages = len( page_list )
-		if num_pages == 0 or index >= num_pages:
-			return None
-	
-		return  page_list[index]
-
-	def getPageNameList( self , sort_list=True):
-		
-		# get the list file names in the archive, and sort
-		files = self.archiver.getArchiveFilenameList()
-		
-		# seems like some archive creators are on  Windows, and don't know about case-sensitivity!
-		if sort_list:
-			files.sort(key=lambda x: x.lower())
-		
-		# make a sub-list of image files
-		page_list = []
-		for name in files:
-			if ( name[-4:].lower() in [ ".jpg", "jpeg", ".png" ] ):
-				page_list.append(name)
-				
-		return page_list
-
-	def getNumberOfPages( self ):
-		
-		return len( self.getPageNameList( sort_list=False ) )
-
-	def readCBI( self ):
-		raw_cbi = self.readRawCBI()
-		if raw_cbi is None:
-			return GenericMetadata()
-		
-		return ComicBookInfo().metadataFromString( raw_cbi )
-	
-	def readRawCBI( self ):
-		if ( not self.hasCBI() ):
-			return None
-
-		return self.archiver.getArchiveComment()
-
-
-	def writeCBI( self, metadata ):
-		cbi_string = ComicBookInfo().stringFromMetadata( metadata )
-		return self.archiver.setArchiveComment( cbi_string )
-		
-	def removeCBI( self ):
-		return self.archiver.setArchiveComment( "" )
-		
-	def readCIX( self ):
-		raw_cix = self.readRawCIX()
-		if raw_cix is None:
-			return GenericMetadata()
-			
-		return ComicInfoXml().metadataFromString( raw_cix )		
-
-	def readRawCIX( self ):
-		if not self.hasCIX():
-			print self.path, "doesn't has ComicInfo.xml data!"
-			return None
-
-		return  self.archiver.readArchiveFile( self.ci_xml_filename )
-		
-	def writeCIX(self, metadata):
-
-		if metadata is not None:
-			cix_string = ComicInfoXml().stringFromMetadata( metadata )
-			return self.archiver.writeArchiveFile( self.ci_xml_filename, cix_string )
-		else:
-			return False
-			
-	def removeCIX( self ):
-
-		return self.archiver.removeArchiveFile( self.ci_xml_filename )
-		
-	def hasCIX(self):
-		if not self.seemsToBeAComicArchive():
-			return False
-		elif self.ci_xml_filename in self.archiver.getArchiveFilenameList():
-			return True
-		else:
-			return False
-
-	def hasCBI(self):
-
-		#if ( not ( self.isZip() or self.isRar()) or not self.seemsToBeAComicArchive() ): 
-		if not self.seemsToBeAComicArchive(): 
-			return False
-
-		comment = self.archiver.getArchiveComment()
-		return ComicBookInfo().validateString( comment )	
-
-	def metadataFromFilename( self ):
-		 
-		metadata = GenericMetadata()
-		
-		fnp = FileNameParser()
-		fnp.parseFilename( self.path )
-
-		if fnp.issue != "":
-			metadata.issue = fnp.issue
-		if fnp.series != "":
-			metadata.series = fnp.series
-		if fnp.volume != "":
-			metadata.volume = fnp.volume
-		if fnp.year != "":
-			metadata.year = fnp.year
-		if fnp.issue_count != "":
-			metadata.issueCount = fnp.issue_count
-
-		metadata.isEmpty = False
-
-		return metadata

comictagger.py

@@ -1,369 +1,4 @@
 #!/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
-
-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
-
-import utils
-import codecs
-
-#-----------------------------
-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
-	
-	for f in opts.file_list:
-		if len( opts.file_list ) > 1:
-			print "Processing: ", f
-		process_file_cli( f, opts, settings )
-
-def process_file_cli( filename, opts, settings ):
-
-	
-	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.save_tags or opts.rename_file ):
-		print "This archive is not writable for that tag type"
-		return
-		
-
-	cix = False
-	cbi = False
-	if ca.hasCIX(): cix = True
-	if ca.hasCBI(): cbi = True
-
-	if opts.print_tags:
-
-		if opts.data_style is None:
-			page_count = ca.getNumberOfPages()
-
-			brief = ""
-			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 (cbi or cix):
-				brief += "none "
-			else:
-				if cbi: brief += "CBL "
-				if cix: brief += "CR "
-			brief += "]"
-				
-			print brief
-			print
-			
-		if opts.data_style is None or opts.data_style == MetaDataStyle.CIX:
-			if cix:
-				print "------ComicRack tags--------"
-				if opts.raw:
-					print u"{0}".format(ca.readRawCIX())
-				else:
-					print u"{0}".format(ca.readCIX())
-				
-		if opts.data_style is None or opts.data_style == MetaDataStyle.CBI:
-			if cbi:
-				print "------ComicBookLover tags--------"
-				if opts.raw:
-					pprint(json.loads(ca.readRawCBI()))
-				else:
-					print u"{0}".format(ca.readCBI())
-			
-			
-	elif opts.delete_tags:		
-		if opts.data_style == MetaDataStyle.CIX:
-			if cix:
-				if not opts.dryrun:
-					if not ca.removeCIX():
-						print "Tag removal seemed to fail!"
-					else:
-						print "Removed ComicRack tags."
-				else:
-					print "dry-run.  ComicRack tags not removed"					
-			else:
-				print "This archive doesn't have ComicRack tags."
-					
-		if opts.data_style == MetaDataStyle.CBI:
-			if cbi:
-				if not opts.dryrun:
-					if not ca.removeCBI():
-						print "Tag removal seemed to fail!"
-					else:
-						print "Removed ComicBookLover tags."
-				else:
-					print "dry-run.  ComicBookLover tags not removed"					
-			else:
-				print "This archive doesn't have ComicBookLover tags."
-		
-	elif opts.save_tags:
-		
-		# OK we're gonna do a save of some new data		
-		md = GenericMetadata()
-
-		# First read in existing data, if it's there		
-		if opts.data_style == MetaDataStyle.CIX and cix:
-				md = ca.readCIX()
-		elif opts.data_style == MetaDataStyle.CBI and cbi:
-				md = ca.readCBI()
-				
-		# now, overlay the new data onto the old, in order
-		
-		if opts.parse_filename:
-			md.overlay( ca.metadataFromFilename() )
-		
-		if opts.metadata is not None:
-			md.overlay( opts.metadata )
-			
-
-		# finally, search online
-		if opts.search_online:
-	
-			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 )
-			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"
-				return
-			if low_confidence and opts.abortOnLowConfidence:
-				print "Online search: Low confidence match.  Save aborted"
-				return
-			if not found_match:
-				print "Online search: No match found.  Save aborted"
-				return
-			
-			# we got here, so we have a single match
-			
-			# now get the particular issue data
-			try:
-				cv_md = ComicVineTalker().fetchIssueData( matches[0]['volume_id'],  matches[0]['issue_number'] )
-			except ComicVineTalkerException:
-				print "Network error while getting issue details.  Save aborted"
-				return
-				
-			md.overlay( cv_md )
-		# ok, done building our metadata. time to save
-
-		#HACK 
-		#opts.dryrun = True
-		#HACK 
-		
-		if not opts.dryrun:
-			# write out the new data
-			if not ca.writeMetadata( md, opts.data_style ):
-				print "The tag save seemed to fail!"
-			else:
-				print "Save complete."				
-		else:
-			print "dry-run option was set, so nothing was written, but here is the final set of tags:"
-			print u"{0}".format(md)
-
-	elif opts.rename_file:
-
-		md = GenericMetadata()
-		# First read in existing data, if it's there		
-		if opts.data_style == MetaDataStyle.CIX and cix:
-				md = ca.readCIX()
-		elif opts.data_style == MetaDataStyle.CBI and cbi:
-				md = ca.readCBI()
-
-		if md.isEmpty:
-			print "Comic archive contains no tags!"
-
-		if opts.data_style == MetaDataStyle.CIX:
-			if cix:
-				md = ca.readCIX()
-			else:
-				print "Comic archive contains no ComicRack tags!"
-				
-		if opts.data_style == MetaDataStyle.CBI:
-			if cbi:
-				md = ca.readCBI()
-			else:
-				print "Comic archive contains no ComicBookLover tags!"
-		
-		# TODO move this to ComicArchive, or maybe another class???
-		new_name = ""
-		if md.series is not None:
-			new_name += "{0}".format( md.series )
-		else:
-			print "Can't rename without series name"
-			return
-			
-		if md.volume is not None:
-			new_name += " v{0}".format( md.volume )
-
-		if md.issue is not None:
-			new_name += " #{:03d}".format( int(md.issue) )
-		else:
-			print "Can't rename without issue number"
-			return
-		
-		if md.issueCount is not None:
-			new_name += " (of {0})".format( md.issueCount )
-		
-		if md.year is not None:
-			new_name += " ({0})".format( md.year )
-		
-		if ca.isZip():
-			new_name += ".cbz"
-		elif ca.isRar():
-			new_name += ".cbr"
-			
-		if new_name == os.path.basename(filename):
-			print "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 ) )
-
-		#HACK 
-		#opts.dryrun = True
-		#HACK 
-			
-		if not opts.dryrun:
-			# rename the file
-			os.rename( filename, new_abs_path )
-		else:
-			print "dry-run option was set, so nothing was changed, but here is the proposed filename:"
-			print "'{0}'".format(new_abs_path)
-
-
-			
-		
-#-----------------------------
-
-def main():
-	
-	# try to make stdout encodings happy for unicode
-	sys.stdout = codecs.getwriter('utf8')(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.filename, 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()
-    
-    
-    
-    
-    
+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

@@ -0,0 +1,226 @@
+"""
+A PyQT4 dialog to select from automated issue matches
+"""
+
+"""
+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 os
+from PyQt4 import QtCore, QtGui, uic
+
+from PyQt4.QtCore import QUrl, pyqtSignal, QByteArray
+
+from imagefetcher import  ImageFetcher
+from settings import ComicTaggerSettings
+from options import MetaDataStyle
+from coverimagewidget import CoverImageWidget
+from comicvinetalker import ComicVineTalker
+import utils
+
+class AutoTagMatchWindow(QtGui.QDialog):
+	
+	volume_id = 0
+	
+	def __init__(self, parent, match_set_list, style, fetch_func):
+		super(AutoTagMatchWindow, self).__init__(parent)
+		
+		uic.loadUi(ComicTaggerSettings.getUIFile('autotagmatchwindow.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.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 Write Tags")		
+
+		self.match_set_list = match_set_list
+		self.style = style
+		self.fetch_func = fetch_func
+
+		self.current_match_set_idx = 0
+		
+		self.twList.currentItemChanged.connect(self.currentItemChanged)	
+		self.twList.cellDoubleClicked.connect(self.cellDoubleClicked)
+		self.skipButton.clicked.connect(self.skipToNext)
+		
+		self.updateData()		
+
+	def updateData( self):
+
+		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.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.twList.selectRow( 0 )
+		
+		path = self.current_match_set.ca.path
+		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] ))
+		
+	def populateTable( self  ):
+
+		while self.twList.rowCount() > 0:
+			self.twList.removeRow(0)
+		
+		self.twList.setSortingEnabled(False)
+
+		row = 0
+		for match in self.current_match_set.matches: 
+			self.twList.insertRow(row)
+			
+			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)
+
+			if match['publisher'] is not None:
+				item_text = u"{0}".format(match['publisher'])
+			else:
+				item_text = u"Unknown"
+			item = QtGui.QTableWidgetItem(item_text)
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
+			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
+			self.twList.setItem(row, 1, item)
+			
+			month_str = u""
+			year_str = u"????"
+			if match['month'] is not None:
+				month_str = u"-{0:02d}".format(int(match['month']))
+			if match['year'] is not None:
+				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 ):
+		self.accept()
+			
+	def currentItemChanged( self, curr, prev ):
+
+		if curr is None:
+			return
+		if prev is not None and prev.row() == curr.row():
+				return
+		
+		self.altCoverWidget.setIssueID( self.currentMatch()['issue_id'] )
+		
+	def setCoverImage( self ):
+		ca = self.current_match_set.ca
+		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()
+		self.current_match_set_idx += 1
+		
+		if self.current_match_set_idx == len( self.match_set_list ):
+			# no more items
+			QtGui.QDialog.accept(self)				
+		else:
+			self.updateData()
+
+	def skipToNext( self ):
+		self.current_match_set_idx += 1
+		
+		if self.current_match_set_idx == len( self.match_set_list ):
+			# no more items
+			QtGui.QDialog.reject(self)				
+		else:
+			self.updateData()
+		
+	def reject(self):
+		reply = QtGui.QMessageBox.question(self, 
+			 self.tr("Cancel Matching"), 
+			 self.tr("Are you sure you wish to cancel the matching process?"),
+			 QtGui.QMessageBox.Yes, QtGui.QMessageBox.No )
+			 
+		if reply == QtGui.QMessageBox.No:
+			return
+
+		QtGui.QDialog.reject(self)				
+			
+	def saveMatch( self ):
+		
+		match = self.currentMatch()
+		ca = self.current_match_set.ca
+
+		md = ca.readMetadata( self.style )
+		if md.isEmpty:
+			md = ca.metadataFromFilename()		
+		
+		# now get the particular issue data
+		cv_md = self.fetch_func( match )
+		if cv_md is None:
+			QtGui.QMessageBox.critical(self, self.tr("Network Issue"), self.tr("Could not connect to ComicVine to get issue details!"))
+			return
+
+		QtGui.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.WaitCursor))			
+		md.overlay( cv_md )
+		success = ca.writeMetadata( md, self.style )
+		ca.loadCache( [ MetaDataStyle.CBI, MetaDataStyle.CIX ] )
+	
+		QtGui.QApplication.restoreOverrideCursor()
+		
+		if not success:		
+			QtGui.QMessageBox.warning(self, self.tr("Write Error"), self.tr("Saving the tags to the archive seemed to fail!"))

comictaggerlib/autotagprogresswindow.py

@@ -0,0 +1,66 @@
+"""
+A PyQT4 dialog to show ID log and progress
+"""
+
+"""
+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
+import utils
+
+class AutoTagProgressWindow(QtGui.QDialog):
+	
+	
+	def __init__(self, parent):
+		super(AutoTagProgressWindow, self).__init__(parent)
+		
+		uic.loadUi(ComicTaggerSettings.getUIFile('autotagprogresswindow.ui' ), self)
+		self.lblTest.setPixmap(QtGui.QPixmap(ComicTaggerSettings.getGraphic('nocover.png')))
+		self.lblArchive.setPixmap(QtGui.QPixmap(ComicTaggerSettings.getGraphic('nocover.png')))
+		self.isdone = False
+
+		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 )
+
+	def setTestImage( self, img_data):
+		self.setCoverImage( img_data, self.lblTest )
+
+	def setCoverImage( self, img_data , label):
+		if img_data is not None:
+			img = QtGui.QImage()
+			img.loadFromData( img_data )
+			label.setPixmap(QtGui.QPixmap(img))
+			label.setScaledContents(True)
+		else:
+			label.setPixmap(QtGui.QPixmap(ComicTaggerSettings.getGraphic('nocover.png')))
+			label.setScaledContents(True)
+		QtCore.QCoreApplication.processEvents()
+		QtCore.QCoreApplication.processEvents()
+			
+	def reject(self):
+		QtGui.QDialog.reject(self)		
+		self.isdone = True
+
+		

comictaggerlib/autotagstartwindow.py

@@ -0,0 +1,104 @@
+"""
+A PyQT4 dialog to confirm and set options for auto-tag
+"""
+
+"""
+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.
+"""
+
+
+from PyQt4 import QtCore, QtGui, uic
+from settings import ComicTaggerSettings
+from settingswindow import SettingsWindow
+from filerenamer import FileRenamer
+import os
+import utils
+
+	
+class AutoTagStartWindow(QtGui.QDialog):
+		
+	def __init__( self, parent,  settings, msg ):
+		super(AutoTagStartWindow, self).__init__(parent)
+		
+		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 )
+		self.cbxDontUseYear.setCheckState( QtCore.Qt.Unchecked )
+		self.cbxAssumeIssueOne.setCheckState( QtCore.Qt.Unchecked )
+		self.cbxIgnoreLeadingDigitsInFilename.setCheckState( QtCore.Qt.Unchecked )
+		self.cbxRemoveAfterSuccess.setCheckState( QtCore.Qt.Unchecked )
+		self.cbxSpecifySearchString.setCheckState( QtCore.Qt.Unchecked )
+		self.leNameLengthMatchTolerance.setText( str(self.settings.id_length_delta_thresh) )
+		self.leSearchString.setEnabled( False )
+
+		nlmtTip = (
+			""" <html>The <b>Name Length Match Tolerance</b> is for eliminating automatic
+			    search matches that are too long compared to your series name search. The higher
+			    it is, the more likely to have a good match, but each search will take longer and
+				use more bandwidth. Too low, and only the very closest lexical matches will be
+				explored.</html>""" )
+		
+		self.leNameLengthMatchTolerance.setToolTip(nlmtTip)
+			
+		ssTip = (
+			"""<html>
+			The <b>series search string</b> specifies the search string to be used for all selected archives.
+			Use this when trying to match archives with hard-to-parse or incorrect filenames.  All archives selected
+			should be from the same series.
+			</html>"""
+		)
+		self.leSearchString.setToolTip(ssTip)
+		self.cbxSpecifySearchString.setToolTip(ssTip)
+		
+				
+		validator = QtGui.QIntValidator(0, 99, self)
+		self.leNameLengthMatchTolerance.setValidator(validator)
+				
+		self.cbxSpecifySearchString.stateChanged.connect(self.searchStringToggle)
+		
+		self.autoSaveOnLow = False
+		self.dontUseYear = False
+		self.assumeIssueOne = False
+		self.ignoreLeadingDigitsInFilename = False
+		self.removeAfterSuccess = False
+		self.searchString = None
+		self.nameLengthMatchTolerance =  self.settings.id_length_delta_thresh
+
+	def searchStringToggle(self):
+		enable = self.cbxSpecifySearchString.isChecked()
+		self.leSearchString.setEnabled( enable )
+
+	
+	def accept( self ):
+		QtGui.QDialog.accept(self)		
+
+		self.autoSaveOnLow = self.cbxSaveOnLowConfidence.isChecked()
+		self.dontUseYear = self.cbxDontUseYear.isChecked()
+		self.assumeIssueOne = self.cbxAssumeIssueOne.isChecked()
+		self.ignoreLeadingDigitsInFilename = self.cbxIgnoreLeadingDigitsInFilename.isChecked()
+		self.removeAfterSuccess = self.cbxRemoveAfterSuccess.isChecked()
+		self.nameLengthMatchTolerance = int(self.leNameLengthMatchTolerance.text())
+		
+		if self.cbxSpecifySearchString.isChecked():
+			self.searchString = unicode(self.leSearchString.text())
+			if len(self.searchString) == 0:
+				self.searchString = None
+			

comictaggerlib/cbltransformer.py

@@ -0,0 +1,99 @@
+"""
+Class to manage modifying metadata specifically for CBL/CBI
+"""
+
+"""
+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
+import utils
+
+
+class CBLTransformer:
+	def __init__( self, metadata, settings ):
+		self.metadata = metadata
+		self.settings = settings
+
+	
+	def apply( self ):
+		# helper funcs
+		def append_to_tags_if_unique( item ):
+			if item.lower() not in (tag.lower() for tag in self.metadata.tags):
+				self.metadata.tags.append( item )
+				
+		def add_string_list_to_tags( str_list ):
+			if str_list is not None and str_list != "":
+				items = [ s.strip() for s in str_list.split(',') ]
+				for item in items:
+					append_to_tags_if_unique( item )
+
+		if self.settings.assume_lone_credit_is_primary:
+		
+			# helper
+			def setLonePrimary( role_list ):
+				lone_credit = None
+				count = 0
+				for c in self.metadata.credits:
+					if c['role'].lower() in role_list:
+						count += 1
+						lone_credit = c
+					if count > 1:
+						lone_credit = None
+						break
+				if lone_credit is not None:
+					lone_credit['primary'] = True
+				return lone_credit, count
+				
+			#need to loop three times, once for 'writer', 'artist', and then 'penciler' if no artist
+			setLonePrimary( ['writer'] )
+			c, count = setLonePrimary( ['artist'] )
+			if c is None and count == 0:
+				c, count = setLonePrimary( ['penciler', 'penciller'] )
+				if c is not None:
+					c['primary'] = False
+					self.metadata.addCredit( c['person'], 'Artist', True )		
+
+		if self.settings.copy_characters_to_tags:
+			add_string_list_to_tags( self.metadata.characters )
+
+		if self.settings.copy_teams_to_tags:
+			add_string_list_to_tags( self.metadata.teams )
+			
+		if self.settings.copy_locations_to_tags:
+			add_string_list_to_tags( self.metadata.locations )
+			
+		if self.settings.copy_notes_to_comments:
+			if self.metadata.notes is not None:
+				if self.metadata.comments is None:
+					self.metadata.comments = ""
+				else:
+					self.metadata.comments += "\n\n"
+				if self.metadata.notes not in self.metadata.comments:
+					self.metadata.comments += self.metadata.notes
+
+		if self.settings.copy_weblink_to_comments:
+			if self.metadata.webLink is not None:
+				if self.metadata.comments is None:
+					self.metadata.comments = ""
+				else:
+					self.metadata.comments += "\n\n"
+				if self.metadata.webLink not in self.metadata.comments:
+					self.metadata.comments += self.metadata.webLink
+
+		return self.metadata
+
+	
+	

comictaggerlib/cli.py

@@ -0,0 +1,539 @@
+#!/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, 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.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 )
+			if settings.rar_exe_path != "":
+				ca.setExternalRarProgram( settings.rar_exe_path )	
+			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:
+		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 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 = "{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/comet.py

@@ -0,0 +1,260 @@
+"""
+A python class to encapsulate CoMet data 
+"""
+
+"""
+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.
+"""
+
+from datetime import datetime
+import zipfile
+from pprint import pprint 
+import xml.etree.ElementTree as ET
+from genericmetadata import GenericMetadata
+import utils
+
+class CoMet:
+	
+	writer_synonyms = ['writer', 'plotter', 'scripter']
+	penciller_synonyms = [ 'artist', 'penciller', 'penciler', 'breakdowns' ]
+	inker_synonyms = [ 'inker', 'artist', 'finishes' ]
+	colorist_synonyms = [ 'colorist', 'colourist', 'colorer', 'colourer' ]
+	letterer_synonyms = [ 'letterer']
+	cover_synonyms = [ 'cover', 'covers', 'coverartist', 'cover artist' ]
+	editor_synonyms = [ 'editor']
+		
+	def metadataFromString( self, string ):
+
+		tree = ET.ElementTree(ET.fromstring( string ))
+		return self.convertXMLToMetadata( tree )
+
+	def stringFromMetadata( self, metadata ):
+
+		header = '<?xml version="1.0" encoding="UTF-8"?>\n'
+		
+		tree = self.convertMetadataToXML( self, metadata )
+		return header + ET.tostring(tree.getroot())
+
+	def indent( self, elem, level=0 ):
+		# for making the XML output readable
+		i = "\n" + level*"  "
+		if len(elem):
+			if not elem.text or not elem.text.strip():
+				elem.text = i + "  "
+			if not elem.tail or not elem.tail.strip():
+				elem.tail = i
+			for elem in elem:
+				self.indent( elem, level+1 )
+			if not elem.tail or not elem.tail.strip():
+				elem.tail = i
+		else:
+			if level and (not elem.tail or not elem.tail.strip()):
+				elem.tail = i
+	
+	def convertMetadataToXML( self, filename, metadata ):
+
+		#shorthand for the metadata
+		md = metadata
+
+		# build a tree structure
+		root = ET.Element("comet")
+		root.attrib['xmlns:comet'] = "http://www.denvog.com/comet/"
+		root.attrib['xmlns:xsi'] = "http://www.w3.org/2001/XMLSchema-instance"
+		root.attrib['xsi:schemaLocation'] = "http://www.denvog.com http://www.denvog.com/comet/comet.xsd"
+		
+		#helper func
+		def assign( comet_entry, md_entry):
+			if md_entry is not None:
+				ET.SubElement(root, comet_entry).text = u"{0}".format(md_entry)
+		
+		# title is manditory
+		if md.title is None:
+			md.title = ""
+		assign( 'title', md.title )
+		assign( 'series', md.series )
+		assign( 'issue', md.issue )  #must be int??
+		assign( 'volume', md.volume )
+		assign( 'description', md.comments )
+		assign( 'publisher', md.publisher )
+		assign( 'pages', md.pageCount )
+		assign( 'format', md.format )
+		assign( 'language', md.language )
+		assign( 'rating', md.maturityRating )
+		assign( 'price', md.price )
+		assign( 'isVersionOf', md.isVersionOf )
+		assign( 'rights', md.rights )
+		assign( 'identifier', md.identifier )
+		assign( 'lastMark', md.lastMark )		
+		assign( 'genre', md.genre )   # TODO repeatable
+
+		if md.characters is not None:
+			char_list = [ c.strip() for c in md.characters.split(',') ]
+			for c in char_list:
+				assign( 'character', c ) 
+			
+		if md.manga is not None and md.manga == "YesAndRightToLeft":
+			assign( 'readingDirection', "rtl")
+		
+		date_str = ""
+		if md.year is not None:
+			date_str = str(md.year).zfill(4) 
+			if md.month is not None:
+				date_str += "-" + str(md.month).zfill(2)
+			assign( 'date', date_str )  
+
+		assign( 'coverImage', md.coverImage )
+
+		# need to specially process the credits, since they are structured differently than CIX	
+		credit_writer_list    = list()
+		credit_penciller_list = list()
+		credit_inker_list     = list()
+		credit_colorist_list  = list()
+		credit_letterer_list  = list()
+		credit_cover_list     = list()
+		credit_editor_list    = list()
+		
+		#  loop thru credits, and build a list for each role that CoMet supports
+		for credit in metadata.credits:
+
+			if credit['role'].lower() in set( self.writer_synonyms ):
+				ET.SubElement(root, 'writer').text = u"{0}".format(credit['person'])
+
+			if credit['role'].lower() in set( self.penciller_synonyms ):
+				ET.SubElement(root, 'penciller').text = u"{0}".format(credit['person'])
+				
+			if credit['role'].lower() in set( self.inker_synonyms ):
+				ET.SubElement(root, 'inker').text = u"{0}".format(credit['person'])
+				
+			if credit['role'].lower() in set( self.colorist_synonyms ):
+				ET.SubElement(root, 'colorist').text = u"{0}".format(credit['person'])
+
+			if credit['role'].lower() in set( self.letterer_synonyms ):
+				ET.SubElement(root, 'letterer').text = u"{0}".format(credit['person'])
+
+			if credit['role'].lower() in set( self.cover_synonyms ):
+				ET.SubElement(root, 'coverDesigner').text = u"{0}".format(credit['person'])
+
+			if credit['role'].lower() in set( self.editor_synonyms ):
+				ET.SubElement(root, 'editor').text = u"{0}".format(credit['person'])
+		
+
+		# self pretty-print
+		self.indent(root)
+
+		# wrap it in an ElementTree instance, and save as XML
+		tree = ET.ElementTree(root)
+		return tree
+				 
+
+	def convertXMLToMetadata( self, tree ):
+			
+		root = tree.getroot()
+
+		if root.tag != 'comet':
+			raise 1
+			return None
+
+		metadata = GenericMetadata()
+		md = metadata
+	
+		# Helper function
+		def xlate( tag ):
+			node = root.find( tag )
+			if node is not None:
+				return node.text
+			else:
+				return None
+				
+		md.series =           xlate( 'series' )
+		md.title =            xlate( 'title' )
+		md.issue =            xlate( 'issue' )
+		md.volume =           xlate( 'volume' )
+		md.comments =         xlate( 'description' )
+		md.publisher =        xlate( 'publisher' )
+		md.language =         xlate( 'language' )
+		md.format =           xlate( 'format' )
+		md.pageCount =        xlate( 'pages' )
+		md.maturityRating =   xlate( 'rating' )
+		md.price =            xlate( 'price' )
+		md.isVersionOf =      xlate( 'isVersionOf' )
+		md.rights =           xlate( 'rights' )
+		md.identifier =       xlate( 'identifier' )
+		md.lastMark =         xlate( 'lastMark' )
+		md.genre =            xlate( 'genre' ) # TODO - repeatable field
+
+		date = xlate( 'date' )
+		if date is not None:
+			parts = date.split('-')
+			if len( parts) > 0:
+				md.year = parts[0]
+			if len( parts) > 1:
+				md.month = parts[1]
+				
+		md.coverImage = xlate( 'coverImage' )
+		
+		readingDirection = xlate( 'readingDirection' )
+		if readingDirection is not None and readingDirection == "rtl":
+			md.manga = "YesAndRightToLeft"
+	
+		# loop for character tags		
+		char_list =  []
+		for n in root:
+			if n.tag == 'character':
+				char_list.append(n.text.strip())
+		md.characters = utils.listToString( char_list )
+
+		# Now extract the credit info
+		for n in root:
+			if (  n.tag == 'writer' or 
+				n.tag == 'penciller' or
+				n.tag == 'inker' or
+				n.tag == 'colorist' or
+				n.tag == 'letterer' or
+				n.tag == 'editor' 
+			):
+				metadata.addCredit( n.text.strip(), n.tag.title() )
+
+			if n.tag == 'coverDesigner':
+				metadata.addCredit( n.text.strip(), "Cover" )
+
+
+		metadata.isEmpty = False
+		
+		return metadata
+
+	#verify that the string actually contains CoMet data in XML format
+	def validateString( self, string ):
+		try:
+			tree = ET.ElementTree(ET.fromstring( string ))
+			root = tree.getroot()
+			if root.tag != 'comet':
+				raise Exception
+		except:
+			return False
+		
+		return True
+
+
+	def writeToExternalFile( self, filename, metadata ):
+		
+		tree = self.convertMetadataToXML( self, metadata )
+		#ET.dump(tree)		
+		tree.write(filename, encoding='utf-8')
+	
+	def readFromExternalFile( self, filename ):
+
+		tree = ET.parse( filename )
+		return self.convertXMLToMetadata( tree )
+

comictaggerlib/comicarchive.py

@@ -0,0 +1,978 @@
+"""
+A python class to represent a single comic, be it file or folder of images
+"""
+
+"""
+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 zipfile
+import os
+import struct
+import sys
+import tempfile
+import subprocess
+import platform
+if platform.system() == "Windows":
+	import _subprocess
+import time
+
+import StringIO
+try: 
+	import Image
+	pil_available = True
+except ImportError:
+	pil_available = False
+	
+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
+from genericmetadata import GenericMetadata, PageType
+from filenameparser import FileNameParser
+from settings import ComicTaggerSettings
+
+class ZipArchiver:
+	
+	def __init__( self, path ):
+		self.path = path
+	
+	def getArchiveComment( self ):
+		zf = zipfile.ZipFile( self.path, 'r' )
+		comment = zf.comment
+		zf.close()
+		return comment
+
+	def setArchiveComment( self, comment ):
+		return self.writeZipComment( self.path, comment )
+
+	def readArchiveFile( self, archive_file ):
+		data = ""
+		zf = zipfile.ZipFile( self.path, 'r' )
+		try:
+			data = zf.read( archive_file )
+		except zipfile.BadZipfile as e:
+			print >> sys.stderr, "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
+			zf.close()	
+			raise IOError
+		except Exception as e:
+			zf.close()	
+			print >> sys.stderr, "bad zipfile [{0}]: {1} :: {2}".format(e, self.path, archive_file)
+			raise IOError
+		finally:
+			zf.close()
+		return data
+
+	def removeArchiveFile( self, archive_file ):
+		try:
+			self.rebuildZipFile(  [ archive_file ] )
+		except:
+			return False
+		else:
+			return True
+			
+	def writeArchiveFile( self, archive_file, data ):
+		#  At the moment, no other option but to rebuild the whole 
+		#  zip archive w/o the indicated file. Very sucky, but maybe 
+		# another solution can be found
+		try:
+			self.rebuildZipFile(  [ archive_file ] )
+			
+			#now just add the archive file as a new one
+			zf = zipfile.ZipFile(self.path, mode='a', compression=zipfile.ZIP_DEFLATED ) 
+			zf.writestr( archive_file, data )
+			zf.close()
+			return True
+		except:
+			return False
+			
+	def getArchiveFilenameList( self ):		
+		zf = zipfile.ZipFile( self.path, 'r' )
+		namelist = zf.namelist()
+		zf.close()
+		return namelist
+	
+	# zip helper func
+	def rebuildZipFile( self, exclude_list ):
+		
+		# this recompresses the zip archive, without the files in the 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) )
+		os.close( tmp_fd )
+		
+		zin = zipfile.ZipFile (self.path, 'r')
+		zout = zipfile.ZipFile (tmp_name, 'w')
+		for item in zin.infolist():
+			buffer = zin.read(item.filename)
+			if ( item.filename not in exclude_list ):
+				zout.writestr(item, buffer)
+		
+		#preserve the old comment
+		zout.comment = zin.comment
+		
+		zout.close()
+		zin.close()
+		
+		# replace with the new file 
+		os.remove( self.path )
+		os.rename( tmp_name, self.path )
+
+
+	def writeZipComment( self, filename, comment ):
+		"""
+		This is a custom function for writing a comment to a zip file,
+		since the built-in one doesn't seem to work on Windows and Mac OS/X
+
+		Fortunately, the zip comment is at the end of the file, and it's
+		easy to manipulate.  See this website for more info:
+		see: http://en.wikipedia.org/wiki/Zip_(file_format)#Structure
+		"""
+
+		#get file size
+		statinfo = os.stat(filename)
+		file_length = statinfo.st_size
+
+		try:
+			fo = open(filename, "r+b")
+
+			#the starting position, relative to EOF
+			pos = -4
+
+			found = False
+			value = bytearray()
+		
+			# walk backwards to find the "End of Central Directory" record
+			while ( not found ) and ( -pos != file_length ):
+				# seek, relative to EOF	
+				fo.seek( pos,  2)
+
+				value = fo.read( 4 )
+
+				#look for the end of central directory signature
+				if bytearray(value) == bytearray([ 0x50, 0x4b, 0x05, 0x06 ]):
+					found = True
+				else:
+					# not found, step back another byte
+					pos = pos - 1
+				#print pos,"{1} int: {0:x}".format(bytearray(value)[0], value)
+			
+			if found:
+				
+				# now skip forward 20 bytes to the comment length word
+				pos += 20
+				fo.seek( pos,  2)
+
+				# Pack the length of the comment string
+				format = "H"                   # one 2-byte integer
+				comment_length = struct.pack(format, len(comment)) # pack integer in a binary string
+				
+				# write out the length
+				fo.write( comment_length )
+				fo.seek( pos+2,  2)
+				
+				# write out the comment itself
+				fo.write( comment )
+				fo.truncate()
+				fo.close()
+			else:
+				raise Exception('Failed to write comment to zip file!')
+		except:
+			return False
+		else:
+			return True
+
+	def copyFromArchive( self, otherArchive ):
+		# Replace the current zip with one copied from another archive
+		try:		
+			zout = zipfile.ZipFile (self.path, 'w')
+			for fname in otherArchive.getArchiveFilenameList():
+				data = otherArchive.readArchiveFile( fname )	
+				if data is not None:
+					zout.writestr( fname, data )
+			zout.close()
+			
+			#preserve the old comment
+			comment = otherArchive.getArchiveComment()
+			if comment is not None:
+				if not self.writeZipComment( self.path, comment ):
+					return False
+		except  Exception as e:
+			print >> sys.stderr, "Error while copying to {0}: {1}".format(self.path, e)
+			return False
+		else:
+			return True
+
+		
+#------------------------------------------
+# RAR implementation
+	
+class RarArchiver:
+	
+	devnull = None
+	def __init__( self, path ):
+		self.path = path
+		self.rar_exe_path = None
+
+		if RarArchiver.devnull is None:
+			RarArchiver.devnull = open(os.devnull, "w")
+
+		# windows only, keeps the cmd.exe from popping up
+		if platform.system() == "Windows":
+			self.startupinfo = subprocess.STARTUPINFO()
+			self.startupinfo.dwFlags |= _subprocess.STARTF_USESHOWWINDOW
+		else:
+			self.startupinfo = None
+
+	def __del__(self):
+		#RarArchiver.devnull.close()
+		pass
+
+	def getArchiveComment( self ):
+		
+		rarc = self.getRARObj()
+		return rarc.comment		
+
+	def setArchiveComment( self, comment ):
+
+		if self.rar_exe_path is not None:
+			try:
+				# write comment to temp file
+				tmp_fd, tmp_name = tempfile.mkstemp()
+				f = os.fdopen(tmp_fd, 'w+b')
+				f.write( comment )		
+				f.close()
+
+				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], 
+					startupinfo=self.startupinfo, 
+					stdout=RarArchiver.devnull)
+				
+				if platform.system() == "Darwin":
+					time.sleep(1)
+					
+				os.remove( tmp_name)
+			except:
+				return False
+			else:
+				return True
+		else:
+			return False
+			
+	def readArchiveFile( self, archive_file ):
+
+		# Make sure to escape brackets, since some funky stuff is going on
+		# underneath with "fnmatch"
+		archive_file = archive_file.replace("[", '[[]')
+		entries = []
+
+		rarc = self.getRARObj()
+
+		tries = 0
+		while tries < 7:
+			try:
+				tries = tries+1
+				entries = rarc.read_files( archive_file )
+
+				if entries[0][0].size != len(entries[0][1]):
+					print >> sys.stderr, "readArchiveFile(): [file is not expected size: {0} vs {1}]  {2}:{3} [attempt # {4}]".format(
+								entries[0][0].size,len(entries[0][1]), self.path, archive_file, tries)
+					continue
+				
+			except (OSError, IOError) as e:
+				print >> sys.stderr, "readArchiveFile(): [{0}]  {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
+				time.sleep(1)
+			except Exception as e:
+				print >> sys.stderr, "Unexpected exception in readArchiveFile(): [{0}] for {1}:{2} attempt#{3}".format(str(e), self.path, archive_file, tries)
+				break
+
+			else:
+				#Success"
+				#entries is a list of of tuples:  ( rarinfo, filedata)
+				if tries > 1:
+					print >> sys.stderr, "Attempted read_files() {0} times".format(tries)
+				if (len(entries) == 1):
+					return entries[0][1]
+				else:
+					raise IOError
+			
+		raise IOError
+		
+
+		
+	def writeArchiveFile( self, archive_file, data ):
+
+		if self.rar_exe_path is not None:
+			try:
+				tmp_folder = tempfile.mkdtemp()
+
+				tmp_file = os.path.join( tmp_folder, archive_file )
+				
+				working_dir = os.path.dirname( os.path.abspath( self.path ) )
+
+				# TODO: will this break if 'archive_file' is in a subfolder. i.e. "foo/bar.txt"
+				# will need to create the subfolder above, I guess...
+				f = open(tmp_file, 'w')
+				f.write( data )		
+				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], 
+					startupinfo=self.startupinfo,
+					stdout=RarArchiver.devnull)
+
+				if platform.system() == "Darwin":
+					time.sleep(1)
+				os.remove( tmp_file)
+				os.rmdir( tmp_folder)
+			except:
+				return False
+			else:
+				return True
+		else:
+			return False
+			
+	def removeArchiveFile( self, archive_file ):
+		if self.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], 
+					startupinfo=self.startupinfo, 				   
+					stdout=RarArchiver.devnull)
+
+				if platform.system() == "Darwin":
+					time.sleep(1)
+			except:
+				return False
+			else:
+				return True
+		else:
+			return False
+			
+	def getArchiveFilenameList( self ):
+
+		rarc = self.getRARObj()
+		#namelist = [ item.filename for item in rarc.infolist() ]
+		#return namelist
+
+		tries = 0
+		while tries < 7:
+			try:
+				tries = tries+1
+				#namelist = [ item.filename for item in rarc.infolist() ]
+				namelist = []
+				for item in rarc.infolist():
+					if item.size != 0:
+						namelist.append( item.filename )
+			
+			except (OSError, IOError) as e:
+				print >> sys.stderr, "getArchiveFilenameList(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
+				time.sleep(1)
+
+			else:
+				#Success"
+				return namelist
+			
+		raise e
+			
+		
+	def getRARObj( self ):
+		tries = 0
+		while tries < 7:
+			try:
+				tries = tries+1
+				rarc = UnRAR2.RarFile( self.path )
+			
+			except (OSError, IOError) as e:
+				print >> sys.stderr, "getRARObj(): [{0}] {1} attempt#{2}".format(str(e), self.path, tries)
+				time.sleep(1)
+
+			else:
+				#Success"
+				return rarc
+			
+		raise e
+		
+#------------------------------------------
+# Folder implementation
+class FolderArchiver:
+	
+	def __init__( self, path ):
+		self.path = path
+		self.comment_file_name = "ComicTaggerFolderComment.txt" 
+
+	def getArchiveComment( self ):
+		return self.readArchiveFile( self.comment_file_name )
+	
+	def setArchiveComment( self, comment ):
+		return self.writeArchiveFile( self.comment_file_name, comment )
+		
+	def readArchiveFile( self, archive_file ):
+		
+		data = ""
+		fname = os.path.join( self.path, archive_file )
+		try:
+			with open( fname, 'rb' ) as f: 
+				data = f.read()
+				f.close()			
+		except IOError as e:
+			pass
+		
+		return data
+
+	def writeArchiveFile( self, archive_file, data ):
+
+		fname = os.path.join( self.path, archive_file )
+		try:
+			with open(fname, 'w+') as f: 
+				f.write( data )
+				f.close()
+		except:
+			return False
+		else:
+			return True
+		
+	def removeArchiveFile( self, archive_file ):
+
+		fname = os.path.join( self.path, archive_file )
+		try:
+			os.remove( fname )
+		except:
+			return False
+		else:
+			return True
+		
+	def getArchiveFilenameList( self ):
+		return self.listFiles( self.path )
+		
+	def listFiles( self, folder ):
+		
+		itemlist = list()
+
+		for item in os.listdir( folder ):
+			itemlist.append( item )
+			if os.path.isdir( item ):
+				itemlist.extend( self.listFiles( os.path.join( folder, item ) ))
+
+		return itemlist
+
+#------------------------------------------
+# Unknown implementation
+class UnknownArchiver:
+	
+	def __init__( self, path ):
+		self.path = path
+
+	def getArchiveComment( self ):
+		return ""
+	def setArchiveComment( self, comment ):
+		return False
+	def readArchiveFile( self ):
+		return ""
+	def writeArchiveFile( self, archive_file, data ):
+		return False
+	def removeArchiveFile( self, archive_file ):
+		return False
+	def getArchiveFilenameList( self ):
+		return []
+
+#------------------------------------------------------------------
+class ComicArchive:
+
+	logo_data = None
+
+	class ArchiveType:
+		Zip, Rar, Folder, Unknown = range(4)
+    
+	def __init__( self, path ):
+		self.path = path
+		self.ci_xml_filename = 'ComicInfo.xml'
+		self.comet_default_filename = 'CoMet.xml'
+		self.resetCache()
+		
+		if self.zipTest():
+			self.archive_type =  self.ArchiveType.Zip
+			self.archiver = ZipArchiver( self.path )
+			
+		elif self.rarTest(): 
+			self.archive_type =  self.ArchiveType.Rar
+			self.archiver = RarArchiver( self.path )
+			
+		elif os.path.isdir( self.path ):
+			self.archive_type =  self.ArchiveType.Folder
+			self.archiver = FolderArchiver( self.path )			
+		else:
+			self.archive_type =  self.ArchiveType.Unknown
+			self.archiver = UnknownArchiver( self.path )
+
+		if ComicArchive.logo_data is None:
+			fname = ComicTaggerSettings.getGraphic('nocover.png')
+			with open(fname, 'rb') as fd:
+				ComicArchive.logo_data = fd.read()				
+
+	# Clears the cached data
+	def resetCache( self ):
+		self.has_cix = None
+		self.has_cbi = None
+		self.has_comet = None
+		self.comet_filename = None
+		self.page_count  = None
+		self.page_list  = None
+		self.cix_md  = None
+		self.cbi_md  = None
+		self.comet_md  = None
+
+	def loadCache( self, style_list ):
+		for style in style_list:
+			self.readMetadata(style)
+			
+	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 )
+
+	def rarTest( self ):
+		try:
+			rarc = UnRAR2.RarFile( self.path )
+		except: # InvalidRARArchive:
+			return False
+		else:
+			return True
+
+			
+	def isZip( self ):
+		return self.archive_type ==  self.ArchiveType.Zip
+		
+	def isRar( self ):
+		return self.archive_type ==  self.ArchiveType.Rar
+	
+	def isFolder( self ):
+		return self.archive_type ==  self.ArchiveType.Folder
+
+	def isWritable( self, check_rar_status=True ):	
+		if self.archive_type == self.ArchiveType.Unknown :
+			return False
+		
+		elif check_rar_status and self.isRar() and self.archiver.rar_exe_path is None:
+			return False
+			
+		elif not os.access(self.path, os.W_OK):
+			return False
+		
+		elif ((self.archive_type != self.ArchiveType.Folder) and 
+		        (not os.access( os.path.dirname( os.path.abspath(self.path)), os.W_OK ))):
+			return False
+
+		return True
+
+	def isWritableForStyle( self, data_style ):
+
+		if self.isRar() and data_style == MetaDataStyle.CBI:
+			return False
+
+		return self.isWritable()
+
+	def seemsToBeAComicArchive( self ):
+
+		# Do we even care about extensions??
+		ext = os.path.splitext(self.path)[1].lower()
+
+		if ( 
+		      ( self.isZip() or  self.isRar() or self.isFolder() )
+		      and
+		      ( self.getNumberOfPages() > 2)
+
+			):
+			return True
+		else:	
+			return False
+
+	def readMetadata( self, style ):
+		
+		if style == MetaDataStyle.CIX:
+			return self.readCIX()
+		elif style == MetaDataStyle.CBI:
+			return self.readCBI()
+		elif style == MetaDataStyle.COMET:
+			return self.readCoMet()
+		else:
+			return GenericMetadata()
+
+	def writeMetadata( self, metadata, style ):
+		
+		retcode = None
+		if style == MetaDataStyle.CIX:
+			retcode = self.writeCIX( metadata )
+		elif style == MetaDataStyle.CBI:
+			retcode = self.writeCBI( metadata )
+		elif style == MetaDataStyle.COMET:
+			retcode = self.writeCoMet( metadata )
+		return retcode
+		
+
+	def hasMetadata( self, style ):
+		
+		if style == MetaDataStyle.CIX:
+			return self.hasCIX()
+		elif style == MetaDataStyle.CBI:
+			return self.hasCBI()
+		elif style == MetaDataStyle.COMET:
+			return self.hasCoMet()
+		else:
+			return False
+	
+	def removeMetadata( self, style ):
+		retcode = True
+		if style == MetaDataStyle.CIX:
+			retcode = self.removeCIX()
+		elif style == MetaDataStyle.CBI:
+			retcode = self.removeCBI()
+		elif style == MetaDataStyle.COMET:
+			retcode = self.removeCoMet()
+		return retcode
+
+	def getPage( self, index ):
+		
+		image_data = None
+		
+		filename = self.getPageName( index )
+
+		if filename is not None:
+			try:
+				image_data = self.archiver.readArchiveFile( filename )
+			except IOError:
+				print >> sys.stderr, "Error reading in page.  Substituting logo page."
+				image_data = ComicArchive.logo_data				
+
+		return image_data
+
+	def getPageName( self, index ):
+		
+		page_list = self.getPageNameList()
+		
+		num_pages = len( page_list )
+		if num_pages == 0 or index >= num_pages:
+			return None
+	
+		return  page_list[index]
+
+	def getPageNameList( self , sort_list=True):
+		
+		if self.page_list is None:
+			# get the list file names in the archive, and sort
+			files = self.archiver.getArchiveFilenameList()
+			
+			# seems like some archive creators are on  Windows, and don't know about case-sensitivity!
+			if sort_list:
+				files.sort(key=lambda x: x.lower())
+			
+			# make a sub-list of image files
+			self.page_list = []
+			for name in files:
+				if ( name[-4:].lower() in [ ".jpg", "jpeg", ".png", ".gif" ] and os.path.basename(name)[0] != "." ):
+					self.page_list.append(name)
+				
+		return self.page_list
+
+	def getNumberOfPages( self ):
+		
+		if self.page_count is None:
+			self.page_count = len( self.getPageNameList( ) )
+		return self.page_count
+
+	def readCBI( self ):
+		if self.cbi_md is None:
+			raw_cbi = self.readRawCBI()
+			if raw_cbi is None:
+				self.cbi_md = GenericMetadata()
+			else:
+				self.cbi_md = ComicBookInfo().metadataFromString( raw_cbi )
+			
+			self.cbi_md.setDefaultPageList( self.getNumberOfPages() )
+				
+		return self.cbi_md
+	
+	def readRawCBI( self ):
+		if ( not self.hasCBI() ):
+			return None
+
+		return self.archiver.getArchiveComment()
+
+	def hasCBI(self):
+		if self.has_cbi is None:
+
+			#if ( not ( self.isZip() or self.isRar()) or not self.seemsToBeAComicArchive() ): 
+			if not self.seemsToBeAComicArchive(): 
+				self.has_cbi = False
+			else:
+				comment = self.archiver.getArchiveComment()
+				self.has_cbi = ComicBookInfo().validateString( comment )
+			
+		return self.has_cbi
+	
+	def writeCBI( self, metadata ):
+		if metadata is not None:
+			self.applyArchiveInfoToMetadata( metadata )
+			cbi_string = ComicBookInfo().stringFromMetadata( metadata )
+			write_success =  self.archiver.setArchiveComment( cbi_string )
+			if write_success:
+				self.has_cbi = True
+				self.cbi_md = metadata
+			self.resetCache()
+			return write_success
+		else:
+			return False
+		
+	def removeCBI( self ):
+		if self.hasCBI():
+			write_success = self.archiver.setArchiveComment( "" )
+			if write_success:
+				self.has_cbi = False
+				self.cbi_md = None
+			self.resetCache()
+			return write_success
+		return True	
+		
+	def readCIX( self ):
+		if self.cix_md is None:
+			raw_cix = self.readRawCIX()
+			if raw_cix is None or raw_cix == "":
+				self.cix_md = GenericMetadata()
+			else:
+				self.cix_md = ComicInfoXml().metadataFromString( raw_cix )
+
+			#validate the existing page list (make sure count is correct)
+			if len ( self.cix_md.pages ) !=  0 :
+				if len ( self.cix_md.pages ) != self.getNumberOfPages():
+					# pages array doesn't match the actual number of images we're seeing
+					# in the archive, so discard the data
+					self.cix_md.pages = []
+				
+			if len( self.cix_md.pages ) == 0:
+				self.cix_md.setDefaultPageList( self.getNumberOfPages() )
+			
+		return self.cix_md
+
+	def readRawCIX( self ):
+		if not self.hasCIX():
+			return None
+		try:
+			raw_cix = self.archiver.readArchiveFile( self.ci_xml_filename )
+		except IOError:
+			print "Error reading in raw CIX!"
+			raw_cix = ""
+		return  raw_cix
+		
+	def writeCIX(self, metadata):
+
+		if metadata is not None:
+			self.applyArchiveInfoToMetadata( metadata, calc_page_sizes=True )
+			cix_string = ComicInfoXml().stringFromMetadata( metadata )
+			write_success = self.archiver.writeArchiveFile( self.ci_xml_filename, cix_string )
+			if write_success:
+				self.has_cix = True
+				self.cix_md = metadata
+			self.resetCache()
+			return write_success
+		else:
+			return False
+			
+	def removeCIX( self ):
+		if self.hasCIX():
+			write_success = self.archiver.removeArchiveFile( self.ci_xml_filename )
+			if write_success:
+				self.has_cix = False
+				self.cix_md = None
+			self.resetCache()
+			return write_success
+		return True
+		
+		
+	def hasCIX(self):
+		if self.has_cix is None:
+
+			if not self.seemsToBeAComicArchive():
+				self.has_cix = False
+			elif self.ci_xml_filename in self.archiver.getArchiveFilenameList():
+				self.has_cix = True
+			else:
+				self.has_cix = False
+		return self.has_cix
+
+
+	def readCoMet( self ):
+		if self.comet_md is None:
+			raw_comet = self.readRawCoMet()
+			if raw_comet is None or raw_comet == "":
+				self.comet_md = GenericMetadata()
+			else:
+				self.comet_md = CoMet().metadataFromString( raw_comet )
+			
+			self.comet_md.setDefaultPageList( self.getNumberOfPages() )
+			#use the coverImage value from the comet_data to mark the cover in this struct
+			# walk through list of images in file, and find the matching one for md.coverImage
+			# need to remove the existing one in the default
+			if self.comet_md.coverImage is not None:
+				cover_idx = 0
+				for idx,f in enumerate(self.getPageNameList()):
+					if self.comet_md.coverImage == f:
+						cover_idx = idx
+						break
+				if cover_idx != 0:
+					del (self.comet_md.pages[0]['Type'] )
+					self.comet_md.pages[ cover_idx ]['Type'] = PageType.FrontCover
+
+		return self.comet_md	
+
+	def readRawCoMet( self ):
+		if not self.hasCoMet():
+			print >> sys.stderr, self.path, "doesn't have CoMet data!"
+			return None
+
+		try:
+			raw_comet = self.archiver.readArchiveFile( self.comet_filename )
+		except IOError:
+			print >> sys.stderr, "Error reading in raw CoMet!"
+			raw_comet = ""
+		return  raw_comet
+		
+	def writeCoMet(self, metadata):
+
+		if metadata is not None:
+			if not self.hasCoMet():
+				self.comet_filename = self.comet_default_filename
+			
+			self.applyArchiveInfoToMetadata( metadata )
+			# Set the coverImage value, if it's not the first page
+			cover_idx = int(metadata.getCoverPageIndexList()[0])
+			if cover_idx != 0:
+				metadata.coverImage = self.getPageName( cover_idx )
+		
+			comet_string = CoMet().stringFromMetadata( metadata )
+			write_success = self.archiver.writeArchiveFile( self.comet_filename, comet_string )
+			if write_success:
+				self.has_comet = True
+				self.comet_md = metadata
+			self.resetCache()
+			return write_success
+		else:
+			return False
+			
+	def removeCoMet( self ):
+		if self.hasCoMet():
+			write_success = self.archiver.removeArchiveFile( self.comet_filename )
+			if write_success:
+				self.has_comet = False
+				self.comet_md = None
+			self.resetCache()
+			return write_success
+		return True
+		
+	def hasCoMet(self):
+		if self.has_comet is None:
+			self.has_comet = False
+			if not self.seemsToBeAComicArchive():
+				return self.has_comet
+			
+			#look at all xml files in root, and search for CoMet data, get first
+			for n in self.archiver.getArchiveFilenameList():
+				if ( os.path.dirname(n) == "" and
+					os.path.splitext(n)[1].lower() == '.xml'):
+					# read in XML file, and validate it
+					try:
+						data = self.archiver.readArchiveFile( n )
+					except:
+						data = ""
+						print >> sys.stderr, "Error reading in Comet XML for validation!"
+					if CoMet().validateString( data ):
+						# since we found it, save it!
+						self.comet_filename = n
+						self.has_comet = True
+						break
+						
+			return self.has_comet
+				
+
+
+	def applyArchiveInfoToMetadata( self, md, calc_page_sizes=False):
+		md.pageCount = self.getNumberOfPages()
+		
+		if calc_page_sizes:
+			for p in md.pages:
+				idx = int( p['Image'] )
+				if pil_available:
+					if 'ImageSize' not in p or 'ImageHeight' not in p or 'ImageWidth' not in p:
+						data = self.getPage( idx )
+						if data is not None:
+							try:
+								im = Image.open(StringIO.StringIO(data))
+								w,h = im.size
+								
+								p['ImageSize'] = str(len(data))
+								p['ImageHeight'] = str(h)
+								p['ImageWidth'] = str(w)
+							except IOError:
+								p['ImageSize'] = str(len(data))
+									
+				else:
+					if 'ImageSize' not in p:
+						data = self.getPage( idx )
+						p['ImageSize'] = str(len(data))
+
+
+			
+	def metadataFromFilename( self ):
+		 
+		metadata = GenericMetadata()
+		
+		fnp = FileNameParser()
+		fnp.parseFilename( self.path )
+
+		if fnp.issue != "":
+			metadata.issue = fnp.issue
+		if fnp.series != "":
+			metadata.series = fnp.series
+		if fnp.volume != "":
+			metadata.volume = fnp.volume
+		if fnp.year != "":
+			metadata.year = fnp.year
+		if fnp.issue_count != "":
+			metadata.issueCount = fnp.issue_count
+
+		metadata.isEmpty = False
+
+		return metadata
+
+	def exportAsZip( self, zipfilename ):
+		if self.archive_type == self.ArchiveType.Zip:
+			# nothing to do, we're already a zip
+			return True
+		
+		zip_archiver = ZipArchiver( zipfilename )
+		return zip_archiver.copyFromArchive( self.archiver )
+		

comictaggerlib/comicbookinfo.py

@@ -1,5 +1,5 @@
 """
-A python class to encapsulate the ComicBookInfo data and file handling
+A python class to encapsulate the ComicBookInfo data 
 """
 
 """
@@ -25,6 +25,7 @@ import zipfile
 
 from genericmetadata import GenericMetadata
 import utils
+import ctversion
 
 class ComicBookInfo:
 		 
@@ -62,6 +63,12 @@ class ComicBookInfo:
 		metadata.criticalRating =    xlate( 'rating' )
 		metadata.tags =              xlate( 'tags' )
 		
+		# make sure credits and tags are at least empty lists and not None
+		if metadata.credits is None:
+			metadata.credits = []
+		if metadata.tags is None:
+			metadata.tags = []
+			
 		#need to massage the language string to be ISO
 		if metadata.language is not None:
 			# reverse look-up
@@ -96,7 +103,7 @@ class ComicBookInfo:
 		
 		# Create the dictionary that we will convert to JSON text
 		cbi = dict()
-		cbi_container = {'appID' : 'ComicTagger/0.1', 
+		cbi_container = {'appID' : 'ComicTagger/' + ctversion.version, 
 		                 'lastModified' : str(datetime.now()), 
 		                 'ComicBookInfo/1.0' : cbi }
 		
@@ -104,18 +111,28 @@ class ComicBookInfo:
 		def assign( cbi_entry, md_entry):
 			if md_entry is not None:
 				cbi[cbi_entry] = md_entry
+			
+		#helper func
+		def toInt(s):
+			i = None
+			if type(s) in [ str, unicode, int ]:
+				try:
+					i = int(s)
+				except ValueError:
+					pass
+			return i
 				
 		assign( 'series', metadata.series )
 		assign( 'title', metadata.title )
 		assign( 'issue', metadata.issue )
 		assign( 'publisher', metadata.publisher )
-		assign( 'publicationMonth', metadata.month )
-		assign( 'publicationYear', metadata.year )
-		assign( 'numberOfIssues', metadata.issueCount )
+		assign( 'publicationMonth', toInt(metadata.month) )
+		assign( 'publicationYear', toInt(metadata.year) )
+		assign( 'numberOfIssues', toInt(metadata.issueCount) )
 		assign( 'comments', metadata.comments )
 		assign( 'genre', metadata.genre )
-		assign( 'volume', metadata.volume )
-		assign( 'numberOfVolumes', metadata.volumeCount )
+		assign( 'volume', toInt(metadata.volume) )
+		assign( 'numberOfVolumes', toInt(metadata.volumeCount) )
 		assign( 'language', utils.getLanguageFromISO(metadata.language) )
 		assign( 'country', metadata.country )
 		assign( 'rating', metadata.criticalRating )

comictaggerlib/comicinfoxml.py

@@ -1,5 +1,5 @@
 """
-A python class to encapsulate ComicRack's ComicInfo.xml data and file handling
+A python class to encapsulate ComicRack's ComicInfo.xml data 
 """
 
 """
@@ -270,6 +270,7 @@ class ComicInfoXml:
 		if pages_node is not None:			
 			for page in pages_node:
 				metadata.pages.append( page.attrib )
+				#print page.attrib
 
 		metadata.isEmpty = False
 		

comictaggerlib/comicvinecacher.py

@@ -25,22 +25,47 @@ import sys
 import os
 import datetime
 
+import ctversion
 from settings import ComicTaggerSettings
+import utils
 
 class ComicVineCacher:
 
 	def __init__(self ):
 		self.settings_folder = ComicTaggerSettings.getSettingsFolder()
 		self.db_file = os.path.join( self.settings_folder, "cv_cache.db")
+		self.version_file = os.path.join( self.settings_folder, "cache_version.txt")
+		
+		#verify that cache is from same version as this one
+		data = ""
+		try:
+			with open( self.version_file, 'rb' ) as f: 
+				data = f.read()
+				f.close()
+		except:
+			pass
+		if data != ctversion.version:
+			self.clearCache()
 		
 		if not os.path.exists( self.db_file ):
 			self.create_cache_db()
 
 	def clearCache( self ):
-		os.unlink( self.db_file )
+		try:
+			os.unlink( self.db_file )
+		except:
+			pass
+		try:
+			os.unlink( self.version_file )
+		except:
+			pass
 
 	def create_cache_db( self ):
 		
+		#create the version file
+		with open( self.version_file, 'w' ) as f:
+			f.write( ctversion.version )
+		
 		# this will wipe out any existing version
 		open( self.db_file, 'w').close()
 
@@ -68,10 +93,18 @@ class ComicVineCacher:
 							"name TEXT," +
 							"publisher TEXT," +
 							"count_of_issues INT," +
+							"start_year INT," +
 							"timestamp DATE DEFAULT (datetime('now','localtime')), " + 
 							"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," +
@@ -83,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 ) )" 
 						)
@@ -92,7 +126,7 @@ class ComicVineCacher:
 		con = lite.connect( self.db_file )
 
 		with con:
-			
+			con.text_factory = unicode					
 			cur = con.cursor()    
 			
 			# remove all previous entries with this search term
@@ -124,12 +158,13 @@ class ComicVineCacher:
 								url,
 								record['description']) 
 							)
-							
+			
 	def get_search_results( self, search_term ):
 		
 		results = list()
 		con = lite.connect( self.db_file )
 		with con:
+			con.text_factory = unicode					
 			cur = con.cursor() 
 			
 			
@@ -158,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 )
@@ -178,6 +258,7 @@ class ComicVineCacher:
 						"name":            cv_volume_record['name'], 
 						"publisher":       pub_name, 
 						"count_of_issues": cv_volume_record['count_of_issues'],
+						"start_year":      cv_volume_record['start_year'], 
 						"timestamp":       timestamp 
 					}
 			self.upsert( cur, "volumes", "id", cv_volume_record['id'], data)
@@ -202,6 +283,7 @@ class ComicVineCacher:
 		con = lite.connect( self.db_file )
 		with con:
 			cur = con.cursor() 
+			con.text_factory = unicode					
 			
 			# purge stale volume info
 			a_week_ago = datetime.datetime.today()-datetime.timedelta(days=7)
@@ -212,7 +294,7 @@ class ComicVineCacher:
 			cur.execute( "DELETE FROM Issues WHERE timestamp  < ?", [ str(a_month_ago) ] )	
 			
 			# fetch
-			cur.execute("SELECT id,name,publisher,count_of_issues FROM Volumes WHERE id = ?", [ volume_id ] )
+			cur.execute("SELECT id,name,publisher,count_of_issues,start_year FROM Volumes WHERE id = ?", [ volume_id ] )
 			
 			row = cur.fetchone()
 			
@@ -227,6 +309,7 @@ class ComicVineCacher:
 			result['publisher'] = dict()
 			result['publisher']['name'] = row[2]
 			result['count_of_issues'] =   row[3]
+			result['start_year'] =   row[4]
 			result['issues'] = list()
 
 			cur.execute("SELECT id,name,issue_number,image_url,image_hash FROM Issues WHERE volume_id = ?", [ volume_id ] )
@@ -246,12 +329,13 @@ 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 )
 
 		with con:
 			cur = con.cursor()    
+			con.text_factory = unicode					
 			timestamp = datetime.datetime.now()
 			
 			data = { 
@@ -259,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)
@@ -270,14 +355,27 @@ class ComicVineCacher:
 		con = lite.connect( self.db_file )
 		with con:
 			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()
 
+			details = dict()
 			if row[0] is None :
-				return None, None, None, 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

@@ -24,6 +24,10 @@ from pprint import pprint
 import urllib2, urllib 
 import math 
 import re
+import datetime
+import ctversion
+import sys
+from bs4 import BeautifulSoup
 
 try:
 	from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
@@ -43,6 +47,8 @@ import utils
 from settings import ComicTaggerSettings
 from comicvinecacher import ComicVineCacher
 from genericmetadata import GenericMetadata
+from issuestring import IssueString
+
 
 class ComicVineTalkerException(Exception):
 	pass
@@ -55,6 +61,18 @@ class ComicVineTalker(QObject):
 		# key that is registered to comictagger
 		self.api_key = '27431e6787042105bd3e47e169a624521f89f3a4'
 
+		self.log_func = None
+
+	def setLogFunc( self , log_func ):
+		self.log_func = log_func
+				
+	def writeLog( self , text ):
+		if self.log_func is None:
+			#sys.stdout.write(text.encode( errors='replace') )
+			#sys.stdout.flush()
+			print >> sys.stderr, text
+		else:
+			self.log_func( text )
 
 	def testKey( self ):
 	
@@ -72,7 +90,7 @@ class ComicVineTalker(QObject):
 			resp = urllib2.urlopen( url ) 
 			return resp.read()
 		except Exception as e:
-			print e
+			self.writeLog( str(e) )
 			raise ComicVineTalkerException("Network Error!")
 
 	def searchForSeries( self, series_name , callback=None, refresh_cache=False ):
@@ -91,7 +109,8 @@ class ComicVineTalker(QObject):
 		
 		original_series_name = series_name
 	
-		series_name = urllib.quote_plus(str(series_name))
+		series_name = urllib.quote_plus(series_name.encode("utf-8"))
+		#series_name = urllib.quote_plus(unicode(series_name))
 		search_url = "http://api.comicvine.com/search/?api_key=" + self.api_key + "&format=json&resources=volume&query=" + series_name + "&field_list=name,id,start_year,publisher,image,description,count_of_issues&sort=start_year"
 
 		content = self.getUrlContent(search_url) 
@@ -99,7 +118,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' ] ))
+			self.writeLog( "Comic Vine query failed with error:  [{0}]. \n".format( cv_response[ 'error' ] ))
 			return None
 
 		search_results = list()
@@ -111,7 +130,7 @@ class ComicVineTalker(QObject):
 		total_result_count = cv_response['number_of_total_results']
 		
 		if callback is None:
-			print ("Found {0} of {1} results".format( cv_response['number_of_page_results'], cv_response['number_of_total_results']))
+			self.writeLog( "Found {0} of {1} results\n".format( cv_response['number_of_page_results'], cv_response['number_of_total_results']))
 		search_results.extend( cv_response['results'])
 		offset = 0
 		
@@ -121,14 +140,14 @@ class ComicVineTalker(QObject):
 		# see if we need to keep asking for more pages...
 		while ( current_result_count < total_result_count ):
 			if callback is None:
-				print ("getting another page of results {0} of {1}...".format( current_result_count, total_result_count))
+				self.writeLog("getting another page of results {0} of {1}...\n".format( current_result_count, total_result_count))
 			offset += limit
 			content = self.getUrlContent(search_url + "&offset="+str(offset)) 
 		
 			cv_response = json.loads(content)
 		
 			if cv_response[ 'status_code' ] != 1:
-				print ( "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] ))
+				self.writeLog( "Comic Vine query failed with error:  [{0}]. \n".format( cv_response[ 'error' ] ))
 				return None
 			search_results.extend( cv_response['results'])
 			current_result_count += cv_response['number_of_page_results']
@@ -165,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']
@@ -175,13 +194,15 @@ class ComicVineTalker(QObject):
 		return volume_results
 				
 
-	def fetchIssueData( self, series_id, issue_number ):
+	def fetchIssueData( self, series_id, issue_number, settings ):
 
 		volume_results = self.fetchVolumeData( series_id )
 	
 		found = False
-		for record in volume_results['issues']: 
-			if float(record['issue_number']) == float(issue_number):
+		for record in volume_results['issues']:
+			if IssueString(issue_number).asFloat() is None:
+				issue_number = 1
+			if float(record['issue_number']) == IssueString(issue_number).asFloat():
 				found = True
 				break
 			
@@ -191,23 +212,42 @@ 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']
 
 		else:
 			return None
 		
+		# now, map the comicvine data to generic metadata
+		return self.mapCVDataToMetadata( volume_results, issue_results, settings )
+
+	def fetchIssueDataByIssueID( self, issue_id, settings ):
+
+		issue_url = "http://api.comicvine.com/issue/" + str(issue_id) + "/?api_key=" + self.api_key + "&format=json"
+		content = self.getUrlContent(issue_url)
+		cv_response = json.loads(content)
+		if cv_response[ 'status_code' ] != 1:
+			print >> sys.stderr,  "Comic Vine query failed with error:  [{0}]. ".format( cv_response[ 'error' ] )
+			return None
+		
+		issue_results = cv_response['results']
+
+		volume_results = self.fetchVolumeData( issue_results['volume']['id'] )		
+		
+		# now, map the comicvine data to generic metadata
+		md = self.mapCVDataToMetadata( volume_results, issue_results, settings )
+		md.isEmpty = False
+		return md
+		
+	def mapCVDataToMetadata(self, volume_results, issue_results, settings ):
+		
 		# now, map the comicvine data to generic metadata
 		metadata = GenericMetadata()
 		
 		metadata.series = issue_results['volume']['name']
 		
-		# format the issue number string nicely, since it's usually something like "2.00"
-		num_f = float(issue_results['issue_number'])
-		num_s = str( int(math.floor(num_f)) )
-		if math.floor(num_f) != num_f:
-			num_s = str( num_f )
+		num_s = IssueString(issue_results['issue_number']).asString()
 			
 		metadata.issue = num_s
 		metadata.title = issue_results['name']
@@ -216,8 +256,13 @@ class ComicVineTalker(QObject):
 		metadata.year = issue_results['publish_year']
 		#metadata.issueCount = volume_results['count_of_issues']
 		metadata.comments = self.cleanup_html(issue_results['description'])
-
-		metadata.notes   = "Tagged with ComicTagger app using info from Comic Vine." 
+		if settings.use_series_start_as_volume:
+			metadata.volume = volume_results['start_year']
+		
+		metadata.notes   = "Tagged with ComicTagger {0} using info from Comic Vine on {1}.  [Issue ID {2}]".format(
+			ctversion.version,
+			datetime.datetime.now().strftime("%Y-%m-%d %H:%M:%S"),
+			issue_results['id']) 
 		#metadata.notes  += issue_results['site_detail_url']  
 		
 		metadata.webLink = issue_results['site_detail_url']
@@ -227,7 +272,7 @@ class ComicVineTalker(QObject):
 			for role in person['roles']:
 				# can we determine 'primary' from CV??
 				role_name = role['role'].title()
-				metadata.addCredit( person['name'], role['role'].title(), False )
+				metadata.addCredit( person['name'], role['role'].title(), False )			
 
 		character_credits = issue_results['character_credits']
 		character_list = list()
@@ -248,11 +293,12 @@ class ComicVineTalker(QObject):
 		metadata.locations = utils.listToString( location_list )
 	
 		story_arc_credits = issue_results['story_arc_credits']
-		for arc in story_arc_credits: 
-			metadata.storyArc =  arc['name']
-			#just use the first one, if at all
-			break
-	
+		arc_list = []
+		for arc in story_arc_credits:
+			arc_list.append(arc['name'])
+		if len(arc_list) > 0:
+			metadata.storyArc =  utils.listToString(arc_list)
+
 		return metadata
 	
 	def cleanup_html( self, string):
@@ -279,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 ):
 
@@ -317,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)))
@@ -344,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 options 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

@@ -30,10 +30,10 @@ class CreditEditorWindow(QtGui.QDialog):
 	ModeNew = 1
 	
 	
-	def __init__(self, parent, mode, role, name ):
+	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
 		
@@ -64,10 +64,33 @@ class CreditEditorWindow(QtGui.QDialog):
 				self.cbRole.setEditText( role  )
 			else:	
 				self.cbRole.setCurrentIndex( i )
+
+		if primary:
+			self.cbPrimary.setCheckState( QtCore.Qt.Checked )
+			
+		self.cbRole.currentIndexChanged.connect(self.roleChanged)
+		self.cbRole.editTextChanged.connect(self.roleChanged)
+	
+		self.updatePrimaryButton()
+
+	def updatePrimaryButton( self ):
+		enabled =self.currentRoleCanBePrimary()
+		self.cbPrimary.setEnabled( enabled )
+
+	def currentRoleCanBePrimary( self ):
+		role =  self.cbRole.currentText()
+		if str(role).lower() == "writer" or str(role).lower() == "artist":
+			return True
+		else:
+			return False
+		
+	def roleChanged( self, s ):
+		self.updatePrimaryButton()
 				
 	def getCredits( self ):
-		return self.cbRole.currentText(), self.leName.text()
-			
+		primary = self.currentRoleCanBePrimary() and self.cbPrimary.isChecked() 
+		return self.cbRole.currentText(), self.leName.text(), primary
+
 
 	def accept( self ):
 		if self.cbRole.currentText() == "" or self.leName.text() == "":

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="0.9.0-beta"
+version="1.1.1-beta"

comictaggerlib/exportwindow.py

@@ -0,0 +1,65 @@
+"""
+A PyQT4 dialog to confirm and set options for export to zip 
+"""
+
+"""
+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.
+"""
+
+
+from PyQt4 import QtCore, QtGui, uic
+from settings import ComicTaggerSettings
+from settingswindow import SettingsWindow
+from filerenamer import FileRenamer
+import os
+import utils
+
+class ExportConflictOpts:
+	dontCreate = 1
+	overwrite = 2
+	createUnique = 3
+	
+class ExportWindow(QtGui.QDialog):
+		
+	def __init__( self, parent,  settings, msg ):
+		super(ExportWindow, self).__init__(parent)
+		
+		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 )
+		self.cbxAddToList.setCheckState( QtCore.Qt.Checked )
+		self.radioDontCreate.setChecked( True )
+		
+		self.deleteOriginal = False
+		self.addToList = True
+		self.fileConflictBehavior = ExportConflictOpts.dontCreate
+
+	def accept( self ):
+		QtGui.QDialog.accept(self)		
+
+		self.deleteOriginal = self.cbxDeleteOriginal.isChecked()
+		self.addToList = self.cbxAddToList.isChecked()
+		if self.radioDontCreate.isChecked():
+			self.fileConflictBehavior = ExportConflictOpts.dontCreate
+		elif self.radioCreateNew.isChecked():
+			self.fileConflictBehavior = ExportConflictOpts.createUnique
+		#else:
+		#	self.fileConflictBehavior = ExportConflictOpts.overwrite	

comictaggerlib/filenameparser.py

@@ -80,25 +80,56 @@ class FileNameParser:
 		
 		# first, look for multiple "--", this mean's it's formatted differently from most:
 		if "--" in filename:
-			# the pattern seems to be that anything to left of the first "--" is the series name follow
+			# the pattern seems to be that anything to left of the first "--" is the series name followed by issue
 			filename = filename.split("--")[0]
+		elif "___" in filename:
+			# the pattern seems to be that anything to left of the first "__" is the series name followed by issue
+			filename = filename.split("__")[0]
+
+		filename = filename.replace("+", " ")
 			
+		# remove parenthetical phrases
+		filename = re.sub( "\(.*\)", "", filename)
+		filename = re.sub( "\[.*\]", "", filename)
+		
 		# guess based on position
 
 		# replace any name seperators with spaces
 		tmpstr = self.fixSpaces(filename)
 		word_list = tmpstr.split(' ')
 		
+		#before we search, remove any kind of likely "of X" phrase
+		for i in range(0, len(word_list)-2):
+			if ( word_list[i].isdigit() and
+				word_list[i+1] == "of"  and
+				word_list[i+2].isdigit() ):
+				word_list[i+1] ="XXX"
+				word_list[i+2] ="XXX"
+				
+				
+		# first look for the last "#" followed by a digit in the filename. this is almost certainly the issue number
+		#issnum = re.search('#\d+', filename)
+		matchlist = re.findall("#\d+", filename)
+		if len(matchlist) > 0:
+			#get the last item
+			issue = matchlist[ len(matchlist) - 1]
+			issue = issue[1:]
+			found = True
+
+		
 		# assume the last number in the filename that is under 4 digits is the issue number
-		for word in reversed(word_list):			
-			if ( 
-				 (word.isdigit() and len(word) < 4) or
-				 (self.isPointIssue(word))
-				):
-				issue = word
-				found = True
-				#print 'Assuming issue number is ' + str(issue) + ' based on the position.'
-				break
+		if not found:
+			for word in reversed(word_list):
+				if len(word) > 0 and word[0] == "#":
+					word = word[1:]
+				if ( 
+					 (word.isdigit() and len(word) < 4) or
+					 (self.isPointIssue(word))
+					):
+					issue = word
+					found = True
+					#print 'Assuming issue number is ' + str(issue) + ' based on the position.'
+					break
 
 		if not found:
 			# try a regex
@@ -119,33 +150,32 @@ class FileNameParser:
 		# TODO:  we really should pass in the *INDEX* of the issue, that makes 
 		# finding it easier
 		
-		
+		filename = filename.replace("+", " ")
 		tmpstr = self.fixSpaces(filename)
 		
 		#remove pound signs.  this might mess up the series name if there is a# in it.
 		tmpstr = tmpstr.replace("#", " ")
 
 		if issue != "":	
-			# assume that issue substr has at least on space before it
+			# assume that issue substr has at least one space before it
 			issue_str = " " + str(issue)
 			series = tmpstr.split(issue_str)[0]
 		else:
 			# no issue to work off of
 			#!!! TODO we should look for the year, and split from that
-			# and if that doesn't exist, remove parenthetical words
+			# and if that doesn't exist, remove parenthetical phrases
 			series = tmpstr
+			series = re.sub( "\(.*\)", "", tmpstr)
 			
 		volume = ""
 		
 		series = series.rstrip("#")
 			
-		# search for volume number	
-		match = re.search('(?<= [vV])(\d+)\s*$', series)
+		# search for volume number
+		match = re.search('(.+)([vV]|[Vv][oO][Ll]\.?\s?)(\d+)\s*$', series)
 		if match:
-			volume = match.group()
-			series = series.replace(" V"+ volume, " v"+ volume)
-			series = series.split("v"+volume)[0]
-			volume = volume.lstrip("0")
+			series = match.group(1)
+			volume = match.group(3)
 		
 		return series.strip(), volume.strip()
 
@@ -161,7 +191,7 @@ class FileNameParser:
 		return year
 
 	def parseFilename( self, filename ):
- 
+
 		# remove the path
 		filename = os.path.basename(filename)
 
@@ -171,13 +201,20 @@ class FileNameParser:
 		#url decode, just in case
 		filename = unquote(filename)
 
+		# sometimes archives get messed up names from too many decodings
+		# often url encodings will break and leave "_28" and "_29" in place
+		# of "(" and ")"  see if there are a number of these, and replace them
+		if filename.count("_28") > 1 and filename.count("_29") > 1:
+			filename = filename.replace("_28", "(")
+			filename = filename.replace("_29", ")")
+		
 		# ----HACK  
 		# remove the first word that word is a 3 digit number.
 		# some story arcs collection packs do this, but it's ugly
 		# this will probably break something, i.e. "100 bullets"
-		word = filename.split(' ')[0]
-		if len(word) == 3 and word[0] =='0' and word.isdigit():
-			filename = filename[4:]
+		#word = filename.split(' ')[0]
+		#if len(word) == 3 and word[0] =='0' and word.isdigit():
+		#	filename = filename[4:]
 		# ----HACK  -
 					
 		self.issue = self.getIssueNumber(filename)
@@ -190,3 +227,6 @@ class FileNameParser:
 			self.issue = self.issue.lstrip("0")
 			if self.issue == "":
 				self.issue = "0"
+			if self.issue[0] == ".":
+				self.issue = "0" + self.issue
+

comictaggerlib/filerenamer.py

@@ -0,0 +1,138 @@
+"""
+Functions for renaming files based on metadata
+"""
+
+"""
+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
+import re
+import datetime
+from issuestring import IssueString
+
+class FileRenamer:
+	def __init__( self, metadata ):
+		self.setMetadata( metadata )
+		self.setTemplate( "%series% v%volume% #%issue% (of %issuecount%) (%year%)" )
+		self.smart_cleanup = True
+		self.issue_zero_padding = 3
+
+	def setMetadata( self, metadata ):
+		self.metdata = metadata
+
+	def setIssueZeroPadding( self, count ):
+		self.issue_zero_padding = count
+
+	def setSmartCleanup( self, on ):
+		self.smart_cleanup = on
+
+	def setTemplate( self, template ):
+		self.template = template
+		
+	def replaceToken( self, text, value, token ):
+		#helper func
+		def isToken( word ):
+			return (word[0] == "%" and word[-1:] == "%")
+
+		if value is not None:
+			return text.replace( token, unicode(value) )
+		else:
+			if self.smart_cleanup:
+				# smart cleanup means we want to remove anything appended to token if it's empty
+				# (e.g "#%issue%"  or "v%volume%" )
+				# (TODO: This could fail if there is more than one token appended together, I guess)
+				text_list = text.split()
+				
+				#special case for issuecount, remove preceding non-token word, as in "...(of %issuecount%)..."
+				if token == '%issuecount%':
+					for idx,word in enumerate( text_list ):
+						if token in word and not isToken(text_list[idx -1]) :
+							text_list[idx -1] = ""
+							
+				text_list = [ x  for x in text_list if token not in x ]
+				return " ".join( text_list )
+			else:
+				return text.replace( token, "" )
+		
+	def determineName( self, filename, ext=None ):
+
+		md = self.metdata
+		new_name = self.template
+
+		#print u"{0}".format(md)
+		
+		new_name = self.replaceToken( new_name, md.series, '%series%')
+		new_name = self.replaceToken( new_name, md.volume, '%volume%')
+		
+		if md.issue is not None:
+			issue_str = u"{0}".format( IssueString(md.issue).asString(pad=self.issue_zero_padding) ) 
+		else:
+			issue_str = None		
+		new_name = self.replaceToken( new_name, issue_str, '%issue%')
+		
+		new_name = self.replaceToken( new_name, md.issueCount, '%issuecount%')
+		new_name = self.replaceToken( new_name, md.year, '%year%')
+		new_name = self.replaceToken( new_name, md.publisher, '%publisher%')
+		new_name = self.replaceToken( new_name, md.title, '%title%')
+		new_name = self.replaceToken( new_name, md.month, '%month%')
+		month_name = None
+		if md.month is not None:
+			if (type(md.month) == str and md.month.isdigit()) or type(md.month) == int:
+				if int(md.month) in range(1,13):
+					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:
+			
+			# remove empty braces,brackets, parentheses
+			new_name = re.sub("\(\s*[-:]*\s*\)", "", new_name )
+			new_name = re.sub("\[\s*[-:]*\s*\]", "", new_name )
+			new_name = re.sub("\{\s*[-:]*\s*\}", "", new_name )
+
+			# remove remove duplicate -, _,
+			new_name = re.sub("[-_]+\s+", "- ", new_name )
+			new_name = re.sub("(\s-)+", " -", new_name )
+
+			# remove duplicate spaces
+			new_name = u" ".join(new_name.split())
+		
+		if ext is None:
+			ext = os.path.splitext( filename )[1]
+
+		new_name += ext
+		
+		# some tweaks to keep various filesystems happy		
+		new_name = new_name.replace("/", "-")
+		new_name = new_name.replace(":", "-")
+		new_name = new_name.replace("?", "")
+		
+		return new_name
+	
+	

comictaggerlib/fileselectionlist.py

@@ -0,0 +1,404 @@
+# coding=utf-8
+"""
+A PyQt4 widget for managing list of comic archive files
+"""
+
+"""
+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
+import sys
+
+from PyQt4.QtCore import *
+from PyQt4.QtGui import *
+from PyQt4 import uic
+from PyQt4.QtCore import pyqtSignal
+
+from settings import ComicTaggerSettings
+from comicarchive import ComicArchive
+from genericmetadata import GenericMetadata, PageType
+from options import MetaDataStyle
+import utils
+
+class FileTableWidget( QTableWidget ):
+
+	def __init__(self, parent ):
+		super(FileTableWidget, self).__init__(parent)
+		
+		
+		self.setColumnCount(5)
+		self.setHorizontalHeaderLabels (["File", "Folder", "CR", "CBL", ""])
+		self.horizontalHeader().setStretchLastSection( True )
+
+
+class FileTableWidgetItem(QTableWidgetItem):
+   def __lt__(self, other):
+        return (self.data(Qt.UserRole).toBool() <
+                other.data(Qt.UserRole).toBool())
+
+
+class FileInfo(  ):
+	def __init__(self, ca ):
+		self.ca = ca
+
+class FileSelectionList(QWidget):
+
+	selectionChanged = pyqtSignal(QVariant)
+	listCleared = pyqtSignal()
+	
+	fileColNum = 0
+	CRFlagColNum = 1
+	CBLFlagColNum = 2
+	typeColNum = 3
+	readonlyColNum = 4
+	folderColNum = 5
+	dataColNum = fileColNum
+	
+
+	def __init__(self, parent , settings ):
+		super(FileSelectionList, self).__init__(parent)
+
+		uic.loadUi(ComicTaggerSettings.getUIFile('fileselectionlist.ui' ), self)
+		
+		self.settings = settings
+
+		utils.reduceWidgetFontSize( self.twList )
+		
+		self.twList.currentItemChanged.connect( self.currentItemChangedCB )
+		
+		self.currentItem = None
+		self.setContextMenuPolicy(Qt.ActionsContextMenu)
+		self.modifiedFlag = False
+		
+		selectAllAction = QAction("Select All", self)
+		removeAction = QAction("Remove Selected Items", self)
+		self.separator = QAction("",self)
+		self.separator.setSeparator(True)
+		
+		selectAllAction.setShortcut( 'Ctrl+A' )
+		removeAction.setShortcut( 'Ctrl+X' )
+		
+		selectAllAction.triggered.connect(self.selectAll)
+		removeAction.triggered.connect(self.removeSelection)
+
+		self.addAction(selectAllAction)			
+		self.addAction(removeAction)
+		self.addAction(self.separator)
+
+	def addAppAction( self, action ):
+		self.insertAction( None , action )
+	
+	def setModifiedFlag( self, modified ):
+		self.modifiedFlag = modified
+		
+	def selectAll( self ):
+		self.twList.setRangeSelected( QTableWidgetSelectionRange ( 0, 0, self.twList.rowCount()-1, 5 ), True )
+
+	def deselectAll( self ):
+		self.twList.setRangeSelected( QTableWidgetSelectionRange ( 0, 0, self.twList.rowCount()-1, 5 ), False )
+
+	def removeArchiveList( self, ca_list ):
+		self.twList.setSortingEnabled(False)
+		for ca in ca_list:
+			for row in range(self.twList.rowCount()):
+				row_ca = self.getArchiveByRow( row )
+				if row_ca == ca:
+					self.twList.removeRow(row)
+					break
+		self.twList.setSortingEnabled(True)
+				
+	def getArchiveByRow( self, row):
+		fi = self.twList.item(row, FileSelectionList.dataColNum).data( Qt.UserRole ).toPyObject()
+		return fi.ca
+	
+	def getCurrentArchive( self ):
+		return self.getArchiveByRow( self.twList.currentRow() )
+	
+	def removeSelection( self ):
+		row_list = []
+		for item in self.twList.selectedItems():
+			if item.column() == 0:
+			    row_list.append(item.row())
+
+		if len(row_list) == 0:
+			return
+		
+		if self.twList.currentRow() in row_list:
+			if not self.modifiedFlagVerification( "Remove Archive",
+					"If you close this archive, data in the form will be lost.  Are you sure?"):
+				return
+		
+		row_list.sort()
+		row_list.reverse()
+
+		self.twList.currentItemChanged.disconnect( self.currentItemChangedCB )
+		self.twList.setSortingEnabled(False)
+
+		for i in row_list:
+			self.twList.removeRow(i)
+			
+		self.twList.setSortingEnabled(True)
+		self.twList.currentItemChanged.connect( self.currentItemChangedCB )
+		
+		if self.twList.rowCount() > 0:
+			self.twList.selectRow(0)
+		else:
+			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))
+			
+		# 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.ApplicationModal)		
+		progdialog.show()
+		
+		firstAdded = None
+		self.twList.setSortingEnabled(False)
+		for idx,f in enumerate(filelist):
+			QCoreApplication.processEvents()
+			if progdialog.wasCanceled():
+				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:
+				firstAdded = row
+			
+		progdialog.close()
+		if firstAdded is not None:
+			self.twList.selectRow(firstAdded)
+			
+		self.twList.setSortingEnabled(True)
+		
+		# Adjust column size
+		self.twList.resizeColumnsToContents()
+		self.twList.setColumnWidth(FileSelectionList.CRFlagColNum, 35) 
+		self.twList.setColumnWidth(FileSelectionList.CBLFlagColNum, 35)
+		self.twList.setColumnWidth(FileSelectionList.readonlyColNum, 35)
+		self.twList.setColumnWidth(FileSelectionList.typeColNum, 45)
+		if self.twList.columnWidth(FileSelectionList.fileColNum) > 250:
+			self.twList.setColumnWidth(FileSelectionList.fileColNum, 250) 
+		if self.twList.columnWidth(FileSelectionList.folderColNum ) > 200:
+			self.twList.setColumnWidth(FileSelectionList.folderColNum, 200) 
+
+	def isListDupe( self, path ):
+		r = 0
+		while r < self.twList.rowCount():
+			ca = self.getArchiveByRow( r )
+			if ca.path == path:
+				return True
+			r = r + 1
+			
+		return False		
+		
+	def addPathItem( self, path):
+		path = unicode( path )
+		path = os.path.abspath( path ) 
+		#print "processing", path
+		
+		if self.isListDupe(path):
+			return None
+		
+		ca = ComicArchive( path )
+		if self.settings.rar_exe_path != "":
+			ca.setExternalRarProgram( self.settings.rar_exe_path )
+			
+		if ca.seemsToBeAComicArchive() :
+			
+			row = self.twList.rowCount()
+			self.twList.insertRow( row )
+			
+			fi = FileInfo( ca )
+			
+			filename_item = QTableWidgetItem()
+			folder_item =   QTableWidgetItem()
+			cix_item =      FileTableWidgetItem()
+			cbi_item =      FileTableWidgetItem()
+			readonly_item = FileTableWidgetItem()
+			type_item =     QTableWidgetItem()
+	
+			filename_item.setFlags(Qt.ItemIsSelectable| Qt.ItemIsEnabled)
+			filename_item.setData( Qt.UserRole , fi )
+			self.twList.setItem(row, FileSelectionList.fileColNum, filename_item)
+					
+			folder_item.setFlags(Qt.ItemIsSelectable| Qt.ItemIsEnabled)
+			self.twList.setItem(row, FileSelectionList.folderColNum, folder_item)
+
+			type_item.setFlags(Qt.ItemIsSelectable| Qt.ItemIsEnabled)
+			self.twList.setItem(row, FileSelectionList.typeColNum, type_item)
+
+			cix_item.setFlags(Qt.ItemIsSelectable| Qt.ItemIsEnabled)
+			cix_item.setTextAlignment(Qt.AlignHCenter)
+			self.twList.setItem(row, FileSelectionList.CRFlagColNum, cix_item)
+
+			cbi_item.setFlags(Qt.ItemIsSelectable| Qt.ItemIsEnabled)
+			cbi_item.setTextAlignment(Qt.AlignHCenter)
+			self.twList.setItem(row, FileSelectionList.CBLFlagColNum, cbi_item)
+
+			readonly_item.setFlags(Qt.ItemIsSelectable| Qt.ItemIsEnabled)
+			readonly_item.setTextAlignment(Qt.AlignHCenter)
+			self.twList.setItem(row, FileSelectionList.readonlyColNum, readonly_item)
+			
+			self.updateRow( row )
+			
+			return row
+
+	def updateRow( self, row ):
+		fi = self.twList.item( row, FileSelectionList.dataColNum ).data( Qt.UserRole ).toPyObject()
+
+		filename_item =  self.twList.item( row, FileSelectionList.fileColNum )
+		folder_item =    self.twList.item( row, FileSelectionList.folderColNum )
+		cix_item =       self.twList.item( row, FileSelectionList.CRFlagColNum )
+		cbi_item =       self.twList.item( row, FileSelectionList.CBLFlagColNum )
+		type_item =      self.twList.item( row, FileSelectionList.typeColNum )
+		readonly_item =  self.twList.item( row, FileSelectionList.readonlyColNum )
+
+		item_text = os.path.split(fi.ca.path)[0]
+		folder_item.setText( item_text )
+		folder_item.setData( Qt.ToolTipRole, item_text )
+
+		item_text = os.path.split(fi.ca.path)[1]
+		filename_item.setText( item_text )
+		filename_item.setData( Qt.ToolTipRole, item_text )
+
+		if fi.ca.isZip():
+			item_text = "ZIP"     
+		elif fi.ca.isRar():
+			item_text = "RAR"     
+		else:
+			item_text = ""     
+		type_item.setText( item_text )
+		type_item.setData( Qt.ToolTipRole, item_text )
+
+
+		if fi.ca.hasCIX():
+			cix_item.setCheckState(Qt.Checked)       
+			cix_item.setData(Qt.UserRole, True)
+		else:
+			cix_item.setData(Qt.UserRole, False)
+			cix_item.setCheckState(Qt.Unchecked)       
+
+		if fi.ca.hasCBI():
+			cbi_item.setCheckState(Qt.Checked)       
+			cbi_item.setData(Qt.UserRole, True)
+		else:
+			cbi_item.setData(Qt.UserRole, False)
+			cbi_item.setCheckState(Qt.Unchecked)
+
+		if not fi.ca.isWritable():
+			readonly_item.setCheckState(Qt.Checked)       
+			readonly_item.setData(Qt.UserRole, True)
+		else:
+			readonly_item.setData(Qt.UserRole, False)
+			readonly_item.setCheckState(Qt.Unchecked)
+
+			
+		# Reading these will force them into the ComicArchive's cache
+		fi.ca.readCIX()
+		fi.ca.hasCBI()
+
+	def getSelectedArchiveList( self ):
+		ca_list = []
+		for r in range( self.twList.rowCount() ):
+			item = self.twList.item(r, FileSelectionList.dataColNum)
+			if self.twList.isItemSelected(item):
+				fi = item.data( Qt.UserRole ).toPyObject()
+				ca_list.append(fi.ca)
+
+		return ca_list
+	
+	def updateCurrentRow( self ):
+		self.updateRow( self.twList.currentRow() )
+
+	def updateSelectedRows( self ):
+		self.twList.setSortingEnabled(False)
+		for r in range( self.twList.rowCount() ):
+			item = self.twList.item(r, FileSelectionList.dataColNum)
+			if self.twList.isItemSelected(item):
+				self.updateRow( r )
+		self.twList.setSortingEnabled(True)
+			
+	def currentItemChangedCB( self, curr, prev ):
+
+		new_idx = curr.row()
+		old_idx = -1
+		if prev is not None:
+			old_idx = prev.row()
+		#print "old {0} new {1}".format(old_idx, new_idx)
+		
+		if old_idx == new_idx:
+			return
+			
+		# don't allow change if modified
+		if prev is not None and new_idx != old_idx:
+			if not self.modifiedFlagVerification( "Change Archive",
+						"If you change archives now, data in the form will be lost.  Are you sure?"):
+				self.twList.currentItemChanged.disconnect( self.currentItemChangedCB )
+				self.twList.setCurrentItem( prev )
+				self.twList.currentItemChanged.connect( self.currentItemChangedCB )
+				# Need to defer this revert selection, for some reason
+				QTimer.singleShot(1, self.revertSelection)
+				return
+
+		fi = self.twList.item( new_idx, FileSelectionList.dataColNum ).data( Qt.UserRole ).toPyObject()		
+		self.selectionChanged.emit( QVariant(fi))
+		
+	def revertSelection( self ):
+		self.twList.selectRow( self.twList.currentRow() )
+		
+	
+	def modifiedFlagVerification( self, title, desc):
+		if self.modifiedFlag:
+			reply = QMessageBox.question(self, 
+			     self.tr(title), 
+			     self.tr(desc),
+			     QMessageBox.Yes, QMessageBox.No )
+			     
+			if reply != QMessageBox.Yes:
+				return False
+		return True
+		
+		
+# Attempt to use a special checkbox widget in the cell.
+# Couldn't figure out how to disable it with "enabled" colors
+#w = QWidget()
+#cb = QCheckBox(w)
+#cb.setCheckState(Qt.Checked)
+#layout = QHBoxLayout()
+#layout.addWidget( cb )
+#layout.setAlignment(Qt.AlignHCenter)
+#layout.setMargin(2)
+#w.setLayout(layout)
+#self.twList.setCellWidget( row, 2, w )

comictaggerlib/genericmetadata.py

@@ -32,7 +32,6 @@ class PageType:
 	Roundup      = "Roundup"
 	Story        = "Story"
 	Advertisment = "Advertisment"
-	Story        = "Story"
 	Editorial    = "Editorial"
 	Letters      = "Letters"
 	Preview      = "Preview"
@@ -93,11 +92,19 @@ class GenericMetadata:
 		self.characters          = None
 		self.teams               = None
 		self.locations           = None
-	
+
 		self.credits            = list()		
 		self.tags               = list()
 		self.pages              = list()
 
+		# Some CoMet-only items
+		self.price               = None
+		self.isVersionOf         = None
+		self.rights              = None
+		self.identifier          = None
+		self.lastMark            = None
+		self.coverImage	         = None
+
 	def overlay( self, new_md ):
 		# Overlay a metadata object on this one
 		# that is, when the new object has non-None
@@ -125,24 +132,30 @@ class GenericMetadata:
 		assign( "genre",             new_md.genre )
 		assign( "language",          new_md.language )
 		assign( "country",           new_md.country )
-		assign( "alternateSeries",   new_md.criticalRating )
+		assign( "criticalRating",    new_md.criticalRating )
 		assign( "alternateSeries",   new_md.alternateSeries )
 		assign( "alternateNumber",   new_md.alternateNumber )
 		assign( "alternateCount",    new_md.alternateCount )
 		assign( "imprint",           new_md.imprint )
-		assign( "webLink",               new_md.webLink )
+		assign( "webLink",           new_md.webLink )
 		assign( "format",            new_md.format )
 		assign( "manga",             new_md.manga )
 		assign( "blackAndWhite",     new_md.blackAndWhite )
 		assign( "maturityRating",    new_md.maturityRating )
-		assign( "scanInfo",          new_md.scanInfo )
-		assign( "scanInfo",          new_md.scanInfo )
+		assign( "storyArc",          new_md.storyArc )
+		assign( "seriesGroup",       new_md.seriesGroup )
 		assign( "scanInfo",          new_md.scanInfo )
 		assign( "characters",        new_md.characters )
 		assign( "teams",             new_md.teams )
 		assign( "locations",         new_md.locations )
 		assign( "comments",          new_md.comments )
 		assign( "notes",             new_md.notes )
+
+		assign( "price",             new_md.price )
+		assign( "isVersionOf",       new_md.isVersionOf )
+		assign( "rights",            new_md.rights )
+		assign( "identifier",        new_md.identifier )
+		assign( "lastMark",          new_md.lastMark )
 		
 		self.overlayCredits( new_md.credits )
 		# TODO
@@ -153,7 +166,8 @@ class GenericMetadata:
 		# For now, go the easy route, where any overlay
 		# value wipes out the whole list
 		if len(new_md.tags) > 0:
-			assign( "tags",              new_md.tags )
+			assign( "tags",  new_md.tags )
+			
 		if len(new_md.pages) > 0:	
 			assign( "pages",           new_md.pages )
 
@@ -173,7 +187,35 @@ class GenericMetadata:
 			# otherwise, add it!
 			else:
 				self.addCredit( c['person'], c['role'], primary )
-		
+	
+	def setDefaultPageList( self, count ):
+		# generate a default page list, with the first page marked as the cover
+		for i in range(count):
+			page_dict = dict()
+			page_dict['Image'] = str(i)
+			if i == 0:
+				page_dict['Type'] = PageType.FrontCover
+			self.pages.append( page_dict )
+
+	def getArchivePageIndex( self, pagenum ):
+		# convert the displayed page number to the page index of the file in the archive
+		if pagenum < len( self.pages ):
+			return int( self.pages[pagenum]['Image'] )
+		else:
+			return 0
+	
+	def getCoverPageIndexList( self ):
+		# return a list of archive page indices of cover pages
+		coverlist = []
+		for p in self.pages:
+			if 'Type' in p and p['Type'] == PageType.FrontCover:
+				coverlist.append( int(p['Image']))
+				
+		if len(coverlist) == 0:
+			coverlist.append( 0 )
+			
+		return coverlist
+	
 	def addCredit( self, person, role, primary = False ):
 		
 		credit = dict()
@@ -229,6 +271,13 @@ class GenericMetadata:
 		add_attr_string( "webLink" )
 		add_attr_string( "format" )
 		add_attr_string( "manga" )
+
+		add_attr_string( "price" )
+		add_attr_string( "isVersionOf" )
+		add_attr_string( "rights" )
+		add_attr_string( "identifier" )
+		add_attr_string( "lastMark" )
+		
 		if self.blackAndWhite:
 			add_attr_string( "blackAndWhite" )
 		add_attr_string( "maturityRating" )
@@ -246,7 +295,7 @@ class GenericMetadata:
 		for c in self.credits:
 			primary = ""
 			if c.has_key('primary') and c['primary']: 
-				primary == " [P]"
+				primary = " [P]"
 			add_string( "credit",  c['role']+": "+c['person'] + primary)
 			
 		# find the longest field name

comictaggerlib/imagehasher.py

@@ -1,5 +1,24 @@
+"""
+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
 
 try: 
 	import Image
@@ -17,14 +36,25 @@ class ImageHasher(object):
 
 		if path is None and data is None:
 			raise IOError
-		elif path is not None:
-			self.image = Image.open(path)
 		else:
-			self.image = Image.open(StringIO.StringIO(data))
-			
+			try:
+				if path is not None:
+					self.image = Image.open(path)
+				else:
+					self.image = Image.open(StringIO.StringIO(data))
+			except:
+				print "Image data seems corrupted!"
+				# just generate a bogus image
+				self.image = Image.new( "L", (1,1))
 
 	def average_hash(self):
-		image = self.image.resize((self.width, self.height), Image.ANTIALIAS).convert("L")
+		try:
+			image = self.image.resize((self.width, self.height), Image.ANTIALIAS).convert("L")
+		except Exception as e:
+			sys.exc_clear()
+			print "average_hash error:", e
+			return long(0)
+		
 		pixels = list(image.getdata())
 		avg = sum(pixels) / len(pixels)
 		

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

@@ -34,9 +34,15 @@ from genericmetadata import GenericMetadata
 from comicvinetalker import ComicVineTalker, ComicVineTalkerException
 from imagehasher import ImageHasher
 from imagefetcher import ImageFetcher, ImageFetcherException
+from issuestring import IssueString
 
 import utils 
 
+class IssueIdentifierNetworkError(Exception):
+	pass
+class IssueIdentifierCancelled(Exception):
+	pass
+
 class IssueIdentifier:
 	
 	ResultNoMatches                         = 0
@@ -53,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
@@ -65,14 +74,15 @@ class IssueIdentifier:
 		self.length_delta_thresh = settings.id_length_delta_thresh
 
 		# used to eliminate unlikely publishers
-		#self.publisher_blacklist = [ 'panini comics', 'abril', 'scholastic book services' ]
 		self.publisher_blacklist = [ s.strip().lower() for s in settings.id_publisher_blacklist.split(',') ]
 		
 		self.additional_metadata = GenericMetadata()
 		self.output_function = IssueIdentifier.defaultWriteOutput
 		self.callback = None
+		self.coverUrlCallback = None
 		self.search_result = self.ResultNoMatches
-	
+		self.cover_page_index = 0
+		
 	def setScoreMinThreshold( self, thresh ):
 		self.min_score_thresh = thresh
 
@@ -83,7 +93,7 @@ class IssueIdentifier:
 		self.additional_metadata = md
 
 	def setNameLengthDeltaThreshold( self, delta ):
-		self.length_delta_thresh = md
+		self.length_delta_thresh = delta
 
 	def setPublisherBlackList( self, blacklist ):
 		self.publisher_blacklist = blacklist
@@ -95,7 +105,7 @@ class IssueIdentifier:
 	def setOutputFunction( self, func ):
 		self.output_function = func
 		pass
-	
+
 	def calculateHash( self, image_data ):
 		if self.image_hasher == '3':
 			return ImageHasher( data=image_data ).dct_average_hash() 
@@ -105,17 +115,25 @@ class IssueIdentifier:
 			return ImageHasher( data=image_data ).average_hash() 
 	
 	def getAspectRatio( self, image_data ):
+		try:
+			im = Image.open(StringIO.StringIO(image_data))
+			w,h = im.size
+			return float(h)/float(w)
+		except:
+			return 1.5
 		
-		im = Image.open(StringIO.StringIO(image_data))
-		w,h = im.size
-		return float(h)/float(w)
-
 	def cropCover( self, image_data ):
 		
 		im = Image.open(StringIO.StringIO(image_data))
 		w,h = im.size
-		
-		cropped_im = im.crop( (int(w/2), 0, w, h) )
+
+		try:
+			cropped_im = im.crop( (int(w/2), 0, w, h) )
+		except Exception as e:
+			sys.exc_clear()
+			print "cropCover() error:", e
+			return None
+
 		output = StringIO.StringIO()
 		cropped_im.save(output, format="JPEG")
 		cropped_image_data = output.getvalue()
@@ -126,6 +144,9 @@ class IssueIdentifier:
 		
 	def setProgressCallback( self, cb_func ):
 		self.callback = cb_func
+
+	def setCoverURLCallback( self, cb_func ):
+		self.coverUrlCallback = cb_func
 		
 	def getSearchKeys( self ):
 	
@@ -194,7 +215,7 @@ class IssueIdentifier:
 
 	@staticmethod
 	def defaultWriteOutput( text ):
-		sys.stdout.write(text)
+		sys.stdout.write( text )
 		sys.stdout.flush()
 		
 	def log_msg( self, msg , newline=True ):
@@ -202,6 +223,104 @@ class IssueIdentifier:
 		if newline:
 			self.output_function("\n")
 	
+	def getIssueCoverMatchScore( self, comicVine, issue_id, localCoverHashList, useRemoteAlternates = False , use_log=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 use_log and useRemoteAlternates:
+			self.log_msg( "[{0} alt. covers]".format(len(remote_cover_list)-1), False )
+		if use_log:
+			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 use_log:
+					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 use_log:
+			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
@@ -217,7 +336,7 @@ class IssueIdentifier:
 			self.log_msg( "Sorry, but "+ opts.filename + "  is not a comic archive!")
 			return self.match_list
 		
-		cover_image_data = ca.getCoverPage()
+		cover_image_data = ca.getPage( self.cover_page_index )
 		cover_hash = self.calculateHash( cover_image_data )
 
 		#check the apect ratio
@@ -227,9 +346,10 @@ class IssueIdentifier:
 		aspect_ratio = self.getAspectRatio( cover_image_data )
 		if aspect_ratio < 1.0:
 			right_side_image_data = self.cropCover( cover_image_data )
-			narrow_cover_hash = self.calculateHash( right_side_image_data )
-			print "narrow_cover_hash", narrow_cover_hash
-
+			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) )
 
 		keys = self.getSearchKeys()
@@ -248,12 +368,13 @@ class IssueIdentifier:
 		if keys['month'] is not None:
 			self.log_msg( "\tMonth : " + str(keys['month']) )
 		
-		self.log_msg("Publisher Blacklist: " + str(self.publisher_blacklist))
+		#self.log_msg("Publisher Blacklist: " + str(self.publisher_blacklist))
 		
 		comicVine = ComicVineTalker( )
+		comicVine.setLogFunc( self.output_function )
 
 		#self.log_msg( ( "Searching for " + keys['series'] + "...")
-		self.log_msg( "Searching for  {0} #{1} ...".format( keys['series'], keys['issue_number']) )
+		self.log_msg( u"Searching for  {0} #{1} ...".format( keys['series'], keys['issue_number']) )
 		try:
 			cv_search_results = comicVine.searchForSeries( keys['series'] )
 		except ComicVineTalkerException:
@@ -264,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:
@@ -273,7 +394,7 @@ class IssueIdentifier:
 			date_approved = True
 			
 			# remove any series that starts after the issue year
-			if keys['year'] is not None and keys['year'].isdigit():
+			if keys['year'] is not None and str(keys['year']).isdigit():
 				if int(keys['year']) < item['start_year']:
 					date_approved = False
 					
@@ -290,35 +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( "Fetching info for  ID: {0} {1} ({2}) ...".format(
+			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'] )
@@ -328,67 +447,72 @@ class IssueIdentifier:
 			
 			issue_list = cv_series_results['issues']
 			for issue in issue_list:
+				num_s = IssueString(issue['issue_number']).asString()
 				
-				# format the issue number string nicely, since it's usually something like "2.00"
-				num_f = float(issue['issue_number'])
-				num_s = str( int(math.floor(num_f)) )
-				if math.floor(num_f) != num_f:
-					num_s = str( num_f )			
-
 				# 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
-
-					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'] = "{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:
 			self.log_msg( ":-(  no matches!" )
@@ -403,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):
@@ -417,57 +541,89 @@ 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(5, 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 d={0} on page {1}!".format(distance, i+1) )
-						found = True
-						break
-					elif distance < self.min_score_thresh:
-						self.log_msg( "Found a good match d={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.  Bummer" )
-					self.search_result = self.ResultFoundMatchButBadCoverScore
 
-			print_match(self.match_list[0])
-			return self.match_list
-
-		elif best_score > self.min_score_thresh and len(self.match_list) > 1:
-			self.log_msg( "No good image matches!  Need to use other info..." )
-			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:
 				self.match_list.remove(item)
 
 		if len(self.match_list) == 1:
+			self.log_msg( u"--------------------------------------------------")
 			print_match(self.match_list[0])
+			self.log_msg( u"--------------------------------------------------")
 			self.search_result = self.ResultOneGoodMatch
 			
 		elif len(self.match_list) == 0:
+			self.log_msg( u"--------------------------------------------------")
 			self.log_msg( "No matches found :(" )
+			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"--------------------------------------------------")
 			for item in self.match_list:
 				print_match(item)
+			self.log_msg( u"--------------------------------------------------")
 
 		return self.match_list
 

comictaggerlib/issueselectionwindow.py

@@ -28,6 +28,9 @@ from PyQt4.QtNetwork import QNetworkAccessManager, QNetworkRequest
 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):
 	
@@ -36,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
@@ -89,17 +103,19 @@ class IssueSelectionWindow(QtGui.QDialog):
 			
 			item_text = record['issue_number']  
 			item = QtGui.QTableWidgetItem(item_text)			
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setData( QtCore.Qt.UserRole ,record['id'])
 			item.setData(QtCore.Qt.DisplayRole, float(item_text))
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 0, item)
 			
-			item_text = u"{0}".format(record['name'])  
+			item_text = record['name']
 			item = QtGui.QTableWidgetItem(item_text)			
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 1, item)
 			
-			if float(record['issue_number']) == float(self.issue_number):
+			if IssueString(record['issue_number']).asString() == IssueString(self.issue_number).asString():
 				self.initial_id = record['id']
 			
 			row += 1
@@ -118,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/issuestring.py

@@ -0,0 +1,101 @@
+"""
+Class for handling the odd permutations of an 'issue number' that the comics industry throws at us
+
+e.g.:
+
+"12"
+"12.1"
+"0"
+"-1"
+"5AU"
+
+"""
+
+"""
+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 utils
+import math
+import re
+
+class IssueString:
+	def __init__(self, text):
+	
+		if text is None:
+			self.num = None
+			self.suffix = ""
+			return
+			
+		self.text = str(text)
+		#strip out non float-y stuff
+		tmp_num_str = re.sub('[^0-9.-]',"", self.text )
+
+		if tmp_num_str == "":
+			self.num = None
+			self.suffix = self.text
+			
+		else:
+			if tmp_num_str.count(".") > 1:
+				#make sure it's a valid float or int.
+				parts = tmp_num_str.split('.')
+				self.num = float( parts[0] + '.' + parts[1] )
+			else:	
+				self.num = float( tmp_num_str )
+				
+			self.suffix = ""		
+			parts = self.text.split(tmp_num_str)
+			if len( parts ) > 1 :
+				self.suffix = parts[1]
+
+	def asString( self, pad = 0 ):
+		#return the float, left side zero-padded, with suffix attached
+		if self.num is None:
+			return self.suffix
+		
+		negative = self.num < 0
+
+		num_f = abs(self.num)
+			
+		num_int = int( num_f )
+		num_s = str( num_int ) 
+		if float( num_int ) != num_f:
+			num_s = str( num_f )
+			
+		num_s += self.suffix
+		
+		# create padding
+		padding = ""
+		l = len( str(num_int))
+		if l < pad :
+			padding = "0" * (pad - l)
+		
+		num_s = padding + num_s
+		if negative:
+			num_s = "-" + num_s
+
+		return num_s
+	
+	def asFloat( self ):
+		#return the float, with no suffix
+		return self.num
+	
+	def asInt( self ):
+		#return the int version of the float
+		if self.num is None:
+			return None
+		return  int( self.num )
+	
+	

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,90 @@
+"""
+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 locale
+import codecs
+
+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():
+	# 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)
+	sys.stderr = codecs.getwriter(preferred_encoding)(sys.stderr)
+
+	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 >> 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 options 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:
@@ -59,35 +88,47 @@ 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:
 				item_text = u"Unknown"
 			item = QtGui.QTableWidgetItem(item_text)
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 1, item)
 			
-			item_text = ""
+			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 ):
@@ -99,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

@@ -23,6 +23,7 @@ import getopt
 import platform
 import os
 
+import ctversion
 from genericmetadata import GenericMetadata
 
 class Enum(set):
@@ -34,7 +35,8 @@ class Enum(set):
 class MetaDataStyle:
 	CBI = 0
 	CIX = 1
-	name = [ 'ComicBookLover', 'ComicRack' ]
+	COMET = 2
+	name = [ 'ComicBookLover', 'ComicRack', 'CoMet' ]
 
 
 class Options:
@@ -50,17 +52,24 @@ If no options are given, {0} will run in windowed mode
       --raw                  With -p, will print out the raw tag block(s)
                              from the file
   -d, --delete               Deletes the tag block of specified type (via -t)
+  -c, --copy=SOURCE          Copy the specified source tag block to destination style
+                             specified via via -t (potentially lossy operation)
   -s, --save                 Save out tags as specified type (via -t)
                              Must specify also at least -o, -p, or -m
+      --nooverwrite          Don't modify tag block if it already exists ( relevent for -s or -c )  
   -n, --dryrun               Don't actually modify file (only relevent for -d, -s, or -r)
-  -t, --type=TYPE            Specify TYPE as either "CR" or "CBL", (as either 
-                             ComicRack or ComicBookLover style tags, respectivly)
+  -t, --type=TYPE            Specify TYPE as either "CR", "CBL", or "COMET" (as either 
+                             ComicRack, ComicBookLover, or CoMet style tags, respectivly)
   -f, --parsefilename        Parse the filename to get some info, specifically
                              series name, issue number, volume, and publication 
                              year
+  -i, --interactive          Interactively query the user when there are multiple matches for
+                             an online search
+      --nosummary            Suppress the default summary after a save operation
   -o, --online               Search online and attempt to identify file using 
                              existing metadata and images in archive. May be used
                              in conjuntion with -f and -m
+      --id=ID                Use the issue ID when searching online.  Overrides all other metadata
   -m, --metadata=LIST        Explicity define, as a list, some tags to be used                           
                                 e.g. "series=Plastic Man , publisher=Quality Comics"
                                      "series=Kickers^, Inc., issue=1, year=1986"
@@ -69,10 +78,18 @@ 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)	  
   -v, --verbose              Be noisy when doing what it does                            
-  -h, --help                 Display this message                            
-		"""
+      --terse                Don't say much (for print mode)                            
+      --version              Display version                            
+  -h, --help                 Display this message
+  
+For more help visit the wiki at: http://code.google.com/p/comictagger/
+	"""
 
 
 	def __init__(self):
@@ -80,23 +97,35 @@ If no options are given, {0} will run in windowed mode
 		self.no_gui = False
 		self.filename = None  
 		self.verbose = False
+		self.terse = False
 		self.metadata = None
 		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
 		self.save_tags = False
 		self.parse_filename = False
+		self.show_save_summary = True
 		self.raw = False
 		self.rename_file = False
+		self.no_overwrite = False
+		self.interactive = False
+		self.issue_id = None
 		self.file_list = []
 		
-	def display_help_and_quit( self, msg, code ):
+	def display_msg_and_quit( self, msg, code, show_help=False ):
 		appname = os.path.basename(sys.argv[0])
 		if msg is not None:
 			print( msg )
-		print self.help_text.format(appname)
+		if show_help:
+			print self.help_text.format(appname)
+		else:
+			print "For more help, run with '--help'"
 		sys.exit(code)
 	
 	def parseMetadataFromString( self, mdstr ):
@@ -159,23 +188,37 @@ If no options are given, {0} will run in windowed mode
 		# parse command line options
 		try:
 			opts, args = getopt.getopt( input_args, 
-			           "hpdt:fm:vonsr", 
-			           [ "help", "print", "delete", "type=", "parsefilename", "metadata=", "verbose",
-						"online", "dryrun", "save", "rename" , "raw", "noabort" ])
-			           
+			           "hpdt:fm:vonsrc:ie", 
+			           [ "help", "print", "delete", "type=", "copy=", "parsefilename", "metadata=", "verbose",
+			            "online", "dryrun", "save", "rename" , "raw", "noabort", "terse", "nooverwrite",
+			            "interactive", "nosummary", "version", "id=" 
+			            "export-to-zip", "delete-rar", "abort-on-conflict" ] )
+
 		except getopt.GetoptError as err:
-			self.display_help_and_quit( str(err), 2 )
-			
+			self.display_msg_and_quit( str(err), 2 )
+		
 		# process options
 		for o, a in opts:
 			if o in ("-h", "--help"):
-				self.display_help_and_quit( None, 0 )
+				self.display_msg_and_quit( None, 0, show_help=True )
 			if o in ("-v", "--verbose"):
 				self.verbose = True
 			if o in ("-p", "--print"):
 				self.print_tags = True
 			if o in ("-d", "--delete"):
 				self.delete_tags = True
+			if o in ("-i", "--interactive"):
+				self.interactive = True
+			if o in ("-c", "--copy"):
+				self.copy_tags = True
+				if a.lower() == "cr":
+					self.copy_source = MetaDataStyle.CIX
+				elif a.lower() == "cbl":
+					self.copy_source = MetaDataStyle.CBI
+				elif a.lower() == "comet":
+					self.copy_source = MetaDataStyle.COMET
+				else:
+					self.display_msg_and_quit( "Invalid copy tag source type", 1 )
 			if o in ("-o", "--online"):
 				self.search_online = True
 			if o in ("-n", "--dryrun"):
@@ -186,45 +229,78 @@ 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 in ("--raw"):
+			if o == "--id":
+				self.issue_id = a
+			if o == "--raw":
 				self.raw = True
-			if o in ("--noabort"):
+			if o  == "--noabort":
 				self.abortOnLowConfidence = False
+			if o == "--terse":
+				self.terse = True
+			if o == "--nosummary":
+				self.show_save_summary = False
+			if o  == "--nooverwrite":
+				self.no_overwrite = True
+			if o  == "--version":
+				print "ComicTagger {0}:  Copyright (c) 2012-2013 Anthony Beville".format(ctversion.version)
+				print "Distributed under Apache License 2.0 (http://www.apache.org/licenses/LICENSE-2.0)"	
+				sys.exit(0)
 			if o in ("-t", "--type"):
 				if a.lower() == "cr":
 					self.data_style = MetaDataStyle.CIX
 				elif a.lower() == "cbl":
 					self.data_style = MetaDataStyle.CBI
+				elif a.lower() == "comet":
+					self.data_style = MetaDataStyle.COMET
 				else:
-					self.display_help_and_quit( "Invalid tag type", 1 )
+					self.display_msg_and_quit( "Invalid tag type", 1 )
 			
-		if self.print_tags or self.delete_tags or self.save_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.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_help_and_quit( "Must choose only one action of print, delete, save, or rename", 1 )
+			self.display_msg_and_quit( "Must choose only one action of print, delete, save, copy, rename, or export", 1 )
 		
 		if len(args) > 0:
-			self.filename = args[0]
-			self.file_list = args
+			if platform.system() == "Windows":
+				# no globbing on windows shell, so do it for them
+				import glob
+				self.file_list = []
+				for item in args:
+					self.file_list.extend(glob.glob(item))
+				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_help_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_help_and_quit( "Please specify the type to delete with -t", 1 )
+			self.display_msg_and_quit( "Please specify the type to delete with -t", 1 )
 			
 		if self.save_tags and self.data_style is None:
-			self.display_help_and_quit( "Please specify the type to save with -t", 1 )
+			self.display_msg_and_quit( "Please specify the type to save with -t", 1 )
+
+		if self.copy_tags and self.data_style is None:
+			self.display_msg_and_quit( "Please specify the type to copy to with -t", 1 )
 			
-		if self.rename_file and self.data_style is None:
-			self.display_help_and_quit( "Please specify the type to use for renaming with -t", 1 )
+		#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 )
 		

comictaggerlib/pagebrowser.py

@@ -18,25 +18,42 @@ 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):
+	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 )
@@ -45,71 +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 ):
-		image_data = self.comic_archive.getPage( self.current_page_num )
-
-		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

@@ -0,0 +1,273 @@
+"""
+A PyQt4 widget for editing the page list info
+"""
+
+"""
+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 options import MetaDataStyle
+from pageloader import PageLoader
+from coverimagewidget import CoverImageWidget
+
+
+def itemMoveEvents( widget ):
+
+	class Filter(QObject):
+	
+		mysignal = pyqtSignal( str )
+		
+		def eventFilter(self, obj, event):
+		
+			if obj == widget:
+				#print event.type()
+				if event.type() == QEvent.ChildRemoved:
+					#print "ChildRemoved"
+					self.mysignal.emit("finish")
+				if event.type() == QEvent.ChildAdded:
+					#print "ChildAdded"
+					self.mysignal.emit("start")
+					return True
+			
+			return False
+
+	filter = Filter( widget )
+	widget.installEventFilter( filter )
+	return filter.mysignal
+
+class PageListEditor(QWidget):
+
+	firstFrontCoverChanged = pyqtSignal( int )
+	listOrderChanged = pyqtSignal( )
+	modified = pyqtSignal( )
+	
+	pageTypeNames = {
+		PageType.FrontCover: "Front Cover",
+		PageType.InnerCover: "Inner Cover",
+		PageType.Advertisment: "Advertisment",
+		PageType.Roundup: "Roundup",
+		PageType.Story: "Story",
+		PageType.Editorial: "Editorial",
+		PageType.Letters: "Letters",
+		PageType.Preview: "Preview",
+		PageType.BackCover: "Back Cover",
+		PageType.Other: "Other",
+		PageType.Deleted: "Deleted",
+	}
+
+	def __init__(self, parent ):
+		super(PageListEditor, self).__init__(parent)
+		
+		uic.loadUi(ComicTaggerSettings.getUIFile('pagelisteditor.ui' ), self)
+
+		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()
+	
+		# Add the entries to the manga combobox
+		self.comboBox.addItem( "", "" )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.FrontCover], PageType.FrontCover )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.InnerCover], PageType.InnerCover )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.Advertisment], PageType.Advertisment )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.Roundup], PageType.Roundup )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.Story], PageType.Story )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.Editorial], PageType.Editorial )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.Letters], PageType.Letters )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.Preview], PageType.Preview )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.BackCover], PageType.BackCover )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.Other], PageType.Other )
+		self.comboBox.addItem( self.pageTypeNames[ PageType.Deleted], PageType.Deleted )
+
+		self.listWidget.itemSelectionChanged.connect( self.changePage )
+		itemMoveEvents(self.listWidget).connect(self.itemMoveEvent)
+		self.comboBox.activated.connect( self.changePageType )
+		self.btnUp.clicked.connect( self.moveCurrentUp )
+		self.btnDown.clicked.connect( self.moveCurrentDown )
+		self.pre_move_row = -1
+		self.first_front_page = None
+
+	def resetPage( self ):
+		self.pageWidget.clear()
+		self.comboBox.setDisabled(True)
+		self.comic_archive = None
+		self.pages_list = None
+		
+	def moveCurrentUp( self ):
+		row = self.listWidget.currentRow()
+		if row > 0:
+			item = self.listWidget.takeItem ( row )
+			self.listWidget.insertItem( row-1, item )
+			self.listWidget.setCurrentRow( row-1 )
+			self.listOrderChanged.emit()
+			self.emitFrontCoverChange()
+			self.modified.emit()
+
+	def moveCurrentDown( self ):
+		row = self.listWidget.currentRow()
+		if row < self.listWidget.count()-1:
+			item = self.listWidget.takeItem ( row )
+			self.listWidget.insertItem( row+1, item )
+			self.listWidget.setCurrentRow( row+1 )
+			self.listOrderChanged.emit()
+			self.emitFrontCoverChange()
+			self.modified.emit()
+		
+	def itemMoveEvent(self, s):
+		#print "move event: ", s, self.listWidget.currentRow()
+		if s == "start":
+			self.pre_move_row = self.listWidget.currentRow()
+		if s == "finish":
+			if self.pre_move_row != self.listWidget.currentRow():
+				self.listOrderChanged.emit()
+				self.emitFrontCoverChange()
+				self.modified.emit()
+
+	def changePageType( self , i):
+		new_type = self.comboBox.itemData(i).toString()
+		if self.getCurrentPageType() != new_type:
+			self.setCurrentPageType( new_type )
+			self.emitFrontCoverChange()
+			self.modified.emit()
+
+	def changePage( self ):
+		row = self.listWidget.currentRow()
+		pagetype = self.getCurrentPageType()
+		
+		i = self.comboBox.findData( pagetype )
+		self.comboBox.setCurrentIndex( i )
+	
+		#idx = int(str (self.listWidget.item( row ).text()))
+		idx = int(self.listWidget.item( row ).data(Qt.UserRole).toPyObject()[0]['Image'])
+
+		if self.comic_archive is not None:
+			self.pageWidget.setArchive( self.comic_archive, idx )
+
+	def getFirstFrontCover( self ):
+		frontCover = 0
+		for i in range( self.listWidget.count() ):
+			item = self.listWidget.item( i )
+			page_dict = item.data(Qt.UserRole).toPyObject()[0]
+			if 'Type' in page_dict and page_dict['Type'] == PageType.FrontCover:
+				frontCover = int(page_dict['Image'])
+				break
+		return frontCover
+		
+
+	def getCurrentPageType( self ):
+		row = self.listWidget.currentRow()
+		page_dict = self.listWidget.item( row ).data(Qt.UserRole).toPyObject()[0]
+		if 'Type' in page_dict:
+			return page_dict['Type']
+		else:
+			return ""
+			
+	def setCurrentPageType( self, t ):
+		row = self.listWidget.currentRow()
+		page_dict = self.listWidget.item( row ).data(Qt.UserRole).toPyObject()[0]
+
+		if t == "":
+			if 'Type' in page_dict:
+				del(page_dict['Type'])
+		else:
+			page_dict['Type'] = str(t)
+
+		item = self.listWidget.item( row )
+		# 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 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 )
+
+		self.listWidget.clear()
+		for p in pages_list:
+			item = QListWidgetItem(  self.listEntryText( p ) )
+			# wrap the dict in a tuple to keep from being converted to QStrings
+			item.setData(Qt.UserRole, (p, ))
+						
+			self.listWidget.addItem(  item )
+		self.first_front_page = self.getFirstFrontCover()
+		self.listWidget.itemSelectionChanged.connect( self.changePage )
+		self.listWidget.setCurrentRow ( 0 )
+
+	def listEntryText(self, page_dict):
+		text =  str(int(page_dict['Image']) + 1)
+		if 'Type' in page_dict:
+			text += " (" + self.pageTypeNames[page_dict['Type']] + ")"
+		return text
+		
+	def getPageList( self ):
+		page_list = []		
+		for i in range( self.listWidget.count() ):
+			item = self.listWidget.item( i )
+			page_list.append(  item.data(Qt.UserRole).toPyObject()[0] )
+		return page_list
+		
+	def emitFrontCoverChange( self ):
+		if self.first_front_page != self.getFirstFrontCover():
+			self.first_front_page = self.getFirstFrontCover()
+			self.firstFrontCoverChanged.emit( self.first_front_page )
+
+	def setMetadataStyle( self, data_style ):
+
+		# depending on the current data style, certain fields are disabled
+		
+		inactive_color = QColor(255, 170, 150)
+		active_palette = self.comboBox.palette()
+		
+		inactive_palette3 = self.comboBox.palette()
+		inactive_palette3.setColor(QPalette.Base, inactive_color)
+
+
+		if data_style == MetaDataStyle.CIX:
+			self.btnUp.setEnabled( True )
+			self.btnDown.setEnabled( True )
+			self.comboBox.setEnabled( True )
+			self.listWidget.setEnabled( True )
+			
+			self.listWidget.setPalette(active_palette)
+		
+		elif data_style == MetaDataStyle.CBI:
+			self.btnUp.setEnabled( False )
+			self.btnDown.setEnabled( False )
+			self.comboBox.setEnabled( False )
+			self.listWidget.setEnabled( False )
+
+			self.listWidget.setPalette(inactive_palette3)
+			
+		elif data_style == MetaDataStyle.CoMet:
+			pass
+		
+		# make sure combo is disabled when no list
+		if self.comic_archive is None:
+			self.comboBox.setEnabled( False )

comictaggerlib/pageloader.py

@@ -0,0 +1,77 @@
+"""
+A PyQT4 class to load a page image from a ComicArchive in a background thread
+"""
+
+"""
+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.
+"""
+
+from PyQt4 import QtCore, QtGui, uic
+from PyQt4.QtCore import pyqtSignal
+
+from comicarchive import ComicArchive
+
+"""
+This class holds onto a reference of each instance in a list
+since problems occur if the ref count goes to zero and the GC
+tries to reap the object while the thread is going.
+
+If the client class wants to stop the thread, they should mark
+it as "abandoned", and no signals will be issued
+"""
+	
+class PageLoader( QtCore.QThread ):
+
+	loadComplete = pyqtSignal( QtGui.QImage )
+	
+	instanceList = []
+	mutex = QtCore.QMutex()
+
+	"""
+	Remove all finished threads from the list
+	"""
+	@staticmethod
+	def reapInstances():
+		for obj in reversed(PageLoader.instanceList ):
+			if obj.isFinished():
+				PageLoader.instanceList.remove(obj)
+
+	def __init__(self, ca, page_num ):
+		QtCore.QThread.__init__(self)
+		self.ca = ca
+		self.page_num = page_num
+		self.abandoned = False		
+
+		# remove any old instances, and then add ourself
+		PageLoader.mutex.lock()
+		PageLoader.reapInstances()
+		PageLoader.instanceList.append( self )
+		PageLoader.mutex.unlock()
+		
+	def run(self):
+		image_data = self.ca.getPage( self.page_num )
+		if self.abandoned:
+			return
+
+		if image_data is not None:
+			img = QtGui.QImage()
+			img.loadFromData( image_data )
+
+			if self.abandoned:
+				return
+			
+			self.loadComplete.emit( img )
+
+	

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,9 +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)
-		
+		uic.loadUi(ComicTaggerSettings.getUIFile('progresswindow.ui' ), self)
 
+		self.setWindowFlags(self.windowFlags() |
+									  QtCore.Qt.WindowSystemMenuHint |
+									  QtCore.Qt.WindowMaximizeButtonHint)
+
+		utils.reduceWidgetFontSize( self.textEdit )
 
 
 		

comictaggerlib/renamewindow.py

@@ -0,0 +1,157 @@
+"""
+A PyQT4 dialog to confirm rename 
+"""
+
+"""
+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.
+"""
+
+
+from PyQt4 import QtCore, QtGui, uic
+from settings import ComicTaggerSettings
+from settingswindow import SettingsWindow
+from filerenamer import FileRenamer
+from options import MetaDataStyle
+
+import os
+import utils
+
+class RenameWindow(QtGui.QDialog):
+		
+	def __init__( self, parent, comic_archive_list, data_style, settings ):
+		super(RenameWindow, self).__init__(parent)
+		
+		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
+		
+		self.btnSettings.clicked.connect( self.modifySettings )
+		self.configRenamer()
+		self.doPreview()
+
+	def configRenamer( self ):
+		self.renamer = FileRenamer( None )
+		self.renamer.setTemplate( self.settings.rename_template )
+		self.renamer.setIssueZeroPadding( self.settings.rename_issue_number_padding )
+		self.renamer.setSmartCleanup( self.settings.rename_use_smart_string_cleanup )		
+		
+	def doPreview( self ):
+		self.rename_list = []
+		while self.twList.rowCount() > 0:
+			self.twList.removeRow(0)
+
+		self.twList.setSortingEnabled(False)
+			
+		for ca in self.comic_archive_list:
+
+			new_ext = None  # default
+			if self.settings.rename_extension_based_on_archive:
+				if ca.isZip():
+					new_ext = ".cbz"
+				elif ca.isRar():
+					new_ext = ".cbr"			
+
+			md = ca.readMetadata(self.data_style)
+			if md.isEmpty:
+				md = ca.metadataFromFilename()
+			self.renamer.setMetadata( md )
+			new_name = self.renamer.determineName( ca.path, ext=new_ext )		
+
+			row = self.twList.rowCount()
+			self.twList.insertRow( row )
+			folder_item =   QtGui.QTableWidgetItem()
+			old_name_item = QtGui.QTableWidgetItem()
+			new_name_item = QtGui.QTableWidgetItem()
+			
+			item_text = os.path.split(ca.path)[0]
+			folder_item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
+			self.twList.setItem(row, 0, folder_item)
+			folder_item.setText( item_text )
+			folder_item.setData( QtCore.Qt.ToolTipRole, item_text )
+					
+			item_text = os.path.split(ca.path)[1]
+			old_name_item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
+			self.twList.setItem(row, 1, old_name_item)
+			old_name_item.setText( item_text )
+			old_name_item.setData( QtCore.Qt.ToolTipRole, item_text )
+
+			new_name_item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
+			self.twList.setItem(row, 2, new_name_item)
+			new_name_item.setText( new_name )
+			new_name_item.setData( QtCore.Qt.ToolTipRole, new_name )
+			
+			dict_item = dict()
+			dict_item['archive'] = ca
+			dict_item['new_name'] = new_name
+			self.rename_list.append( dict_item)
+
+		# Adjust column sizes
+		self.twList.setVisible( False )
+		self.twList.resizeColumnsToContents()
+		self.twList.setVisible( True )
+		if self.twList.columnWidth(0) > 200:
+			self.twList.setColumnWidth(0, 200)
+			
+		self.twList.setSortingEnabled(True)
+		
+	def modifySettings( self ):
+		settingswin = SettingsWindow( self, self.settings )
+		settingswin.setModal(True)
+		settingswin.showRenameTab()
+		settingswin.exec_()
+		if settingswin.result():
+			self.configRenamer()
+			self.doPreview()
+				
+	def accept( self ):
+
+		progdialog = QtGui.QProgressDialog("", "Cancel", 0, len(self.rename_list), self)
+		progdialog.setWindowTitle( "Renaming Archives" )
+		progdialog.setWindowModality(QtCore.Qt.WindowModal)
+		progdialog.show()
+
+		for idx,item in enumerate(self.rename_list):
+
+			QtCore.QCoreApplication.processEvents()
+			if progdialog.wasCanceled():
+				break
+			progdialog.setValue(idx)
+			idx += 1
+			progdialog.setLabelText( item['new_name'] )
+			
+			if item['new_name'] == os.path.basename( item['archive'].path ):
+				print item['new_name'] , "Filename is already good!"
+				continue
+			
+			if not item['archive'].isWritable(check_rar_status=False):
+				continue
+			
+			folder = os.path.dirname( os.path.abspath( item['archive'].path ) )
+			new_abs_path = utils.unique_file( os.path.join( folder, item['new_name'] ) )
+	
+			os.rename( item['archive'].path, new_abs_path)
+	
+			item['archive'].rename( new_abs_path )
+			
+		progdialog.close()		
+
+		QtGui.QDialog.accept(self)		

comictaggerlib/settings.py

@@ -0,0 +1,276 @@
+"""
+Settings class for comictagger app
+"""
+
+"""
+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 os
+import sys
+import ConfigParser
+import platform
+
+import utils
+
+class ComicTaggerSettings:
+
+	@staticmethod
+	def getSettingsFolder():
+		if platform.system() == "Windows":
+			return os.path.join( os.environ['APPDATA'], 'ComicTagger' )
+		else:
+			return os.path.join( os.path.expanduser('~') , '.ComicTagger')
+
+	@staticmethod
+	def baseDir():
+		if getattr(sys, 'frozen', None):
+			if platform.system() == "Darwin":
+				return sys._MEIPASS
+			else: # Windows
+				return os.path.dirname( os.path.abspath( sys.argv[0] ) )
+		else:
+			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
+		self.rar_exe_path = ""
+		self.unrar_exe_path = ""
+		self.allow_cbi_in_rar = True
+		
+		# automatic settings
+		self.last_selected_save_data_style = 0
+		self.last_selected_load_data_style = 0
+		self.last_opened_folder = ""
+		self.last_main_window_width = 0
+		self.last_main_window_height = 0
+		self.last_main_window_x = 0
+		self.last_main_window_y = 0
+		self.last_form_side_width = -1
+		self.last_list_side_width = -1
+		
+		# identifier settings
+		self.id_length_delta_thresh = 5
+		self.id_publisher_blacklist = "Panini Comics, Abril, Planeta DeAgostini, Editorial Televisa"
+		
+		# Show/ask dialog flags
+		self.ask_about_cbi_in_rar = True
+		self.show_disclaimer = True
+		
+		# Comic Vine settings
+		self.use_series_start_as_volume = False
+		
+		# CBL Tranform settings
+		
+		self.assume_lone_credit_is_primary = False
+		self.copy_characters_to_tags = False
+		self.copy_teams_to_tags = False
+		self.copy_locations_to_tags = False
+		self.copy_notes_to_comments = False
+		self.copy_weblink_to_comments = False
+		self.apply_cbl_transform_on_cv_import = False
+		self.apply_cbl_transform_on_bulk_operation = False
+
+		# Rename settings
+		self.rename_template = "%series% #%issue% (%year%)"
+		self.rename_issue_number_padding = 3
+		self.rename_use_smart_string_cleanup = True
+		self.rename_extension_based_on_archive = True
+
+	def __init__(self):
+		
+		self.settings_file = ""
+		self.folder = ""
+		self.setDefaultValues()
+
+		self.config = ConfigParser.RawConfigParser()
+		self.folder = ComicTaggerSettings.getSettingsFolder()
+		
+		if not os.path.exists( self.folder ):
+			os.makedirs( self.folder )
+		
+		self.settings_file = os.path.join( self.folder, "settings")
+		
+		# if config file doesn't exist, write one out
+		if not os.path.exists( self.settings_file ):
+			self.save()
+		else:
+			self.load()
+		
+		# take a crack at finding rar exes, if not set already
+		if self.rar_exe_path == "":
+			if platform.system() == "Windows":
+				# look in some likely places for windows machine
+				if os.path.exists( "C:\Program Files\WinRAR\Rar.exe" ):
+					self.rar_exe_path = "C:\Program Files\WinRAR\Rar.exe"
+				elif os.path.exists( "C:\Program Files (x86)\WinRAR\Rar.exe" ):
+					self.rar_exe_path = "C:\Program Files (x86)\WinRAR\Rar.exe"
+			else:
+				# see if it's in the path of unix user
+				if utils.which("rar") is not None:
+					self.rar_exe_path = utils.which("rar")
+			if self.rar_exe_path != "":
+				self.save()
+					
+		if self.unrar_exe_path == "":
+			if platform.system() != "Windows":
+				# see if it's in the path of unix user
+				if utils.which("unrar") is not None:
+					self.unrar_exe_path = utils.which("unrar")
+			if self.unrar_exe_path != "":
+				self.save()
+
+	def reset( self ):
+		os.unlink( self.settings_file )
+		self.__init__()
+		
+	def load(self):
+		
+		self.config.read( self.settings_file )
+		
+		self.rar_exe_path =    self.config.get( 'settings', 'rar_exe_path' )
+		self.unrar_exe_path =  self.config.get( 'settings', 'unrar_exe_path' )
+
+		if self.config.has_option('auto', 'last_selected_load_data_style'):
+			self.last_selected_load_data_style =  self.config.getint( 'auto', 'last_selected_load_data_style' )
+		if self.config.has_option('auto', 'last_selected_save_data_style'):
+			self.last_selected_save_data_style =  self.config.getint( 'auto', 'last_selected_save_data_style' )
+		if self.config.has_option('auto', 'last_opened_folder'):
+			self.last_opened_folder =        self.config.get( 'auto', 'last_opened_folder' )
+		if self.config.has_option('auto', 'last_main_window_width'):
+			self.last_main_window_width =    self.config.getint( 'auto', 'last_main_window_width' )
+		if self.config.has_option('auto', 'last_main_window_height'):
+			self.last_main_window_height =   self.config.getint( 'auto', 'last_main_window_height' )
+		if self.config.has_option('auto', 'last_main_window_x'):
+			self.last_main_window_x =   self.config.getint( 'auto', 'last_main_window_x' )
+		if self.config.has_option('auto', 'last_main_window_y'):
+			self.last_main_window_y =   self.config.getint( 'auto', 'last_main_window_y' )
+		if self.config.has_option('auto', 'last_form_side_width'):
+			self.last_form_side_width =   self.config.getint( 'auto', 'last_form_side_width' )
+		if self.config.has_option('auto', 'last_list_side_width'):
+			self.last_list_side_width =   self.config.getint( 'auto', 'last_list_side_width' )
+
+		if self.config.has_option('identifier', 'id_length_delta_thresh'):
+			self.id_length_delta_thresh =   self.config.getint( 'identifier', 'id_length_delta_thresh' )
+		if self.config.has_option('identifier', 'id_publisher_blacklist'):
+			self.id_publisher_blacklist =   self.config.get( 'identifier', 'id_publisher_blacklist' )
+
+		if self.config.has_option('dialogflags', 'ask_about_cbi_in_rar'):
+			self.ask_about_cbi_in_rar =        self.config.getboolean( 'dialogflags', 'ask_about_cbi_in_rar' )		
+		if self.config.has_option('dialogflags', 'show_disclaimer'):
+			self.show_disclaimer =        self.config.getboolean( 'dialogflags', 'show_disclaimer' )
+			
+		if self.config.has_option('comicvine', 'use_series_start_as_volume'):
+			self.use_series_start_as_volume =        self.config.getboolean( 'comicvine', 'use_series_start_as_volume' )		
+
+		if self.config.has_option('cbl_transform', 'assume_lone_credit_is_primary'):
+			self.assume_lone_credit_is_primary =         self.config.getboolean( 'cbl_transform', 'assume_lone_credit_is_primary' )		
+		if self.config.has_option('cbl_transform', 'copy_characters_to_tags'):
+			self.copy_characters_to_tags =               self.config.getboolean( 'cbl_transform', 'copy_characters_to_tags' )		
+		if self.config.has_option('cbl_transform', 'copy_teams_to_tags'):
+			self.copy_teams_to_tags =                    self.config.getboolean( 'cbl_transform', 'copy_teams_to_tags' )		
+		if self.config.has_option('cbl_transform', 'copy_locations_to_tags'):
+			self.copy_locations_to_tags =                self.config.getboolean( 'cbl_transform', 'copy_locations_to_tags' )		
+		if self.config.has_option('cbl_transform', 'copy_notes_to_comments'):
+			self.copy_notes_to_comments =                self.config.getboolean( 'cbl_transform', 'copy_notes_to_comments' )		
+		if self.config.has_option('cbl_transform', 'copy_weblink_to_comments'):
+			self.copy_weblink_to_comments =              self.config.getboolean( 'cbl_transform', 'copy_weblink_to_comments' )		
+		if self.config.has_option('cbl_transform', 'apply_cbl_transform_on_cv_import'):
+			self.apply_cbl_transform_on_cv_import =      self.config.getboolean( 'cbl_transform', 'apply_cbl_transform_on_cv_import' )		
+		if self.config.has_option('cbl_transform', 'apply_cbl_transform_on_bulk_operation'):
+			self.apply_cbl_transform_on_bulk_operation = self.config.getboolean( 'cbl_transform', 'apply_cbl_transform_on_bulk_operation' )		
+			
+		if self.config.has_option('rename', 'rename_template'):
+			self.rename_template =                  self.config.get( 'rename', 'rename_template' )		
+		if self.config.has_option('rename', 'rename_issue_number_padding'):
+			self.rename_issue_number_padding =      self.config.getint( 'rename', 'rename_issue_number_padding' )		
+		if self.config.has_option('rename', 'rename_use_smart_string_cleanup'):
+			self.rename_use_smart_string_cleanup =  self.config.getboolean( 'rename', 'rename_use_smart_string_cleanup' )		
+		if self.config.has_option('rename', 'rename_extension_based_on_archive'):
+			self.rename_extension_based_on_archive =  self.config.getboolean( 'rename', 'rename_extension_based_on_archive' )		
+			
+	def save( self ):
+
+		if not self.config.has_section( 'settings' ):
+			self.config.add_section( 'settings' )
+			
+		self.config.set( 'settings', 'rar_exe_path',   self.rar_exe_path )
+		self.config.set( 'settings', 'unrar_exe_path', self.unrar_exe_path )
+
+		if not self.config.has_section( 'auto' ):
+			self.config.add_section( 'auto' )
+
+		self.config.set( 'auto', 'last_selected_load_data_style', self.last_selected_load_data_style )
+		self.config.set( 'auto', 'last_selected_save_data_style', self.last_selected_save_data_style )
+		self.config.set( 'auto', 'last_opened_folder', self.last_opened_folder )
+		self.config.set( 'auto', 'last_main_window_width', self.last_main_window_width )
+		self.config.set( 'auto', 'last_main_window_height', self.last_main_window_height )
+		self.config.set( 'auto', 'last_main_window_x', self.last_main_window_x )
+		self.config.set( 'auto', 'last_main_window_y', self.last_main_window_y )
+		self.config.set( 'auto', 'last_form_side_width', self.last_form_side_width )
+		self.config.set( 'auto', 'last_list_side_width', self.last_list_side_width )
+
+		if not self.config.has_section( 'identifier' ):
+			self.config.add_section( 'identifier' )
+
+		self.config.set( 'identifier', 'id_length_delta_thresh', self.id_length_delta_thresh )
+		self.config.set( 'identifier', 'id_publisher_blacklist', self.id_publisher_blacklist )
+
+		if not self.config.has_section( 'dialogflags' ):
+			self.config.add_section( 'dialogflags' )
+
+		self.config.set( 'dialogflags', 'ask_about_cbi_in_rar', self.ask_about_cbi_in_rar )
+		self.config.set( 'dialogflags', 'show_disclaimer', self.show_disclaimer )
+
+		if not self.config.has_section( 'comicvine' ):
+			self.config.add_section( 'comicvine' )
+			
+		self.config.set( 'comicvine', 'use_series_start_as_volume', self.use_series_start_as_volume )
+
+		if not self.config.has_section( 'cbl_transform' ):
+			self.config.add_section( 'cbl_transform' )
+
+		self.config.set( 'cbl_transform', 'assume_lone_credit_is_primary', self.assume_lone_credit_is_primary )
+		self.config.set( 'cbl_transform', 'copy_characters_to_tags', self.copy_characters_to_tags )
+		self.config.set( 'cbl_transform', 'copy_teams_to_tags', self.copy_teams_to_tags )
+		self.config.set( 'cbl_transform', 'copy_locations_to_tags', self.copy_locations_to_tags )
+		self.config.set( 'cbl_transform', 'copy_notes_to_comments', self.copy_notes_to_comments )
+		self.config.set( 'cbl_transform', 'copy_weblink_to_comments', self.copy_weblink_to_comments )
+		self.config.set( 'cbl_transform', 'apply_cbl_transform_on_cv_import', self.apply_cbl_transform_on_cv_import )
+		self.config.set( 'cbl_transform', 'apply_cbl_transform_on_bulk_operation', self.apply_cbl_transform_on_bulk_operation )
+
+		if not self.config.has_section( 'rename' ):
+			self.config.add_section( 'rename' )
+
+		self.config.set( 'rename', 'rename_template', self.rename_template )
+		self.config.set( 'rename', 'rename_issue_number_padding', self.rename_issue_number_padding )
+		self.config.set( 'rename', 'rename_use_smart_string_cleanup', self.rename_use_smart_string_cleanup )
+		self.config.set( 'rename', 'rename_extension_based_on_archive', self.rename_extension_based_on_archive )
+		
+		with open( self.settings_file, 'wb') as configfile:
+			self.config.write(configfile)    
+

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":
@@ -79,7 +81,7 @@ class SettingsWindow(QtGui.QDialog):
 			
 			
 		nldtTip = (
-			""" <html>The <b>Name Length Delta Threshold</b> is for eliminating automatic
+			""" <html>The <b>Default Name Length Match Tolerance</b> is for eliminating automatic
 			    search matches that are too long compared to your series name search. The higher
 			    it is, the more likely to have a good match, but each search will take longer and
 				use more bandwidth. Too low, and only the very closest lexical matches will be
@@ -96,6 +98,12 @@ class SettingsWindow(QtGui.QDialog):
 		)
 		self.tePublisherBlacklist.setToolTip(pblTip)
 
+		validator = QtGui.QIntValidator(1, 4, self)
+		self.leIssueNumPadding.setValidator(validator)
+
+		validator = QtGui.QIntValidator(0, 99, self)
+		self.leNameLengthDeltaThresh.setValidator(validator)
+
 		self.settingsToForm()
 		
 		self.btnBrowseRar.clicked.connect(self.selectRar)
@@ -110,7 +118,35 @@ class SettingsWindow(QtGui.QDialog):
 		self.leUnrarExePath.setText( self.settings.unrar_exe_path )
 		self.leNameLengthDeltaThresh.setText( str(self.settings.id_length_delta_thresh) )
 		self.tePublisherBlacklist.setPlainText( self.settings.id_publisher_blacklist )
+
+		if self.settings.use_series_start_as_volume:
+			self.cbxUseSeriesStartAsVolume.setCheckState( QtCore.Qt.Checked)
 	
+		if self.settings.assume_lone_credit_is_primary:
+			self.cbxAssumeLoneCreditIsPrimary.setCheckState( QtCore.Qt.Checked)
+		if self.settings.copy_characters_to_tags:
+			self.cbxCopyCharactersToTags.setCheckState( QtCore.Qt.Checked)
+		if self.settings.copy_teams_to_tags:
+			self.cbxCopyTeamsToTags.setCheckState( QtCore.Qt.Checked)
+		if self.settings.copy_locations_to_tags:
+			self.cbxCopyLocationsToTags.setCheckState( QtCore.Qt.Checked)
+		if self.settings.copy_notes_to_comments:
+			self.cbxCopyNotesToComments.setCheckState( QtCore.Qt.Checked)
+		if self.settings.copy_weblink_to_comments:
+			self.cbxCopyWebLinkToComments.setCheckState( QtCore.Qt.Checked)
+		if self.settings.apply_cbl_transform_on_cv_import:
+			self.cbxApplyCBLTransformOnCVIMport.setCheckState( QtCore.Qt.Checked)
+		if self.settings.apply_cbl_transform_on_bulk_operation:
+			self.cbxApplyCBLTransformOnBatchOperation.setCheckState( QtCore.Qt.Checked)
+
+		self.leRenameTemplate.setText( self.settings.rename_template )
+		self.leIssueNumPadding.setText( str(self.settings.rename_issue_number_padding) )
+		if self.settings.rename_use_smart_string_cleanup:
+			self.cbxSmartCleanup.setCheckState( QtCore.Qt.Checked )
+		if self.settings.rename_extension_based_on_archive:
+			self.cbxChangeExtension.setCheckState( QtCore.Qt.Checked )
+
+
 	def accept( self ):
 		
 		# Copy values from form to settings and save
@@ -121,12 +157,30 @@ class SettingsWindow(QtGui.QDialog):
 		utils.addtopath(os.path.dirname(self.settings.unrar_exe_path))
 		
 		if not str(self.leNameLengthDeltaThresh.text()).isdigit():
-			QtGui.QMessageBox.information(self,"Settings", "The Name Length Delta Threshold must be a number!")
-			return
+			self.leNameLengthDeltaThresh.setText("0")
+
+		if not str(self.leIssueNumPadding.text()).isdigit():
+			self.leIssueNumPadding.setText("0")
 		
 		self.settings.id_length_delta_thresh = int(self.leNameLengthDeltaThresh.text())
 		self.settings.id_publisher_blacklist = str(self.tePublisherBlacklist.toPlainText())
 		
+		self.settings.use_series_start_as_volume = self.cbxUseSeriesStartAsVolume.isChecked()
+				
+		self.settings.assume_lone_credit_is_primary = self.cbxAssumeLoneCreditIsPrimary.isChecked()
+		self.settings.copy_characters_to_tags = self.cbxCopyCharactersToTags.isChecked()
+		self.settings.copy_teams_to_tags = self.cbxCopyTeamsToTags.isChecked()
+		self.settings.copy_locations_to_tags = self.cbxCopyLocationsToTags.isChecked()
+		self.settings.copy_notes_to_comments = self.cbxCopyNotesToComments.isChecked()
+		self.settings.copy_weblink_to_comments = self.cbxCopyWebLinkToComments.isChecked()
+		self.settings.apply_cbl_transform_on_cv_import = self.cbxApplyCBLTransformOnCVIMport.isChecked()
+		self.settings.apply_cbl_transform_on_bulk_operation = self.cbxApplyCBLTransformOnBatchOperation.isChecked()
+	
+		self.settings.rename_template = str(self.leRenameTemplate.text())
+		self.settings.rename_issue_number_padding = int(self.leIssueNumPadding.text())
+		self.settings.rename_use_smart_string_cleanup = self.cbxSmartCleanup.isChecked()
+		self.settings.rename_extension_based_on_archive = self.cbxChangeExtension.isChecked()
+		
 		self.settings.save()
 		QtGui.QDialog.accept(self)
 	
@@ -170,5 +224,6 @@ class SettingsWindow(QtGui.QDialog):
 			fileList = dialog.selectedFiles()
 			control.setText( str(fileList[0]) )
 
-			
+	def showRenameTab( self ):
+		self.tabWidget.setCurrentIndex(4)	
 		

comictaggerlib/ui/autotagmatchwindow.ui

@@ -0,0 +1,149 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dialogMatchSelect</class>
+ <widget class="QDialog" name="dialogMatchSelect">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <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="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="selectionMode">
+          <enum>QAbstractItemView::SingleSelection</enum>
+         </property>
+         <property name="selectionBehavior">
+          <enum>QAbstractItemView::SelectRows</enum>
+         </property>
+         <property name="rowCount">
+          <number>0</number>
+         </property>
+         <property name="columnCount">
+          <number>4</number>
+         </property>
+         <attribute name="horizontalHeaderStretchLastSection">
+          <bool>true</bool>
+         </attribute>
+         <attribute name="verticalHeaderVisible">
+          <bool>false</bool>
+         </attribute>
+         <column>
+          <property name="text">
+           <string>Series</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Publisher</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Date</string>
+          </property>
+         </column>
+         <column>
+          <property name="text">
+           <string>Title</string>
+          </property>
+         </column>
+        </widget>
+       </item>
+       <item>
+        <widget class="QWidget" name="altCoverContainer" 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>
+      </layout>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>dialogMatchSelect</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>dialogMatchSelect</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

comictaggerlib/ui/autotagprogresswindow.ui

@@ -0,0 +1,150 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dialogIssueSelect</class>
+ <widget class="QDialog" name="dialogIssueSelect">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>900</width>
+    <height>413</height>
+   </rect>
+  </property>
+  <property name="maximumSize">
+   <size>
+    <width>16777215</width>
+    <height>16777215</height>
+   </size>
+  </property>
+  <property name="windowTitle">
+   <string>Issue Identification Progress</string>
+  </property>
+  <layout class="QGridLayout" name="gridLayout">
+   <item row="0" column="1">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QProgressBar" name="progressBar">
+       <property name="value">
+        <number>0</number>
+       </property>
+       <property name="invertedAppearance">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string/>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QTextEdit" name="textEdit">
+       <property name="font">
+        <font>
+         <family>Courier</family>
+        </font>
+       </property>
+       <property name="readOnly">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel</set>
+       </property>
+       <property name="centerButtons">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="0" column="0">
+    <widget class="QLabel" name="lblArchive">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Fixed" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="minimumSize">
+      <size>
+       <width>110</width>
+       <height>165</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>110</width>
+       <height>165</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+   <item row="0" column="2">
+    <widget class="QLabel" name="lblTest">
+     <property name="minimumSize">
+      <size>
+       <width>110</width>
+       <height>165</height>
+      </size>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>110</width>
+       <height>165</height>
+      </size>
+     </property>
+     <property name="text">
+      <string>TextLabel</string>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>dialogIssueSelect</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>248</x>
+     <y>254</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>157</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>dialogIssueSelect</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>316</x>
+     <y>260</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>286</x>
+     <y>274</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

comictaggerlib/ui/autotagstartwindow.ui

@@ -0,0 +1,242 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dialogExport</class>
+ <widget class="QDialog" name="dialogExport">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>607</width>
+    <height>319</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Auto-Tag</string>
+  </property>
+  <property name="modal">
+   <bool>false</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QFormLayout" name="formLayout">
+       <property name="sizeConstraint">
+        <enum>QLayout::SetFixedSize</enum>
+       </property>
+       <property name="fieldGrowthPolicy">
+        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+       </property>
+       <item row="0" column="0" colspan="2">
+        <widget class="QCheckBox" name="cbxSaveOnLowConfidence">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Save on low confidence match</string>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" colspan="2">
+        <widget class="QCheckBox" name="cbxDontUseYear">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Don't use publication year in indentification process</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2">
+        <widget class="QCheckBox" name="cbxAssumeIssueOne">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>If no issue number, assume &quot;1&quot;</string>
+         </property>
+        </widget>
+       </item>
+       <item row="3" column="0" colspan="2">
+        <widget class="QCheckBox" name="cbxIgnoreLeadingDigitsInFilename">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Ignore leading (sequence) numbers in filename</string>
+         </property>
+        </widget>
+       </item>
+       <item row="4" column="0" colspan="2">
+        <widget class="QCheckBox" name="cbxRemoveAfterSuccess">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Remove archives from list after successful tagging</string>
+         </property>
+        </widget>
+       </item>
+       <item row="5" column="0" colspan="2">
+        <widget class="QCheckBox" name="cbxSpecifySearchString">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Minimum" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Specify series search string for all selected archives</string>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="minimumSize">
+          <size>
+           <width>40</width>
+           <height>0</height>
+          </size>
+         </property>
+         <property name="text">
+          <string/>
+         </property>
+        </widget>
+       </item>
+       <item row="6" column="1">
+        <widget class="QLineEdit" name="leSearchString">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+        </widget>
+       </item>
+       <item row="8" column="1">
+        <widget class="QLineEdit" name="leNameLengthMatchTolerance">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="maximumSize">
+          <size>
+           <width>50</width>
+           <height>16777215</height>
+          </size>
+         </property>
+        </widget>
+       </item>
+       <item row="7" column="0" colspan="2">
+        <widget class="QLabel" name="label_3">
+         <property name="sizePolicy">
+          <sizepolicy hsizetype="Preferred" vsizetype="Fixed">
+           <horstretch>0</horstretch>
+           <verstretch>0</verstretch>
+          </sizepolicy>
+         </property>
+         <property name="text">
+          <string>Adjust Name Length Match Tolerance:</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>dialogExport</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>346</x>
+     <y>187</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>277</x>
+     <y>104</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>dialogExport</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>346</x>
+     <y>187</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>277</x>
+     <y>104</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

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/crediteditorwindow.ui

@@ -66,6 +66,13 @@
       </property>
      </widget>
     </item>
+    <item row="3" column="1">
+     <widget class="QCheckBox" name="cbPrimary">
+      <property name="text">
+       <string>Primary</string>
+      </property>
+     </widget>
+    </item>
    </layout>
   </widget>
  </widget>

comictaggerlib/ui/exportwindow.ui

@@ -0,0 +1,160 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dialogExport</class>
+ <widget class="QDialog" name="dialogExport">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>533</width>
+    <height>202</height>
+   </rect>
+  </property>
+  <property name="sizePolicy">
+   <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+    <horstretch>0</horstretch>
+    <verstretch>0</verstretch>
+   </sizepolicy>
+  </property>
+  <property name="windowTitle">
+   <string>Export to Zip Archive</string>
+  </property>
+  <property name="modal">
+   <bool>false</bool>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QLabel" name="label">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="text">
+        <string/>
+       </property>
+       <property name="wordWrap">
+        <bool>true</bool>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <layout class="QFormLayout" name="formLayout">
+       <property name="fieldGrowthPolicy">
+        <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+       </property>
+       <item row="1" column="0" colspan="2">
+        <widget class="QCheckBox" name="cbxAddToList">
+         <property name="text">
+          <string>Add New Archive to ComicTagger list</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="0" colspan="2">
+        <widget class="QCheckBox" name="cbxDeleteOriginal">
+         <property name="text">
+          <string>Delete Original RAR (Not recommended)</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0">
+        <spacer name="verticalSpacer">
+         <property name="orientation">
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeType">
+          <enum>QSizePolicy::Fixed</enum>
+         </property>
+         <property name="sizeHint" stdset="0">
+          <size>
+           <width>20</width>
+           <height>5</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QGroupBox" name="groupBox">
+       <property name="title">
+        <string>When Filename already exists:</string>
+       </property>
+       <layout class="QGridLayout" name="gridLayout_2">
+        <item row="0" column="0">
+         <layout class="QGridLayout" name="gridLayout">
+          <item row="1" column="0">
+           <widget class="QRadioButton" name="radioDontCreate">
+            <property name="text">
+             <string>Don't Export</string>
+            </property>
+           </widget>
+          </item>
+          <item row="0" column="0">
+           <widget class="QRadioButton" name="radioCreateNew">
+            <property name="text">
+             <string>Create New Archive With Unique Name (Number appended)</string>
+            </property>
+           </widget>
+          </item>
+         </layout>
+        </item>
+       </layout>
+      </widget>
+     </item>
+     <item>
+      <widget class="QDialogButtonBox" name="buttonBox">
+       <property name="orientation">
+        <enum>Qt::Horizontal</enum>
+       </property>
+       <property name="standardButtons">
+        <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>dialogExport</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>346</x>
+     <y>187</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>277</x>
+     <y>104</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>dialogExport</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>346</x>
+     <y>187</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>277</x>
+     <y>104</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

comictaggerlib/ui/fileselectionlist.ui

@@ -0,0 +1,112 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>pageListEditor</class>
+ <widget class="QWidget" name="pageListEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>527</width>
+    <height>323</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QTableWidget" name="twList">
+     <property name="acceptDrops">
+      <bool>true</bool>
+     </property>
+     <property name="selectionMode">
+      <enum>QAbstractItemView::ExtendedSelection</enum>
+     </property>
+     <property name="selectionBehavior">
+      <enum>QAbstractItemView::SelectRows</enum>
+     </property>
+     <property name="textElideMode">
+      <enum>Qt::ElideMiddle</enum>
+     </property>
+     <attribute name="horizontalHeaderDefaultSectionSize">
+      <number>61</number>
+     </attribute>
+     <attribute name="horizontalHeaderMinimumSectionSize">
+      <number>36</number>
+     </attribute>
+     <attribute name="horizontalHeaderStretchLastSection">
+      <bool>false</bool>
+     </attribute>
+     <column>
+      <property name="text">
+       <string>File</string>
+      </property>
+      <property name="toolTip">
+       <string>File Name</string>
+      </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>CR</string>
+      </property>
+      <property name="toolTip">
+       <string>Has ComicRack Tags</string>
+      </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>CBL</string>
+      </property>
+      <property name="toolTip">
+       <string>Has ComicBookLover Tags</string>
+      </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Type</string>
+      </property>
+      <property name="toolTip">
+       <string>Archive Type</string>
+      </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>R/O</string>
+      </property>
+      <property name="toolTip">
+       <string>Read-Only</string>
+      </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
+     </column>
+     <column>
+      <property name="text">
+       <string>Folder</string>
+      </property>
+      <property name="toolTip">
+       <string>File Location</string>
+      </property>
+      <property name="textAlignment">
+       <set>AlignHCenter|AlignVCenter|AlignCenter</set>
+      </property>
+     </column>
+    </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

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>pageListEditor</class>
+ <widget class="QWidget" name="pageListEditor">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>527</width>
+    <height>323</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QHBoxLayout" name="horizontalLayout">
+   <item>
+    <widget class="QListWidget" name="listWidget">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Maximum" vsizetype="Expanding">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="maximumSize">
+      <size>
+       <width>150</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="dragEnabled">
+      <bool>true</bool>
+     </property>
+     <property name="dragDropMode">
+      <enum>QAbstractItemView::InternalMove</enum>
+     </property>
+     <property name="defaultDropAction">
+      <enum>Qt::MoveAction</enum>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout">
+     <item>
+      <widget class="QPushButton" name="btnUp">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>50</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>^</string>
+       </property>
+      </widget>
+     </item>
+     <item>
+      <widget class="QPushButton" name="btnDown">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+         <horstretch>0</horstretch>
+         <verstretch>0</verstretch>
+        </sizepolicy>
+       </property>
+       <property name="maximumSize">
+        <size>
+         <width>50</width>
+         <height>16777215</height>
+        </size>
+       </property>
+       <property name="text">
+        <string>v</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item>
+    <layout class="QVBoxLayout" name="verticalLayout_2">
+     <item>
+      <layout class="QFormLayout" name="formLayout">
+       <item row="0" column="0">
+        <widget class="QLabel" name="label_2">
+         <property name="text">
+          <string>Page Type:</string>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1">
+        <widget class="QComboBox" name="comboBox"/>
+       </item>
+      </layout>
+     </item>
+     <item>
+      <widget class="QWidget" name="pageContainer" native="true">
+       <property name="sizePolicy">
+        <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+         <horstretch>0</horstretch>
+         <verstretch>90</verstretch>
+        </sizepolicy>
+       </property>
+      </widget>
+     </item>
+    </layout>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections/>
+</ui>

comictaggerlib/ui/progresswindow.ui

@@ -6,7 +6,7 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>556</width>
+    <width>650</width>
     <height>287</height>
    </rect>
   </property>
@@ -28,7 +28,11 @@
      </item>
      <item>
       <widget class="QTextEdit" name="textEdit">
-       <property name="readOnly">
+        <property name="font">
+        <font>
+         <family>Courier</family>
+        </font>
+       </property>      <property name="readOnly">
         <bool>true</bool>
        </property>
       </widget>

comictaggerlib/ui/renamewindow.ui

@@ -0,0 +1,116 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>dialogRename</class>
+ <widget class="QDialog" name="dialogRename">
+  <property name="windowModality">
+   <enum>Qt::NonModal</enum>
+  </property>
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>801</width>
+    <height>360</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Archive Rename</string>
+  </property>
+  <property name="modal">
+   <bool>false</bool>
+  </property>
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="1" column="0">
+      <widget class="QLabel" name="label">
+       <property name="text">
+        <string> Preview:</string>
+       </property>
+      </widget>
+     </item>
+     <item row="2" column="0">
+      <widget class="QTableWidget" name="twList">
+       <property name="selectionMode">
+        <enum>QAbstractItemView::NoSelection</enum>
+       </property>
+       <property name="selectionBehavior">
+        <enum>QAbstractItemView::SelectRows</enum>
+       </property>
+       <property name="textElideMode">
+        <enum>Qt::ElideMiddle</enum>
+       </property>
+       <column>
+        <property name="text">
+         <string>Folder</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>Old Name</string>
+        </property>
+       </column>
+       <column>
+        <property name="text">
+         <string>New Name</string>
+        </property>
+       </column>
+      </widget>
+     </item>
+    </layout>
+   </item>
+   <item row="1" column="0">
+    <widget class="QPushButton" name="btnSettings">
+     <property name="text">
+      <string>Rename Settings</string>
+     </property>
+    </widget>
+   </item>
+   <item row="1" column="1">
+    <widget class="QDialogButtonBox" name="buttonBox">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="standardButtons">
+      <set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set>
+     </property>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>accepted()</signal>
+   <receiver>dialogRename</receiver>
+   <slot>accept()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>346</x>
+     <y>187</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>277</x>
+     <y>104</y>
+    </hint>
+   </hints>
+  </connection>
+  <connection>
+   <sender>buttonBox</sender>
+   <signal>rejected()</signal>
+   <receiver>dialogRename</receiver>
+   <slot>reject()</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>346</x>
+     <y>187</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>277</x>
+     <y>104</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

comictaggerlib/ui/settingswindow.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>640</width>
-    <height>416</height>
+    <width>674</width>
+    <height>428</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -263,7 +263,7 @@
               <string/>
              </property>
              <property name="text">
-              <string>Name Length Delta Threshold:</string>
+              <string>Default Name Length Match Tolerance:</string>
              </property>
             </widget>
            </item>
@@ -275,6 +275,12 @@
                <verstretch>0</verstretch>
               </sizepolicy>
              </property>
+             <property name="maximumSize">
+              <size>
+               <width>50</width>
+               <height>16777215</height>
+              </size>
+             </property>
              <property name="toolTip">
               <string/>
              </property>
@@ -301,6 +307,212 @@
          </item>
         </layout>
        </widget>
+       <widget class="QWidget" name="tab_3">
+        <attribute name="title">
+         <string>Comic Vine</string>
+        </attribute>
+        <widget class="QCheckBox" name="cbxUseSeriesStartAsVolume">
+         <property name="geometry">
+          <rect>
+           <x>30</x>
+           <y>30</y>
+           <width>240</width>
+           <height>25</height>
+          </rect>
+         </property>
+         <property name="text">
+          <string>Use Series Start Date as Volume</string>
+         </property>
+        </widget>
+       </widget>
+       <widget class="QWidget" name="tab_4">
+        <attribute name="title">
+         <string>CBL</string>
+        </attribute>
+        <layout class="QGridLayout" name="gridLayout_6">
+         <item row="0" column="0">
+          <widget class="QCheckBox" name="cbxApplyCBLTransformOnCVIMport">
+           <property name="text">
+            <string>Apply CBL Transforms on ComicVine Import</string>
+           </property>
+          </widget>
+         </item>
+         <item row="1" column="0">
+          <widget class="QCheckBox" name="cbxApplyCBLTransformOnBatchOperation">
+           <property name="text">
+            <string>Apply CBL Transforms on Batch Copy Operations to CBL Tags</string>
+           </property>
+          </widget>
+         </item>
+         <item row="3" column="0">
+          <widget class="QGroupBox" name="groupBox">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="MinimumExpanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="title">
+            <string>CBL Transforms</string>
+           </property>
+           <widget class="QWidget" name="layoutWidget">
+            <property name="geometry">
+             <rect>
+              <x>11</x>
+              <y>21</y>
+              <width>246</width>
+              <height>182</height>
+             </rect>
+            </property>
+            <layout class="QGridLayout" name="gridLayout_7">
+             <item row="0" column="0">
+              <widget class="QCheckBox" name="cbxAssumeLoneCreditIsPrimary">
+               <property name="text">
+                <string>Assume Lone Credit Is Primary</string>
+               </property>
+              </widget>
+             </item>
+             <item row="1" column="0">
+              <widget class="QCheckBox" name="cbxCopyCharactersToTags">
+               <property name="text">
+                <string>Copy Characters to Generic Tags</string>
+               </property>
+              </widget>
+             </item>
+             <item row="2" column="0">
+              <widget class="QCheckBox" name="cbxCopyTeamsToTags">
+               <property name="text">
+                <string>Copy Teams to Generic Tags</string>
+               </property>
+              </widget>
+             </item>
+             <item row="3" column="0">
+              <widget class="QCheckBox" name="cbxCopyLocationsToTags">
+               <property name="text">
+                <string>Copy Locations to Generic Tags</string>
+               </property>
+              </widget>
+             </item>
+             <item row="4" column="0">
+              <widget class="QCheckBox" name="cbxCopyNotesToComments">
+               <property name="text">
+                <string>Copy Notes to Comments</string>
+               </property>
+              </widget>
+             </item>
+             <item row="5" column="0">
+              <widget class="QCheckBox" name="cbxCopyWebLinkToComments">
+               <property name="text">
+                <string>Copy Web Link to Comments</string>
+               </property>
+              </widget>
+             </item>
+            </layout>
+           </widget>
+          </widget>
+         </item>
+         <item row="2" column="0">
+          <spacer name="verticalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Vertical</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Fixed</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>20</width>
+             <height>10</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
+       <widget class="QWidget" name="tab_5">
+        <attribute name="title">
+         <string>Rename</string>
+        </attribute>
+        <layout class="QGridLayout" name="gridLayout_5">
+         <item row="0" column="0">
+          <layout class="QFormLayout" name="formLayout_3">
+           <property name="fieldGrowthPolicy">
+            <enum>QFormLayout::AllNonFixedFieldsGrow</enum>
+           </property>
+           <item row="1" column="0">
+            <widget class="QLabel" name="label">
+             <property name="text">
+              <string>Template:</string>
+             </property>
+            </widget>
+           </item>
+           <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;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>
+           <item row="2" column="0">
+            <widget class="QLabel" name="label_6">
+             <property name="text">
+              <string>Issue # Zero Padding</string>
+             </property>
+            </widget>
+           </item>
+           <item row="2" column="1">
+            <widget class="QLineEdit" name="leIssueNumPadding">
+             <property name="sizePolicy">
+              <sizepolicy hsizetype="Maximum" vsizetype="Fixed">
+               <horstretch>0</horstretch>
+               <verstretch>0</verstretch>
+              </sizepolicy>
+             </property>
+             <property name="maximumSize">
+              <size>
+               <width>50</width>
+               <height>16777215</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;Issue # Zero Padding&lt;/span&gt; dictates if the issue number should be padded on left with zeros.  A value of 2, for example, means that the number will always be at least two digits.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+            </widget>
+           </item>
+           <item row="3" column="0" colspan="2">
+            <widget class="QCheckBox" name="cbxSmartCleanup">
+             <property name="toolTip">
+              <string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;&lt;span style=&quot; font-weight:600;&quot;&gt;&amp;quot;Smart Text Cleanup&amp;quot; &lt;/span&gt;will attempt to clean up the new filename if there are missing fields from the template.  For example, removing empty braces, repeated spaces and dashes, and more.  Experimental feature.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
+             </property>
+             <property name="text">
+              <string>Use Smart Text Cleanup (Experimental)</string>
+             </property>
+            </widget>
+           </item>
+           <item row="4" column="0" colspan="2">
+            <widget class="QCheckBox" name="cbxChangeExtension">
+             <property name="text">
+              <string>Change Extension Based On Archive Type</string>
+             </property>
+            </widget>
+           </item>
+          </layout>
+         </item>
+        </layout>
+       </widget>
       </widget>
      </item>
      <item>

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

@@ -520,3 +520,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):
 
@@ -85,11 +87,23 @@ class IdentifyThread( QtCore.QThread):
 
 class VolumeSelectionWindow(QtGui.QDialog):
 
-	def __init__(self, parent, series_name, issue_number, year, comic_archive, settings, autoselect=False):
+	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
@@ -97,7 +111,9 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		self.volume_id = 0
 		self.comic_archive = comic_archive
 		self.immediate_autoselect = autoselect
-
+		self.cover_index_list = cover_index_list
+		self.cv_search_results = None
+		
 		self.twList.resizeColumnsToContents()	
 		self.twList.currentItemChanged.connect(self.currentItemChanged)
 		self.twList.cellDoubleClicked.connect(self.cellDoubleClicked)
@@ -105,9 +121,21 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		self.btnIssues.clicked.connect(self.showIssues)	
 		self.btnAutoSelect.clicked.connect(self.autoSelect)	
 		
-		self.performQuery()		
+		self.updateButtons()
+		self.performQuery()
 		self.twList.selectRow(0)
 
+	def updateButtons( self ):
+		if self.cv_search_results is not None and len(self.cv_search_results) > 0:
+			enabled = True
+		else:
+			enabled = False
+			
+		self.btnRequery.setEnabled( enabled )			
+		self.btnIssues.setEnabled( enabled )	
+		self.btnAutoSelect.setEnabled( enabled )
+		self.buttonBox.button(QtGui.QDialogButtonBox.Ok).setEnabled( enabled )
+		
 	def requery( self,  ):
 		self.performQuery( refresh=True )
 		self.twList.selectRow(0)
@@ -136,6 +164,8 @@ class VolumeSelectionWindow(QtGui.QDialog):
 
 		self.ii.setAdditionalMetadata( md )
 		self.ii.onlyUseAdditionalMetaData = True
+		print self.cover_index_list
+		self.ii.cover_page_index = int(self.cover_index_list[0])
 		
 		self.id_thread = IdentifyThread( self.ii )
 		self.id_thread.identifyComplete.connect( self.identifyComplete )	
@@ -147,7 +177,7 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		self.iddialog.exec_()
 
 	def logIDOutput( self, text ):
-		print text,
+		print unicode(text),
 		self.iddialog.textEdit.ensureCursorVisible()
 		self.iddialog.textEdit.insertPlainText(text)
 
@@ -164,63 +194,53 @@ 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:
 				title = record['name']
-				title += " (" + str(record['start_year']) + ")"
+				title += " (" + unicode(record['start_year']) + ")"
 				title += " - "
 				break
 				
 		selector.setWindowTitle( title + "Select Issue")
+		selector.setModal( True )
 		selector.exec_()
 		if selector.result():
 			#we should now have a volume ID
@@ -274,8 +294,9 @@ class VolumeSelectionWindow(QtGui.QDialog):
 			QtGui.QMessageBox.critical(self, self.tr("Network Issue"), self.tr("Could not connect to ComicVine to search for series!"))
 			return
 		
-		self.cv_search_results = self.search_thread.cv_search_results
-				
+		self.cv_search_results = self.search_thread.cv_search_results		
+		self.updateButtons()
+
 		self.twList.setSortingEnabled(False)
 
 		while self.twList.rowCount() > 0:
@@ -285,25 +306,29 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		for record in self.cv_search_results: 
 			self.twList.insertRow(row)
 
-			item_text = record['name']  
-			item = QtGui.QTableWidgetItem(item_text)			
+			item_text = record['name']
+			item = QtGui.QTableWidgetItem( item_text )			
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setData( QtCore.Qt.UserRole ,record['id'])
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 0, item)
 			
 			item_text = str(record['start_year'])  
 			item = QtGui.QTableWidgetItem(item_text)			
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setFlags(QtCore.Qt.ItemIsSelectable| QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 1, item)
 
 			item_text = record['count_of_issues']  
 			item = QtGui.QTableWidgetItem(item_text)			
+			item.setData( QtCore.Qt.ToolTipRole, item_text )
 			item.setData(QtCore.Qt.DisplayRole, record['count_of_issues'])
 			item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
 			self.twList.setItem(row, 2, item)
 			
 			if record['publisher'] is not None:
 				item_text = record['publisher']['name']
+				item.setData( QtCore.Qt.ToolTipRole, item_text )
 				item = QtGui.QTableWidgetItem(item_text)			
 				item.setFlags(QtCore.Qt.ItemIsSelectable | QtCore.Qt.ItemIsEnabled)
 				self.twList.setItem(row, 3, item)
@@ -316,7 +341,11 @@ class VolumeSelectionWindow(QtGui.QDialog):
 		self.twList.selectRow(0)
 		self.twList.resizeColumnsToContents()
 		
-		if self.immediate_autoselect:
+		if len( self.cv_search_results ) == 0:
+			QtCore.QCoreApplication.processEvents()
+			QtGui.QMessageBox.information(self,"Search Result", "No matches found!")
+
+		if self.immediate_autoselect and len( self.cv_search_results ) > 0:
 			# defer the immediate autoselect so this dialog has time to pop up
 			QtCore.QCoreApplication.processEvents()
 			QtCore.QTimer.singleShot(10, self.doImmediateAutoselect)
@@ -342,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

debian_scripts/after_install.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+mv /usr/bin/comictagger.py /usr/bin/comictagger

debian_scripts/before_remove.sh

@@ -0,0 +1,2 @@
+#!/bin/bash
+mv /usr/bin/comictagger /usr/bin/comictagger.py

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,8 +16,8 @@ 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
 	
 clean:
@@ -33,6 +32,7 @@ diskimage:
 	rm -rf $(STAGING)
 	mkdir $(STAGING)
 	cp $(TAGGER_BASE)/release_notes.txt $(STAGING)
+	ln -s /Applications $(STAGING)/Applications
 	cp -a $(APP_BUNDLE) $(STAGING)
 	cp $(MAC_BASE)/volume.icns $(STAGING)/.VolumeIcon.icns
 	SetFile -c icnC $(STAGING)/.VolumeIcon.icns

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, Zip, and folder 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 scrape and tag a folder, just one line
+	ComicTagger -s -o -f -t cr -v -i --nooverwrite *.cb?
+
+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.7
+* 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".  Make note in the output where comictagger.py goes!

release_notes.txt

@@ -1,4 +1,106 @@
+---------------------------------  
+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 
 
-30-Nov-2012
-0.9.0-beta
-Initial beta release
+---------------------------------  
+1.0.3-beta - 31-Jan-2013
+---------------------------------
+Changes:
+	Misc bug fixes and enhancements
+	
+---------------------------------  
+1.0.2-beta - 25-Jan-2013
+---------------------------------
+Changes:
+	More verbose logging during auto-tag
+	Added %month% and %month_name% for renaming
+	Better parsing of volume numbers in file name
+Bugs:
+	Better exception handling with corrupted image data
+	Fixed issues with RAR reading on OS X
+	Other minor bug fixes
+	
+---------------------------------  
+1.0.1-beta - 24-Jan-2013
+---------------------------------
+Bug Fix:
+	Fixed an issue where unicode strings can't be printed to OS X Console
+
+---------------------------------  
+1.0.0-beta - 23-Jan-2013
+---------------------------------
+Version 1!  New multi-file processing in GUI!
+
+GUI Changes:
+  Open multiple files and/or folders via drag/drop or file dialog
+  File management list for easy viewing and selection
+  Batch tag remove
+  Batch export as zip
+  Batch rename
+  Batch tag copy
+  Batch auto-tag (automatic identification and save!)
+  
+---------------------------------  
+0.9.5-beta - 16-Jan-2013
+---------------------------------
+Changes:
+  Added CLI option to search by comicvine issue ID
+  Some image loading optimizations
+  Bug Fix:  Some CBL fields that should have been ints were written as strings
+
+---------------------------------  
+0.9.4-beta - 7-Jan-2013
+---------------------------------
+Changes:
+  Better handling of non-ascii characters in filenames and data
+  Add CBL Transform to copy Web Link and Notes to comments
+  Minor bug fixes
+
+---------------------------------  
+0.9.3-beta - 19-Dec-2012
+---------------------------------
+Changes:
+  File rename in GUI
+  Setting for file rename
+  Option to use series start year as volume
+  Added "CBL Transform" to handle primary credits copying data into the generic tags field
+  Bug Fix:  unicode characters in credits caused crash 
+  Bug Fix:  bad or non-image data in file caused crash 
+
+Note:
+  The user should clear the cache and delete the existing settings when first running this version.
+  
+---------------------------------  
+0.9.2-beta - 13-Dec-2012
+---------------------------------
+  Page List/Type editing in GUI
+  File globbing for windows CLI (i.e. use of wildcards like '*.cbz')
+  Fixed RAR writing bug on windows
+  Minor bug and crash fixes
+
+---------------------------------  
+0.9.1-beta - 07-Dec-2012
+---------------------------------
+  Export as ZIP Archive
+  Added help menu option for websites
+  Added Primary Credit Flag editing
+  Menu enhancements
+  CLI Enhancements:
+	Interactive selection of matches
+	Tag copy
+	Better output
+	CoMet support
+  Minor bug and crash fixes
+
+---------------------------------  
+0.9.0-beta - 30-Nov-2012
+---------------------------------
+Initial beta release

settings.py

@@ -1,180 +0,0 @@
-"""
-Settings class for comictagger app
-"""
-
-"""
-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 os
-import sys
-import ConfigParser
-import platform
-
-import utils
-
-class ComicTaggerSettings:
-
-	@staticmethod
-	def getSettingsFolder():
-		if platform.system() == "Windows":
-			return os.path.join( os.environ['APPDATA'], 'ComicTagger' )
-		else:
-			return os.path.join( os.path.expanduser('~') , '.ComicTagger')
-
-	@staticmethod
-	def baseDir():
-		if platform.system() == "Darwin" and getattr(sys, 'frozen', None):
-			return sys._MEIPASS
-		else:
-			#print "ATB basename", os.path.dirname( os.path.abspath( sys.argv[0] ) )
-			return os.path.dirname( os.path.abspath( sys.argv[0] ) )
-		
-	def setDefaultValues( self ):
-
-		# General Settings
-		self.rar_exe_path = ""
-		self.unrar_exe_path = ""
-		self.allow_cbi_in_rar = True
-		
-		# automatic settings
-		self.last_selected_data_style = 0
-		self.last_opened_folder = ""
-		self.last_main_window_width = 0
-		self.last_main_window_height = 0
-		self.last_main_window_x = 0
-		self.last_main_window_y = 0
-		
-		# identifier settings
-		self.id_length_delta_thresh = 5
-		self.id_publisher_blacklist = "Panini Comics, Abril, Scholastic Book Services"
-		
-		# Show/ask dialog flags
-		self.ask_about_cbi_in_rar = True
-		self.show_disclaimer = True
-	
-	def __init__(self):
-		
-		self.settings_file = ""
-		self.folder = ""
-		self.setDefaultValues()
-
-		self.config = ConfigParser.RawConfigParser()
-		self.folder = ComicTaggerSettings.getSettingsFolder()
-		
-		if not os.path.exists( self.folder ):
-			os.makedirs( self.folder )
-		
-		self.settings_file = os.path.join( self.folder, "settings")
-		
-		# if config file doesn't exist, write one out
-		if not os.path.exists( self.settings_file ):
-			self.save()
-		else:
-			self.load()
-		
-		# take a crack at finding rar exes, if not set already
-		if self.rar_exe_path == "":
-			if platform.system() == "Windows":
-				# look in some likely places for windows machine
-				if os.path.exists( "C:\Program Files\WinRAR\Rar.exe" ):
-					self.rar_exe_path = "C:\Program Files\WinRAR\Rar.exe"
-				elif os.path.exists( "C:\Program Files (x86)\WinRAR\Rar.exe" ):
-					self.rar_exe_path = "C:\Program Files (x86)\WinRAR\Rar.exe"
-			else:
-				# see if it's in the path of unix user
-				if utils.which("rar") is not None:
-					self.rar_exe_path = utils.which("rar")
-			if self.rar_exe_path != "":
-				self.save()
-					
-		if self.unrar_exe_path == "":
-			if platform.system() != "Windows":
-				# see if it's in the path of unix user
-				if utils.which("unrar") is not None:
-					self.unrar_exe_path = utils.which("unrar")
-			if self.unrar_exe_path != "":
-				self.save()
-
-	def reset( self ):
-		os.unlink( self.settings_file )
-		self.__init__()
-		
-	def load(self):
-		
-		self.config.read( self.settings_file )
-		
-		self.rar_exe_path =    self.config.get( 'settings', 'rar_exe_path' )
-		self.unrar_exe_path =  self.config.get( 'settings', 'unrar_exe_path' )
-    
-		if self.config.has_option('auto', 'last_selected_data_style'):
-			self.last_selected_data_style =  self.config.getint( 'auto', 'last_selected_data_style' )
-		if self.config.has_option('auto', 'last_opened_folder'):
-			self.last_opened_folder =        self.config.get( 'auto', 'last_opened_folder' )
-		if self.config.has_option('auto', 'last_main_window_width'):
-			self.last_main_window_width =    self.config.getint( 'auto', 'last_main_window_width' )
-		if self.config.has_option('auto', 'last_main_window_height'):
-			self.last_main_window_height =   self.config.getint( 'auto', 'last_main_window_height' )
-		if self.config.has_option('auto', 'last_main_window_x'):
-			self.last_main_window_x =   self.config.getint( 'auto', 'last_main_window_x' )
-		if self.config.has_option('auto', 'last_main_window_y'):
-			self.last_main_window_y =   self.config.getint( 'auto', 'last_main_window_y' )
-
-		if self.config.has_option('identifier', 'id_length_delta_thresh'):
-			self.id_length_delta_thresh =   self.config.getint( 'identifier', 'id_length_delta_thresh' )
-		if self.config.has_option('identifier', 'id_publisher_blacklist'):
-			self.id_publisher_blacklist =        self.config.get( 'identifier', 'id_publisher_blacklist' )
-
-		if self.config.has_option('dialogflags', 'ask_about_cbi_in_rar'):
-			self.ask_about_cbi_in_rar =        self.config.getboolean( 'dialogflags', 'ask_about_cbi_in_rar' )		
-		if self.config.has_option('dialogflags', 'show_disclaimer'):
-			self.show_disclaimer =        self.config.getboolean( 'dialogflags', 'show_disclaimer' )
-    
-	def save( self ):
-
-		if not self.config.has_section( 'settings' ):
-			self.config.add_section( 'settings' )
-			
-		self.config.set( 'settings', 'rar_exe_path',   self.rar_exe_path )
-		self.config.set( 'settings', 'unrar_exe_path', self.unrar_exe_path )
-
-		if not self.config.has_section( 'auto' ):
-			self.config.add_section( 'auto' )
-
-		self.config.set( 'auto', 'last_selected_data_style', self.last_selected_data_style )
-		self.config.set( 'auto', 'last_opened_folder', self.last_opened_folder )
-		self.config.set( 'auto', 'last_main_window_width', self.last_main_window_width )
-		self.config.set( 'auto', 'last_main_window_height', self.last_main_window_height )
-		self.config.set( 'auto', 'last_main_window_x', self.last_main_window_x )
-		self.config.set( 'auto', 'last_main_window_y', self.last_main_window_y )
-
-		if not self.config.has_section( 'identifier' ):
-			self.config.add_section( 'identifier' )
-
-		self.config.set( 'identifier', 'id_length_delta_thresh', self.id_length_delta_thresh )
-		self.config.set( 'identifier', 'id_publisher_blacklist', self.id_publisher_blacklist )
-
-		if not self.config.has_section( 'dialogflags' ):
-			self.config.add_section( 'dialogflags' )
-
-		self.config.set( 'dialogflags', 'ask_about_cbi_in_rar', self.ask_about_cbi_in_rar )
-		self.config.set( 'dialogflags', 'show_disclaimer', self.show_disclaimer )
-
-		with open( self.settings_file, 'wb') as configfile:
-			self.config.write(configfile)    
-    
-    
-