diff --git a/comictagger.py b/comictagger.py
index af427b1..fe19ee5 100755
--- a/comictagger.py
+++ b/comictagger.py
@@ -229,7 +229,7 @@ def process_file_cli( filename, opts, settings ):
# now get the particular issue data
try:
- cv_md = ComicVineTalker().fetchIssueData( matches[0]['volume_id'], matches[0]['issue_number'] )
+ cv_md = ComicVineTalker().fetchIssueData( matches[0]['volume_id'], matches[0]['issue_number'], settings.assume_lone_credit_is_primary )
except ComicVineTalkerException:
print "Network error while getting issue details. Save aborted"
return
diff --git a/comicvinetalker.py b/comicvinetalker.py
index 080f415..52792e6 100644
--- a/comicvinetalker.py
+++ b/comicvinetalker.py
@@ -226,7 +226,6 @@ class ComicVineTalker(QObject):
role_name = role['role'].title()
metadata.addCredit( person['name'], role['role'].title(), False )
- assumeLoneCreditIsPrimary = True
if assumeLoneCreditIsPrimary:
def setLonePrimary( role ):
lone_credit = None
diff --git a/settings.py b/settings.py
index 6c9ab24..ff56e07 100644
--- a/settings.py
+++ b/settings.py
@@ -67,7 +67,7 @@ class ComicTaggerSettings:
self.show_disclaimer = True
# Comic Vine settings
- self.assumeLoneCreditIsPrimary = False
+ self.assume_lone_credit_is_primary = False
def __init__(self):
@@ -146,8 +146,8 @@ class ComicTaggerSettings:
if self.config.has_option('dialogflags', 'show_disclaimer'):
self.show_disclaimer = self.config.getboolean( 'dialogflags', 'show_disclaimer' )
- if self.config.has_option('comicvine', 'assumeLoneCreditIsPrimary'):
- self.ask_about_cbi_in_rar = self.config.getboolean( 'comicvine', 'assumeLoneCreditIsPrimary' )
+ if self.config.has_option('comicvine', 'assume_lone_credit_is_primary'):
+ self.assume_lone_credit_is_primary = self.config.getboolean( 'comicvine', 'assume_lone_credit_is_primary' )
def save( self ):
@@ -183,7 +183,7 @@ class ComicTaggerSettings:
if not self.config.has_section( 'comicvine' ):
self.config.add_section( 'comicvine' )
- self.config.set( 'comicvine', 'assumeLoneCreditIsPrimary', self.assumeLoneCreditIsPrimary )
+ self.config.set( 'comicvine', 'assume_lone_credit_is_primary', self.assume_lone_credit_is_primary )
with open( self.settings_file, 'wb') as configfile:
diff --git a/settingswindow.py b/settingswindow.py
index c441ea4..99aba67 100644
--- a/settingswindow.py
+++ b/settingswindow.py
@@ -111,6 +111,9 @@ class SettingsWindow(QtGui.QDialog):
self.leNameLengthDeltaThresh.setText( str(self.settings.id_length_delta_thresh) )
self.tePublisherBlacklist.setPlainText( self.settings.id_publisher_blacklist )
+ if self.settings.assume_lone_credit_is_primary:
+ self.cbxAssumeLoneCreditIsPrimary.setCheckState( QtCore.Qt.Checked)
+
def accept( self ):
# Copy values from form to settings and save
@@ -126,6 +129,7 @@ class SettingsWindow(QtGui.QDialog):
self.settings.id_length_delta_thresh = int(self.leNameLengthDeltaThresh.text())
self.settings.id_publisher_blacklist = str(self.tePublisherBlacklist.toPlainText())
+ self.settings.assume_lone_credit_is_primary = self.cbxAssumeLoneCreditIsPrimary.isChecked()
self.settings.save()
QtGui.QDialog.accept(self)
diff --git a/settingswindow.ui b/settingswindow.ui
index 37f50ca..a150a99 100644
--- a/settingswindow.ui
+++ b/settingswindow.ui
@@ -301,6 +301,24 @@
+
+
+ Comic Vine
+
+
+
+
+ 50
+ 30
+ 241
+ 20
+
+
+
+ Assume Lone Credit Is Primary
+
+
+
-
diff --git a/taggerwindow.py b/taggerwindow.py
index 12b5f34..5ab20b6 100644
--- a/taggerwindow.py
+++ b/taggerwindow.py
@@ -789,7 +789,7 @@ class TaggerWindow( QtGui.QMainWindow):
try:
comicVine = ComicVineTalker( )
- new_metadata = comicVine.fetchIssueData( selector.volume_id, selector.issue_number )
+ new_metadata = comicVine.fetchIssueData( selector.volume_id, selector.issue_number, self.settings.assume_lone_credit_is_primary )
except ComicVineTalkerException:
QtGui.QApplication.restoreOverrideCursor()
QtGui.QMessageBox.critical(self, self.tr("Network Issue"), self.tr("Could not connect to ComicVine to get issue details!"))