diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py index 7148fac..f49c2fa 100644 --- a/comictaggerlib/autotagmatchwindow.py +++ b/comictaggerlib/autotagmatchwindow.py @@ -54,13 +54,13 @@ class AutoTagMatchWindow(QtWidgets.QDialog): self.current_match_set: Result = match_set_list[0] self.altCoverWidget = CoverImageWidget( - self.altCoverContainer, CoverImageWidget.AltCoverMode, config.Runtime_Options__config.user_cache_dir, talker + self.altCoverContainer, CoverImageWidget.AltCoverMode, config.Runtime_Options__config.user_cache_dir ) gridlayout = QtWidgets.QGridLayout(self.altCoverContainer) gridlayout.addWidget(self.altCoverWidget) gridlayout.setContentsMargins(0, 0, 0, 0) - self.archiveCoverWidget = CoverImageWidget(self.archiveCoverContainer, CoverImageWidget.ArchiveMode, None, None) + self.archiveCoverWidget = CoverImageWidget(self.archiveCoverContainer, CoverImageWidget.ArchiveMode, None) gridlayout = QtWidgets.QGridLayout(self.archiveCoverContainer) gridlayout.addWidget(self.archiveCoverWidget) gridlayout.setContentsMargins(0, 0, 0, 0) diff --git a/comictaggerlib/autotagprogresswindow.py b/comictaggerlib/autotagprogresswindow.py index bd6b850..04b8209 100644 --- a/comictaggerlib/autotagprogresswindow.py +++ b/comictaggerlib/autotagprogresswindow.py @@ -36,14 +36,12 @@ class AutoTagProgressWindow(QtWidgets.QDialog): self.lblSourceName.setText(talker.attribution) - self.archiveCoverWidget = CoverImageWidget( - self.archiveCoverContainer, CoverImageWidget.DataMode, None, None, False - ) + self.archiveCoverWidget = CoverImageWidget(self.archiveCoverContainer, CoverImageWidget.DataMode, None, False) gridlayout = QtWidgets.QGridLayout(self.archiveCoverContainer) gridlayout.addWidget(self.archiveCoverWidget) gridlayout.setContentsMargins(0, 0, 0, 0) - self.testCoverWidget = CoverImageWidget(self.testCoverContainer, CoverImageWidget.DataMode, None, None, False) + self.testCoverWidget = CoverImageWidget(self.testCoverContainer, CoverImageWidget.DataMode, None, False) gridlayout = QtWidgets.QGridLayout(self.testCoverContainer) gridlayout.addWidget(self.testCoverWidget) gridlayout.setContentsMargins(0, 0, 0, 0) diff --git a/comictaggerlib/coverimagewidget.py b/comictaggerlib/coverimagewidget.py index 84e97c6..d11dbd6 100644 --- a/comictaggerlib/coverimagewidget.py +++ b/comictaggerlib/coverimagewidget.py @@ -31,7 +31,6 @@ from comictaggerlib.imagepopup import ImagePopup from comictaggerlib.pageloader import PageLoader from comictaggerlib.ui import ui_path from comictaggerlib.ui.qtutils import get_qimage_from_data -from comictalker.comictalker import ComicTalker logger = logging.getLogger(__name__) @@ -67,7 +66,6 @@ class CoverImageWidget(QtWidgets.QWidget): parent: QtWidgets.QWidget, mode: int, cache_folder: pathlib.Path | None, - talker: ComicTalker | None, blur: bool = False, expand_on_click: bool = True, ) -> None: diff --git a/comictaggerlib/issueidentifier.py b/comictaggerlib/issueidentifier.py index 4165b0c..8605d20 100644 --- a/comictaggerlib/issueidentifier.py +++ b/comictaggerlib/issueidentifier.py @@ -119,7 +119,6 @@ class IssueIdentifier: self.progress_callback: Callable[[int, int], None] | None = None self.cover_url_callback: Callable[[bytes], None] | None = None self.search_result = self.result_no_matches - self.cover_page_index = 0 self.cancel = False self.match_list: list[IssueResult] = [] diff --git a/comictaggerlib/issueselectionwindow.py b/comictaggerlib/issueselectionwindow.py index 828b8d5..c2b14ae 100644 --- a/comictaggerlib/issueselectionwindow.py +++ b/comictaggerlib/issueselectionwindow.py @@ -57,7 +57,6 @@ class IssueSelectionWindow(QtWidgets.QDialog): self.coverImageContainer, CoverImageWidget.AltCoverMode, config.Runtime_Options__config.user_cache_dir, - talker, ) gridlayout = QtWidgets.QGridLayout(self.coverImageContainer) gridlayout.addWidget(self.coverWidget) @@ -83,7 +82,6 @@ class IssueSelectionWindow(QtWidgets.QDialog): self.issue_id: str = "" self.config = config self.talker = talker - self.url_fetch_thread = None self.issue_list: dict[str, GenericMetadata] = {} # Display talker logo and set url @@ -93,7 +91,6 @@ class IssueSelectionWindow(QtWidgets.QDialog): self.imageIssuesSourceLogo, CoverImageWidget.URLMode, config.Runtime_Options__config.user_cache_dir, - talker, False, ) self.imageIssuesSourceWidget.showControls = False diff --git a/comictaggerlib/matchselectionwindow.py b/comictaggerlib/matchselectionwindow.py index fe334cc..d03b84e 100644 --- a/comictaggerlib/matchselectionwindow.py +++ b/comictaggerlib/matchselectionwindow.py @@ -46,13 +46,13 @@ class MatchSelectionWindow(QtWidgets.QDialog): uic.loadUi(uifile, self) self.altCoverWidget = CoverImageWidget( - self.altCoverContainer, CoverImageWidget.AltCoverMode, config.Runtime_Options__config.user_cache_dir, talker + self.altCoverContainer, CoverImageWidget.AltCoverMode, config.Runtime_Options__config.user_cache_dir ) gridlayout = QtWidgets.QGridLayout(self.altCoverContainer) gridlayout.addWidget(self.altCoverWidget) gridlayout.setContentsMargins(0, 0, 0, 0) - self.archiveCoverWidget = CoverImageWidget(self.archiveCoverContainer, CoverImageWidget.ArchiveMode, None, None) + self.archiveCoverWidget = CoverImageWidget(self.archiveCoverContainer, CoverImageWidget.ArchiveMode, None) gridlayout = QtWidgets.QGridLayout(self.archiveCoverContainer) gridlayout.addWidget(self.archiveCoverWidget) gridlayout.setContentsMargins(0, 0, 0, 0) diff --git a/comictaggerlib/pagebrowser.py b/comictaggerlib/pagebrowser.py index 4316d36..d08dcbe 100644 --- a/comictaggerlib/pagebrowser.py +++ b/comictaggerlib/pagebrowser.py @@ -35,7 +35,7 @@ class PageBrowserWindow(QtWidgets.QDialog): with (ui_path / "pagebrowser.ui").open(encoding="utf-8") as uifile: uic.loadUi(uifile, self) - self.pageWidget = CoverImageWidget(self.pageContainer, CoverImageWidget.ArchiveMode, None, None) + self.pageWidget = CoverImageWidget(self.pageContainer, CoverImageWidget.ArchiveMode, None) gridlayout = QtWidgets.QGridLayout(self.pageContainer) gridlayout.addWidget(self.pageWidget) gridlayout.setContentsMargins(0, 0, 0, 0) diff --git a/comictaggerlib/pagelisteditor.py b/comictaggerlib/pagelisteditor.py index 4e22c74..bd39b4e 100644 --- a/comictaggerlib/pagelisteditor.py +++ b/comictaggerlib/pagelisteditor.py @@ -81,7 +81,7 @@ class PageListEditor(QtWidgets.QWidget): "pages": self, } - self.pageWidget = CoverImageWidget(self.pageContainer, CoverImageWidget.ArchiveMode, None, None) + self.pageWidget = CoverImageWidget(self.pageContainer, CoverImageWidget.ArchiveMode, None) gridlayout = QtWidgets.QGridLayout(self.pageContainer) gridlayout.addWidget(self.pageWidget) gridlayout.setContentsMargins(0, 0, 0, 0) diff --git a/comictaggerlib/seriesselectionwindow.py b/comictaggerlib/seriesselectionwindow.py index 09f4dad..c21d4d3 100644 --- a/comictaggerlib/seriesselectionwindow.py +++ b/comictaggerlib/seriesselectionwindow.py @@ -106,7 +106,6 @@ class SeriesSelectionWindow(QtWidgets.QDialog): issue_number: str, year: int | None, issue_count: int | None, - cover_index_list: list[int], comic_archive: ComicArchive | None, config: ct_ns, talker: ComicTalker, @@ -119,7 +118,7 @@ class SeriesSelectionWindow(QtWidgets.QDialog): uic.loadUi(uifile, self) self.imageWidget = CoverImageWidget( - self.imageContainer, CoverImageWidget.URLMode, config.Runtime_Options__config.user_cache_dir, talker + self.imageContainer, CoverImageWidget.URLMode, config.Runtime_Options__config.user_cache_dir ) gridlayout = QtWidgets.QGridLayout(self.imageContainer) gridlayout.addWidget(self.imageWidget) @@ -147,7 +146,6 @@ class SeriesSelectionWindow(QtWidgets.QDialog): self.series_id: str = "" self.comic_archive = comic_archive self.immediate_autoselect = autoselect - self.cover_index_list = cover_index_list self.series_list: dict[str, ComicSeries] = {} self.literal = literal self.ii: IssueIdentifier | None = None @@ -168,7 +166,6 @@ class SeriesSelectionWindow(QtWidgets.QDialog): self.imageSourceLogo, CoverImageWidget.URLMode, config.Runtime_Options__config.user_cache_dir, - talker, False, ) self.imageSourceWidget.showControls = False diff --git a/comictaggerlib/taggerwindow.py b/comictaggerlib/taggerwindow.py index b060bcb..6205cce 100644 --- a/comictaggerlib/taggerwindow.py +++ b/comictaggerlib/taggerwindow.py @@ -179,7 +179,7 @@ class TaggerWindow(QtWidgets.QMainWindow): ) sys.exit() - self.archiveCoverWidget = CoverImageWidget(self.coverImageContainer, CoverImageWidget.ArchiveMode, None, None) + self.archiveCoverWidget = CoverImageWidget(self.coverImageContainer, CoverImageWidget.ArchiveMode, None) grid_layout = QtWidgets.QGridLayout(self.coverImageContainer) grid_layout.addWidget(self.archiveCoverWidget) grid_layout.setContentsMargins(0, 0, 0, 0) @@ -1029,14 +1029,12 @@ class TaggerWindow(QtWidgets.QMainWindow): issue_count = utils.xlate_int(self.leIssueCount.text()) - cover_index_list = self.metadata.get_cover_page_index_list() selector = SeriesSelectionWindow( self, series_name, issue_number, year, issue_count, - cover_index_list, self.comic_archive, self.config[0], self.current_talker(), @@ -2147,7 +2145,7 @@ class TaggerWindow(QtWidgets.QMainWindow): def check_latest_version_online(self) -> None: version_checker = VersionChecker() - self.version_check_complete(version_checker.get_latest_version(self.config[0].internal__install_id)) + self.version_check_complete(version_checker.get_latest_version()) def version_check_complete(self, new_version: tuple[str, str]) -> None: if new_version[0] not in (self.version, self.config[0].Dialog_Flags__dont_notify_about_this_version): diff --git a/comictaggerlib/ui/talkeruigenerator.py b/comictaggerlib/ui/talkeruigenerator.py index 18630e5..94bd4a0 100644 --- a/comictaggerlib/ui/talkeruigenerator.py +++ b/comictaggerlib/ui/talkeruigenerator.py @@ -202,7 +202,6 @@ def generate_talker_info(talker: ComicTalker, config: settngs.Config[ct_ns], lay talker_info_layout.parentWidget(), CoverImageWidget.URLMode, config.values.Runtime_Options__config.user_cache_dir, - talker, False, ) logo.showControls = False diff --git a/comictaggerlib/versionchecker.py b/comictaggerlib/versionchecker.py index e1c4fc4..b9ac637 100644 --- a/comictaggerlib/versionchecker.py +++ b/comictaggerlib/versionchecker.py @@ -29,15 +29,15 @@ logger = logging.getLogger(__name__) class VersionChecker: - def get_request_url(self, uuid: str) -> tuple[str, dict[str, str]]: + def get_request_url(self) -> tuple[str, dict[str, str]]: base_url = "https://api.github.com/repos/comictagger/comictagger/releases/latest" params: dict[str, str] = {} return base_url, params - def get_latest_version(self, uuid: str) -> tuple[str, str]: + def get_latest_version(self) -> tuple[str, str]: try: - url, params = self.get_request_url(uuid) + url, params = self.get_request_url() release = requests.get( url, params=params,