lordwelch/comictagger
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'mizaki-talkeruigen_fix' into develop

Browse Source
This commit is contained in:
Timmy Welch 2023-02-28 11:49:27 -08:00
commit 428879120a
No known key found for this signature in database
5 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
comictaggerlib/autotagstartwindow.py
View File

@ -49,7 +49,7 @@ class AutoTagStartWindow(QtWidgets.QDialog):
self.cbxIgnoreLeadingDigitsInFilename.setChecked(self.config.autotag_ignore_leading_numbers_in_filename)
self.cbxRemoveAfterSuccess.setChecked(self.config.autotag_remove_archive_after_successful_match)
self.cbxWaitForRateLimit.setChecked(self.config.autotag_wait_and_retry_on_rate_limit)
self.cbxAutoImprint.setChecked(self.config.talker_auto_imprint)
self.cbxAutoImprint.setChecked(self.config.identifier_auto_imprint)
nlmt_tip = """<html>The <b>Name Match Ratio Threshold: Auto-Identify</b> is for eliminating automatic
search matches that are too long compared to your series name search. The lower
@ -75,7 +75,7 @@ class AutoTagStartWindow(QtWidgets.QDialog):
self.remove_after_success = False
self.wait_and_retry_on_rate_limit = False
self.search_string = ""
self.name_length_match_tolerance = self.config.talker_series_match_search_thresh
self.name_length_match_tolerance = self.config.identifier_series_match_search_thresh
self.split_words = self.cbxSplitWords.isChecked()
def search_string_toggle(self) -> None:

8
comictaggerlib/cli.py
View File

@ -114,7 +114,7 @@ class CLI:
ca = match_set.ca
md = self.create_local_metadata(ca)
ct_md = self.actual_issue_data_fetch(match_set.matches[int(i) - 1]["issue_id"])
if self.config.talker_clear_metadata_on_import:
if self.config.identifier_clear_metadata_on_import:
md = ct_md
else:
notes = (
@ -123,7 +123,7 @@ class CLI:
)
md.overlay(ct_md.replace(notes=utils.combine_notes(md.notes, notes, "Tagged with ComicTagger")))
if self.config.talker_auto_imprint:
if self.config.identifier_auto_imprint:
md.fix_publisher()
self.actual_metadata_save(ca, md)
@ -427,7 +427,7 @@ class CLI:
match_results.fetch_data_failures.append(str(ca.path.absolute()))
return
if self.config.talker_clear_metadata_on_import:
if self.config.identifier_clear_metadata_on_import:
md = ct_md
else:
notes = (
@ -436,7 +436,7 @@ class CLI:
)
md.overlay(ct_md.replace(notes=utils.combine_notes(md.notes, notes, "Tagged with ComicTagger")))
if self.config.talker_auto_imprint:
if self.config.identifier_auto_imprint:
md.fix_publisher()
# ok, done building our metadata. time to save

8
comictaggerlib/seriesselectionwindow.py
View File

@ -151,7 +151,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
self.progdialog: QtWidgets.QProgressDialog | None = None
self.search_thread: SearchThread | None = None
self.use_filter = self.config.talker_always_use_publisher_filter
self.use_filter = self.config.identifier_always_use_publisher_filter
# Load to retrieve settings
self.talker = talker
@ -336,7 +336,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
def perform_query(self, refresh: bool = False) -> None:
self.search_thread = SearchThread(
self.talker, self.series_name, refresh, self.literal, self.config.talker_series_match_search_thresh
self.talker, self.series_name, refresh, self.literal, self.config.identifier_series_match_search_thresh
)
self.search_thread.searchComplete.connect(self.search_complete)
self.search_thread.progressUpdate.connect(self.search_progress_update)
@ -403,7 +403,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
# compare as str in case extra chars ie. '1976?'
# - missing (none) values being converted to 'None' - consistent with prior behaviour in v1.2.3
# sort by start_year if set
if self.config.talker_sort_series_by_year:
if self.config.identifier_sort_series_by_year:
try:
self.ct_search_results = sorted(
self.ct_search_results,
@ -421,7 +421,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog):
logger.exception("bad data error sorting results by count_of_issues")
# move sanitized matches to the front
if self.config.talker_exact_series_matches_first:
if self.config.identifier_exact_series_matches_first:
try:
sanitized = utils.sanitize_title(self.series_name, False).casefold()
sanitized_no_articles = utils.sanitize_title(self.series_name, True).casefold()

4
comictaggerlib/taggerwindow.py
View File

@ -1071,7 +1071,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
if self.config[0].cbl_apply_transform_on_import:
new_metadata = CBLTransformer(new_metadata, self.config[0]).apply()
if self.config[0].talker_clear_form_before_populating:
if self.config[0].identifier_clear_form_before_populating:
self.clear_form()
notes = (
@ -1785,7 +1785,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
)
md.overlay(ct_md.replace(notes=utils.combine_notes(md.notes, notes, "Tagged with ComicTagger")))
if self.config[0].talker_auto_imprint:
if self.config[0].identifier_auto_imprint:
md.fix_publisher()
if not ca.write_metadata(md, self.save_data_style):

2
comictaggerlib/ui/talkeruigenerator.py
View File

@ -219,7 +219,7 @@ def generate_source_option_tabs(
# option.type of None should be string
elif (option.type is None and option.action is None) or option.type is str:
current_widget = generate_textbox(option, layout_grid)
sources["tabs"][tab_name]("widget")[option.internal_name] = current_widget
sources["tabs"][tab_name].widgets[option.internal_name] = current_widget
else:
logger.debug(f"Unsupported talker option found. Name: {option.internal_name} Type: {option.type}")