diff --git a/comictaggerlib/settings.py b/comictaggerlib/settings.py index 9ba3d86..9cdc949 100644 --- a/comictaggerlib/settings.py +++ b/comictaggerlib/settings.py @@ -359,6 +359,8 @@ class ComicTaggerSettings: self.config.set("identifier", "id_publisher_filter", self.id_publisher_filter) self.config.set("identifier", "always_use_publisher_filter", self.always_use_publisher_filter) + self.config.set("identifier", "comic_info_source", self.comic_info_source) + if not self.config.has_section("dialogflags"): self.config.add_section("dialogflags") @@ -381,7 +383,6 @@ class ComicTaggerSettings: self.config.set("comic_source_general", "clear_form_before_populating", self.clear_form_before_populating) self.config.set("comic_source_general", "sort_series_by_year", self.sort_series_by_year) self.config.set("comic_source_general", "exact_series_matches_first", self.exact_series_matches_first) - self.config.set("comic_source_general", "comic_info_source", self.comic_info_source) if not self.config.has_section("cbl_transform"): self.config.add_section("cbl_transform") diff --git a/comictaggerlib/settingswindow.py b/comictaggerlib/settingswindow.py index c056a8f..6400574 100644 --- a/comictaggerlib/settingswindow.py +++ b/comictaggerlib/settingswindow.py @@ -404,8 +404,8 @@ class SettingsWindow(QtWidgets.QDialog): self.settings.id_publisher_filter = str(self.tePublisherFilter.toPlainText()) self.settings.comic_info_source = str(self.cobxInfoSource.itemData(self.cobxInfoSource.currentIndex())) # Also change current talker_api object - # TODO - # self.talker_api.source = self.settings.comic_info_source + if self.settings.comic_info_source != self.talker_api.source_details.id: + self.talker_api = ct_api.get_comic_talker(self.settings.comic_info_source)() self.settings.complicated_parser = self.cbxComplicatedParser.isChecked() self.settings.remove_c2c = self.cbxRemoveC2C.isChecked() diff --git a/comictalker/talker_utils.py b/comictalker/talker_utils.py index be79429..4e8fac8 100644 --- a/comictalker/talker_utils.py +++ b/comictalker/talker_utils.py @@ -49,7 +49,11 @@ def map_comic_issue_to_metadata( if issue_results["volume"].get("publisher"): metadata.publisher = utils.xlate(issue_results["volume"]["publisher"]) - metadata.day, metadata.month, metadata.year = utils.parse_date_str(issue_results["cover_date"]) + + if issue_results.get("cover_date"): + metadata.day, metadata.month, metadata.year = utils.parse_date_str(issue_results["cover_date"]) + elif issue_results["volume"].get("start_year"): + metadata.year = utils.xlate(issue_results["volume"]["start_year"], True) metadata.comments = cleanup_html(issue_results["description"], remove_html_tables) if use_year_volume: