From 9a64195ebdd4e9d9d2fa0fd6d1763e89369b6d14 Mon Sep 17 00:00:00 2001 From: "beville@gmail.com" Date: Tue, 8 Apr 2014 07:10:18 +0000 Subject: [PATCH] Decouple comicarchive from settings git-svn-id: http://comictagger.googlecode.com/svn/trunk@706 6c5673fe-1810-88d6-992b-cd32ca31540c --- comictaggerlib/cli.py | 4 ++-- comictaggerlib/renamewindow.py | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py index 0530a8c..ee10725 100644 --- a/comictaggerlib/cli.py +++ b/comictaggerlib/cli.py @@ -115,7 +115,7 @@ def display_match_set_for_choice( label, match_set, opts, settings ): i = int(i) - 1 # save the data! # we know at this point, that the file is all good to go - ca = ComicArchive( match_set.filename, settings ) + ca = ComicArchive( match_set.filename, 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 ) @@ -209,7 +209,7 @@ def process_file_cli( filename, opts, settings, match_results ): batch_mode = len( opts.file_list ) > 1 - ca = ComicArchive(filename, settings) + ca = ComicArchive(filename, settings.rar_exe_path) if not os.path.lexists( filename ): print >> sys.stderr,"Cannot find "+ filename diff --git a/comictaggerlib/renamewindow.py b/comictaggerlib/renamewindow.py index 5244e09..0495fd9 100644 --- a/comictaggerlib/renamewindow.py +++ b/comictaggerlib/renamewindow.py @@ -72,7 +72,7 @@ class RenameWindow(QtGui.QDialog): md = ca.readMetadata(self.data_style) if md.isEmpty: - md = ca.metadataFromFilename() + md = ca.metadataFromFilename(self.settings.parse_scan_info) self.renamer.setMetadata( md ) new_name = self.renamer.determineName( ca.path, ext=new_ext )