From 1a01cb60d99c9895895bbd4584d1b534c98b6dc6 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Wed, 30 Jan 2013 18:40:53 +0000 Subject: [PATCH] added autotag options to remove after success, and ignore leading digits git-svn-id: http://comictagger.googlecode.com/svn/trunk@375 6c5673fe-1810-88d6-992b-cd32ca31540c --- taggerwindow.py | 16 ++++++++++++++-- 1 file changed, 14 insertions(+), 2 deletions(-) diff --git a/taggerwindow.py b/taggerwindow.py index 3a2cffe..fb32b35 100644 --- a/taggerwindow.py +++ b/taggerwindow.py @@ -29,6 +29,7 @@ import os import pprint import json import webbrowser +import re from volumeselectionwindow import VolumeSelectionWindow from options import MetaDataStyle @@ -1565,7 +1566,10 @@ class TaggerWindow( QtGui.QMainWindow): # read in metadata, and parse file name if not there md = ca.readMetadata( self.save_data_style ) if md.isEmpty: - md = ca.metadataFromFilename() + md = ca.metadataFromFilename() + if dlg.ignoreLeadingDigitsInFilename and md.series is not None: + #remove all leading numbers + md.series = re.sub( "([\d.]*)(.*)", "\\2", md.series) if md is None or md.isEmpty: print "!!!!No metadata given to search online with!" @@ -1668,6 +1672,7 @@ class TaggerWindow( QtGui.QMainWindow): prog_idx = 0 match_results = OnlineMatchResults() + archives_to_remove = [] for ca in ca_list: self.autoTagLog( u"============================================================\n" ) self.autoTagLog( u"Auto-Tagging {0} of {1}\n".format(prog_idx+1, len(ca_list))) @@ -1688,8 +1693,15 @@ class TaggerWindow( QtGui.QMainWindow): if ca.isWritable(): success, match_results = self.identifyAndTagSingleArchive( ca, match_results, atstartdlg ) - self.atprogdialog.close() + if success and atstartdlg.removeAfterSuccess: + archives_to_remove.append( ca ) + + self.atprogdialog.close() + + if atstartdlg.removeAfterSuccess: + self.fileSelectionList.removeArchiveList( archives_to_remove ) self.fileSelectionList.updateSelectedRows() + self.loadArchive( self.fileSelectionList.getCurrentArchive() ) self.atprogdialog = None