From 085543321a228d68d644d3f5217d9d7563935ee2 Mon Sep 17 00:00:00 2001
From: Timmy Welch <timmy@narnian.us>
Date: Mon, 22 Jan 2024 16:45:52 -0800
Subject: [PATCH] cbxClearFormBeforePopulating not working

---
 comictaggerlib/cli.py                          | 4 ++--
 comictaggerlib/ctsettings/file.py              | 1 -
 comictaggerlib/ctsettings/settngs_namespace.py | 2 +-
 comictaggerlib/settingswindow.py               | 2 ++
 comictaggerlib/taggerwindow.py                 | 2 +-
 5 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 5ac91c7..561a6a3 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -180,7 +180,7 @@ class CLI:
                 ca = ComicArchive(match_set.original_path)
                 md = self.create_local_metadata(ca)
                 ct_md = self.actual_issue_data_fetch(match_set.online_results[int(i) - 1].issue_id)
-                if self.config.Issue_Identifier__clear_metadata_on_import:
+                if self.config.Issue_Identifier__clear_metadata:
                     md = ct_md
                 else:
                     notes = (
@@ -552,7 +552,7 @@ class CLI:
                     match_results.fetch_data_failures.append(res)
                     return res
 
-            if self.config.Issue_Identifier__clear_metadata_on_import:
+            if self.config.Issue_Identifier__clear_metadata:
                 md = GenericMetadata()
 
             notes = (
diff --git a/comictaggerlib/ctsettings/file.py b/comictaggerlib/ctsettings/file.py
index c5f459e..8cca837 100644
--- a/comictaggerlib/ctsettings/file.py
+++ b/comictaggerlib/ctsettings/file.py
@@ -58,7 +58,6 @@ def identifier(parser: settngs.Manager) -> None:
         "--clear-metadata",
         default=False,
         help="Clears all existing metadata during import, default is to merge metadata.\nMay be used in conjunction with -o, -f and -m.\n\n",
-        dest="clear_metadata_on_import",
         action=argparse.BooleanOptionalAction,
     )
     parser.add_setting(
diff --git a/comictaggerlib/ctsettings/settngs_namespace.py b/comictaggerlib/ctsettings/settngs_namespace.py
index 2f2e89b..c469543 100644
--- a/comictaggerlib/ctsettings/settngs_namespace.py
+++ b/comictaggerlib/ctsettings/settngs_namespace.py
@@ -53,7 +53,7 @@ class settngs_namespace(settngs.TypedNS):
     Issue_Identifier__border_crop_percent: int
     Issue_Identifier__publisher_filter: list[str]
     Issue_Identifier__series_match_search_thresh: int
-    Issue_Identifier__clear_metadata_on_import: bool
+    Issue_Identifier__clear_metadata: bool
     Issue_Identifier__auto_imprint: bool
     Issue_Identifier__sort_series_by_year: bool
     Issue_Identifier__exact_series_matches_first: bool
diff --git a/comictaggerlib/settingswindow.py b/comictaggerlib/settingswindow.py
index a5d5df7..2a66a7c 100644
--- a/comictaggerlib/settingswindow.py
+++ b/comictaggerlib/settingswindow.py
@@ -390,6 +390,7 @@ class SettingsWindow(QtWidgets.QDialog):
         self.cbxUseFilter.setChecked(self.config[0].Issue_Identifier__always_use_publisher_filter)
         self.cbxSortByYear.setChecked(self.config[0].Issue_Identifier__sort_series_by_year)
         self.cbxExactMatches.setChecked(self.config[0].Issue_Identifier__exact_series_matches_first)
+        self.cbxClearFormBeforePopulating.setChecked(self.config[0].Issue_Identifier__clear_metadata)
 
         self.cbxAssumeLoneCreditIsPrimary.setChecked(self.config[0].Comic_Book_Lover__assume_lone_credit_is_primary)
         self.cbxCopyCharactersToTags.setChecked(self.config[0].Comic_Book_Lover__copy_characters_to_tags)
@@ -507,6 +508,7 @@ class SettingsWindow(QtWidgets.QDialog):
         self.config[0].Issue_Identifier__always_use_publisher_filter = self.cbxUseFilter.isChecked()
         self.config[0].Issue_Identifier__sort_series_by_year = self.cbxSortByYear.isChecked()
         self.config[0].Issue_Identifier__exact_series_matches_first = self.cbxExactMatches.isChecked()
+        self.config[0].Issue_Identifier__clear_metadata = self.cbxClearFormBeforePopulating.isChecked()
 
         self.config[0].Comic_Book_Lover__assume_lone_credit_is_primary = self.cbxAssumeLoneCreditIsPrimary.isChecked()
         self.config[0].Comic_Book_Lover__copy_characters_to_tags = self.cbxCopyCharactersToTags.isChecked()
diff --git a/comictaggerlib/taggerwindow.py b/comictaggerlib/taggerwindow.py
index c59cd83..88c8e55 100644
--- a/comictaggerlib/taggerwindow.py
+++ b/comictaggerlib/taggerwindow.py
@@ -1118,7 +1118,7 @@ class TaggerWindow(QtWidgets.QMainWindow):
                     if self.config[0].Comic_Book_Lover__apply_transform_on_import:
                         new_metadata = CBLTransformer(new_metadata, self.config[0]).apply()
 
-                    if self.config[0].Issue_Identifier__clear_metadata_on_import:
+                    if self.config[0].Issue_Identifier__clear_metadata:
                         self.clear_form()
 
                     notes = (