update todo

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

Makefile

@@ -1,4 +1,4 @@
-TAGGER_BASE := $(HOME)/Dropbox/tagger/comictagger
+TAGGER_BASE ?:= $(HOME)/Dropbox/tagger/comictagger
 TAGGER_SRC := $(TAGGER_BASE)/comictaggerlib
 VERSION_STR := $(shell grep version $(TAGGER_SRC)/ctversion.py| cut -d= -f2 | sed 's/\"//g')
 PASSWORD    := $(shell cat $(TAGGER_BASE)/project_password.txt)  

comictaggerlib/comicarchive.py

@@ -517,14 +517,14 @@ class ComicArchive:
 		self.resetCache()
 		self.settings = settings
 		
-		if self.zipTest():
-			self.archive_type =  self.ArchiveType.Zip
-			self.archiver = ZipArchiver( self.path )
-			
-		elif self.rarTest(): 
+		if self.rarTest(): 
 			self.archive_type =  self.ArchiveType.Rar
 			self.archiver = RarArchiver( self.path, settings )
 			
+		elif self.zipTest():
+			self.archive_type =  self.ArchiveType.Zip
+			self.archiver = ZipArchiver( self.path )
+			
 		elif os.path.isdir( self.path ):
 			self.archive_type =  self.ArchiveType.Folder
 			self.archiver = FolderArchiver( self.path )			
@@ -609,7 +609,7 @@ class ComicArchive:
 		if ( 
 		      ( self.isZip() or  self.isRar() ) #or self.isFolder() )
 		      and
-		      ( self.getNumberOfPages() > 2)
+		      ( self.getNumberOfPages() > 0)
 
 			):
 			return True

comictaggerlib/comicinfoxml.py

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

comictaggerlib/comicvinetalker.py

@@ -145,10 +145,22 @@ class ComicVineTalker(QObject):
 				return cached_search_results
 		
 		original_series_name = series_name
-	
-		series_name = urllib.quote_plus(series_name.encode("utf-8"))
-		#series_name = urllib.quote_plus(unicode(series_name))
-		search_url = self.api_base_url + "/search/?api_key=" + self.api_key + "&format=json&resources=volume&query=" + series_name + "&field_list=name,id,start_year,publisher,image,description,count_of_issues"
+		
+		# We need to make the series name into an "AND"ed query list
+		query_word_list = series_name.split()
+		and_list =  ['AND'] * (len(query_word_list)-1)
+		and_list.append('')
+		# zipper up the two lists
+		query_list = zip(query_word_list, and_list)
+		# flatten the list
+		query_list = [ item for sublist in query_list for item in sublist]
+		# convert back to a string
+		query_string = " ".join( query_list ).strip()
+		#print "Query string = ", query_string
+		
+		query_string = urllib.quote_plus(query_string.encode("utf-8"))
+
+		search_url = self.api_base_url + "/search/?api_key=" + self.api_key + "&format=json&resources=volume&query=" + query_string + "&field_list=name,id,start_year,publisher,image,description,count_of_issues"
 		content = self.getUrlContent(search_url + "&page=1") 
 	
 		cv_response = json.loads(content)

comictaggerlib/ctversion.py

@@ -1,3 +1,3 @@
 # This file should contan only these comments, and the line below.  
 # Used by packaging makefiles and app
-version="1.1.9-beta"
+version="1.1.10-beta"

comictaggerlib/fileselectionlist.py

@@ -198,7 +198,13 @@ class FileSelectionList(QWidget):
 		progdialog.close()
 		if firstAdded is not None:
 			self.twList.selectRow(firstAdded)
+		else:
+			if len(pathlist) == 1 and os.path.isfile(pathlist[0]):
+				QMessageBox.information(self, self.tr("File Open"), self.tr("Selected file doesn't seem to be a comic archive."))
+			else:
+				QMessageBox.information(self, self.tr("File/Folder Open"), self.tr("No comic archives were found."))
 			
+		
 		self.twList.setSortingEnabled(True)
 		
 		# Adjust column size

comictaggerlib/utils.py

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

mac/Makefile

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

release_notes.txt

@@ -1,3 +1,11 @@
+---------------------------------  
+1.1.10-beta - 30-Jan-2014
+---------------------------------
+ * Updated series query to match changes on Comic Vine side
+ * Added a message when not able to open a file or folder
+ * Fixed an issue where series names with periods would fail on search 
+ * Other misc bug fixes
+
 ---------------------------------  
 1.1.9-beta - 8-May-2013
 ---------------------------------

todo.txt

@@ -4,13 +4,22 @@ Features
 Rename dialog:
 	check-box for rows?
 	manual edit the preview?
-	
+
+Maybe replace configparser  -- seems to be causing all sorts of problems
+
 Feature Requests:
 	Move CBR to other folder after conversion to ZIP
 	Pre-process series name before identification
 		(using a list of regex transforms) 
-	NO - Auto-rename on auto-tag
-	NO - Re-zip (to remove compression)
+	(GC #28) Save auto-tag options
+	(GC #24) Multiple options for -t i.e. "-t cr,cbl"
+	(GC #18 ) Option for handling colon in rename
+	(GC #31 ) Specify CV Series ID for auto-tag
+	Re-org - move to new folder based on template
+	
+	Denied Requests (for now):
+		Auto-rename on auto-tag
+		Re-zip (to remove compression)
 	
 	
 	Selective fields on CLI print (use -m option.  Maybe internally remove all but specified fields in MD object before print )
@@ -25,6 +34,8 @@ Bugs
 
 Zip flakes out when filename differs from index (or whatever)  i.e "\" vs "/". Python issue
 
+
+
 -----------------------------------------------------
 Big  Future Features
 -----------------------------------------------------
@@ -32,7 +43,7 @@ Support for ACBF metatdata in CBZ
 
 GCD scraper or DB reader
 
-Batch Edit
+(GC #29) Batch Edit
 	Form Mode:  Single vs Batch
 	
 -----------------------------------------------------

windows/Makefile

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