From 37048b99fc2336405c0c6c14f99130dff7fe4a58 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Wed, 23 Jan 2013 01:25:17 +0000 Subject: [PATCH] Assorted fixes and enhancements git-svn-id: http://comictagger.googlecode.com/svn/trunk@325 6c5673fe-1810-88d6-992b-cd32ca31540c --- autotagstartwindow.py | 9 ++++++--- autotagstartwindow.ui | 33 +++++++++++++++++++++++---------- exportwindow.ui | 30 +++++++++++++++++++++++------- filenameparser.py | 3 +++ fileselectionlist.py | 4 ++-- renamewindow.ui | 11 ----------- taggerwindow.py | 18 ++++++++++-------- todo.txt | 22 +++++++++++++--------- 8 files changed, 80 insertions(+), 50 deletions(-) diff --git a/autotagstartwindow.py b/autotagstartwindow.py index bfbe3df..28934ac 100644 --- a/autotagstartwindow.py +++ b/autotagstartwindow.py @@ -37,16 +37,19 @@ class AutoTagStartWindow(QtGui.QDialog): self.settings = settings - self.cbxNoAutoSaveOnLow.setCheckState( QtCore.Qt.Unchecked ) + self.cbxSaveOnLowConfidence.setCheckState( QtCore.Qt.Unchecked ) self.cbxDontUseYear.setCheckState( QtCore.Qt.Unchecked ) + self.cbxAssumeIssueOne.setCheckState( QtCore.Qt.Unchecked ) - self.noAutoSaveOnLow = False + self.autoSaveOnLow = False self.dontUseYear = False + self.assumeIssueOne = False def accept( self ): QtGui.QDialog.accept(self) - self.noAutoSaveOnLow = self.cbxNoAutoSaveOnLow.isChecked() + self.autoSaveOnLow = self.cbxSaveOnLowConfidence.isChecked() self.dontUseYear = self.cbxDontUseYear.isChecked() + self.assumeIssueOne = self.cbxAssumeIssueOne.isChecked() \ No newline at end of file diff --git a/autotagstartwindow.ui b/autotagstartwindow.ui index 3b46aed..675a04d 100644 --- a/autotagstartwindow.ui +++ b/autotagstartwindow.ui @@ -9,8 +9,8 @@ 0 0 - 513 - 189 + 524 + 248 @@ -43,20 +43,33 @@ QFormLayout::AllNonFixedFieldsGrow - - - - Don't save on low confidence match - - - - + Don't use publication year in indentification process + + + + + 0 + 0 + + + + Save on low confidence match + + + + + + + If no issue number, assume "1" + + + diff --git a/exportwindow.ui b/exportwindow.ui index 654443c..dd37c86 100644 --- a/exportwindow.ui +++ b/exportwindow.ui @@ -10,7 +10,7 @@ 0 0 515 - 275 + 307 @@ -43,19 +43,35 @@ QFormLayout::AllNonFixedFieldsGrow - + + + + Add New Archive to ComicTagger list + + + + Delete Original RAR (Not recommended) - - - - Add New Archive to ComicTagger list + + + + Qt::Vertical - + + QSizePolicy::Fixed + + + + 20 + 5 + + + diff --git a/filenameparser.py b/filenameparser.py index 73715dc..c53e253 100644 --- a/filenameparser.py +++ b/filenameparser.py @@ -212,3 +212,6 @@ class FileNameParser: self.issue = self.issue.lstrip("0") if self.issue == "": self.issue = "0" + if self.issue[0] == ".": + self.issue = "0" + self.issue + diff --git a/fileselectionlist.py b/fileselectionlist.py index e01b651..3207e55 100644 --- a/fileselectionlist.py +++ b/fileselectionlist.py @@ -94,12 +94,12 @@ class FileSelectionList(QWidget): selectAllAction.triggered.connect(self.selectAll) removeAction.triggered.connect(self.removeSelection) - self.addAction(self.separator) self.addAction(selectAllAction) self.addAction(removeAction) + self.addAction(self.separator) def addAppAction( self, action ): - self.insertAction( self.separator , action ) + self.insertAction( None , action ) def setModifiedFlag( self, modified ): self.modifiedFlag = modified diff --git a/renamewindow.ui b/renamewindow.ui index 376679e..7a8fab4 100644 --- a/renamewindow.ui +++ b/renamewindow.ui @@ -77,17 +77,6 @@ - - - - 140 - 10 - 133 - 29 - - - - diff --git a/taggerwindow.py b/taggerwindow.py index 2613127..86e3f90 100644 --- a/taggerwindow.py +++ b/taggerwindow.py @@ -1476,10 +1476,10 @@ class TaggerWindow( QtGui.QMainWindow): return cv_md - def identifyAndTagSingleArchive( self, ca, match_results, abortOnLowConfidence, dontUseYear ): + def identifyAndTagSingleArchive( self, ca, match_results, dlg): success = False ii = IssueIdentifier( ca, self.settings ) - + # read in metadata, and parse file name if not there md = ca.readMetadata( self.save_data_style ) if md.isEmpty: @@ -1497,8 +1497,10 @@ class TaggerWindow( QtGui.QMainWindow): QtCore.QCoreApplication.processEvents() QtCore.QCoreApplication.processEvents() - if dontUseYear: + if dlg.dontUseYear: md.year = None + if dlg.assumeIssueOne and ( md.issue is None or md.issue == ""): + md.issue = "1" ii.setAdditionalMetadata( md ) ii.onlyUseAdditionalMetaData = True ii.setOutputFunction( myoutput ) @@ -1531,7 +1533,7 @@ class TaggerWindow( QtGui.QMainWindow): if choices: print "Online search: Multiple matches. Save aborted" match_results.multipleMatches.append(MultipleMatch(ca.path,matches)) - elif low_confidence and abortOnLowConfidence: + elif low_confidence and not dlg.autoSaveOnLow: print "Online search: Low confidence match. Save aborted" match_results.noMatches.append(ca.path) elif not found_match: @@ -1569,11 +1571,11 @@ class TaggerWindow( QtGui.QMainWindow): "If you auto-tag now, unsaved data in the form will be lost. Are you sure?"): return - dlg = AutoTagStartWindow( self, self.settings, + atstartdlg = AutoTagStartWindow( self, self.settings, self.tr("You have selected {0} archive(s) to automatically identify and write {1} tags to.\n\n".format(len(ca_list), MetaDataStyle.name[style]) + "Please choose options below, and select OK.\n" )) - dlg.setModal( True ) - if not dlg.exec_(): + atstartdlg.setModal( True ) + if not atstartdlg.exec_(): return @@ -1602,7 +1604,7 @@ class TaggerWindow( QtGui.QMainWindow): QtCore.QCoreApplication.processEvents() if ca.isWritable(): - success, match_results = self.identifyAndTagSingleArchive( ca, match_results, dlg.noAutoSaveOnLow, dlg.dontUseYear ) + success, match_results = self.identifyAndTagSingleArchive( ca, match_results, atstartdlg ) self.atprogdialog.close() self.fileSelectionList.updateSelectedRows() diff --git a/todo.txt b/todo.txt index 4b34cec..eb7467a 100644 --- a/todo.txt +++ b/todo.txt @@ -4,31 +4,33 @@ Features Re-arrange main form layout + New menu graphics auto tag open folder vs file Multi-file: - - File list: - Delete archive function?? - change menu order - Batch Functions: Auto-Tag Interactive dialog at end - Summary Dialog Rename check-box for rows? - manual edit the preview? + manual edit the preview? + +Docs: + Explain the style comboboxes + Basics of Batch operations + Define Manual Search - Manual + vs Auto-Identify - Uses form, doesn't save + vs Auto-Tag - Doesn't use form, saves + ----------------------------------------------------- Bugs ----------------------------------------------------- -(python:4401): GLib-ERROR **: Creating pipes for GWakeup: Too many open files - +RAR Password -- childrens crusade 3 ----------------------------------------------------- Big Future Features @@ -40,6 +42,8 @@ GCD scraper or DB reader Auto search: Searching w/o issue # +Form Mode: Single vs Batch + ----------------------------------------------------- Small(er) Future Feature -----------------------------------------------------