2015-02-21 18:30:32 -08:00
|
|
|
"""A PyQT4 dialog to select specific series/volume from list"""
|
2024-01-29 09:14:25 -08:00
|
|
|
|
2022-06-02 18:32:16 -07:00
|
|
|
#
|
2023-02-16 17:23:13 -08:00
|
|
|
# Copyright 2012-2014 ComicTagger Authors
|
2022-06-02 18:32:16 -07:00
|
|
|
#
|
2015-02-21 18:30:32 -08:00
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
|
|
# you may not use this file except in compliance with the License.
|
|
|
|
# You may obtain a copy of the License at
|
2022-06-02 18:32:16 -07:00
|
|
|
#
|
2015-02-21 18:30:32 -08:00
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
2022-06-02 18:32:16 -07:00
|
|
|
#
|
2015-02-21 18:30:32 -08:00
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
|
|
# See the License for the specific language governing permissions and
|
|
|
|
# limitations under the License.
|
2022-06-02 18:32:16 -07:00
|
|
|
from __future__ import annotations
|
2012-11-06 12:56:30 -08:00
|
|
|
|
2022-06-07 11:49:56 -07:00
|
|
|
import itertools
|
2022-04-04 18:59:26 -07:00
|
|
|
import logging
|
2025-01-14 17:41:00 -08:00
|
|
|
from abc import ABCMeta, abstractmethod
|
2022-06-07 11:49:56 -07:00
|
|
|
from collections import deque
|
2015-02-13 15:08:07 -08:00
|
|
|
|
Convert ComicIssue into GenericMetadata
I could not find a good reason for ComicIssue to exist other than that
it had more attributes than GenericMetadata, so it has been replaced.
New attributes for GenericMetadata:
series_id: a string uniquely identifying the series to tag_origin
series_aliases: alternate series names that are not the canonical name
title_aliases: alternate issue titles that are not the canonical name
alternate_images: a list of urls to alternate cover images
Updated attributes for GenericMetadata:
genre -> genres: str -> list[str]
comments -> description: str -> str
story_arc -> story_arcs: str -> list[str]
series_group -> series_groups: str -> list[str]
character -> characters: str -> list[str]
team -> teams: str -> list[str]
location -> locations: str -> list[str]
tag_origin -> tag_origin: str -> TagOrigin (tuple[str, str])
ComicSeries has been relocated to the ComicAPI package, currently has no
usage within ComicAPI.
CreditMetadata has been renamed to Credit and has replaced Credit from
ComicTalker.
fetch_series has been added to ComicTalker, this is currently only used
in the GUI when a series is selected and does not already contain the
needed fields, this function should always be cached.
A new split function has been added to ComicAPI, all uses of split on
single characters have been updated to use this
cleanup_html and the corresponding setting are now only used in
ComicTagger proper, for display we want any html directly from the
upstream. When applying the metadata we then strip the description of
any html.
A new conversion has been added to the MetadataFormatter:
j: joins any lists into a string with ', '. Note this is a valid
operation on strings as well, it will add ', ' in between every
character.
parse_settings now assigns the given ComicTaggerPaths object to the
result ensuring that the correct path is always used.
2023-08-02 09:00:04 -07:00
|
|
|
import natsort
|
2022-07-13 19:56:34 -07:00
|
|
|
from PyQt5 import QtCore, QtGui, QtWidgets, uic
|
2023-07-01 23:29:38 -07:00
|
|
|
from PyQt5.QtCore import QUrl, pyqtSignal
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
|
|
|
|
from comicapi import utils
|
2022-05-17 13:57:04 -07:00
|
|
|
from comicapi.comicarchive import ComicArchive
|
Convert ComicIssue into GenericMetadata
I could not find a good reason for ComicIssue to exist other than that
it had more attributes than GenericMetadata, so it has been replaced.
New attributes for GenericMetadata:
series_id: a string uniquely identifying the series to tag_origin
series_aliases: alternate series names that are not the canonical name
title_aliases: alternate issue titles that are not the canonical name
alternate_images: a list of urls to alternate cover images
Updated attributes for GenericMetadata:
genre -> genres: str -> list[str]
comments -> description: str -> str
story_arc -> story_arcs: str -> list[str]
series_group -> series_groups: str -> list[str]
character -> characters: str -> list[str]
team -> teams: str -> list[str]
location -> locations: str -> list[str]
tag_origin -> tag_origin: str -> TagOrigin (tuple[str, str])
ComicSeries has been relocated to the ComicAPI package, currently has no
usage within ComicAPI.
CreditMetadata has been renamed to Credit and has replaced Credit from
ComicTalker.
fetch_series has been added to ComicTalker, this is currently only used
in the GUI when a series is selected and does not already contain the
needed fields, this function should always be cached.
A new split function has been added to ComicAPI, all uses of split on
single characters have been updated to use this
cleanup_html and the corresponding setting are now only used in
ComicTagger proper, for display we want any html directly from the
upstream. When applying the metadata we then strip the description of
any html.
A new conversion has been added to the MetadataFormatter:
j: joins any lists into a string with ', '. Note this is a valid
operation on strings as well, it will add ', ' in between every
character.
parse_settings now assigns the given ComicTaggerPaths object to the
result ensuring that the correct path is always used.
2023-08-02 09:00:04 -07:00
|
|
|
from comicapi.genericmetadata import ComicSeries, GenericMetadata
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
from comictaggerlib.coverimagewidget import CoverImageWidget
|
2023-06-09 16:20:00 -07:00
|
|
|
from comictaggerlib.ctsettings import ct_ns
|
2024-12-09 23:00:36 -08:00
|
|
|
from comictaggerlib.ctsettings.settngs_namespace import SettngsNS
|
|
|
|
from comictaggerlib.issueidentifier import IssueIdentifier, IssueIdentifierOptions
|
|
|
|
from comictaggerlib.issueidentifier import Result as IIResult
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
from comictaggerlib.matchselectionwindow import MatchSelectionWindow
|
|
|
|
from comictaggerlib.progresswindow import IDProgressWindow
|
2024-02-23 20:47:04 -08:00
|
|
|
from comictaggerlib.resulttypes import IssueResult
|
2024-02-10 14:42:36 -08:00
|
|
|
from comictaggerlib.ui import qtutils, ui_path
|
2024-12-09 23:00:36 -08:00
|
|
|
from comictalker.comictalker import ComicTalker, RLCallBack, TalkerError
|
2012-11-12 16:12:43 -08:00
|
|
|
|
2022-04-04 18:59:26 -07:00
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
|
|
|
|
class SearchThread(QtCore.QThread):
|
2015-02-12 14:57:46 -08:00
|
|
|
searchComplete = pyqtSignal()
|
|
|
|
progressUpdate = pyqtSignal(int, int)
|
2024-12-09 23:00:36 -08:00
|
|
|
ratelimit = pyqtSignal(float, float)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-10-04 15:50:55 -07:00
|
|
|
def __init__(
|
2023-02-04 15:02:21 -08:00
|
|
|
self, talker: ComicTalker, series_name: str, refresh: bool, literal: bool = False, series_match_thresh: int = 90
|
2022-10-04 15:50:55 -07:00
|
|
|
) -> None:
|
2015-02-12 14:57:46 -08:00
|
|
|
QtCore.QThread.__init__(self)
|
2023-02-09 19:33:10 -08:00
|
|
|
self.talker = talker
|
2015-02-12 14:57:46 -08:00
|
|
|
self.series_name = series_name
|
2022-05-17 13:57:04 -07:00
|
|
|
self.refresh: bool = refresh
|
2022-06-28 07:21:35 -07:00
|
|
|
self.error_e: TalkerError
|
|
|
|
self.ct_error = False
|
2022-12-21 17:00:59 -08:00
|
|
|
self.ct_search_results: list[ComicSeries] = []
|
2022-06-07 11:49:56 -07:00
|
|
|
self.literal = literal
|
2022-07-08 12:33:00 -07:00
|
|
|
self.series_match_thresh = series_match_thresh
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def run(self) -> None:
|
2015-02-12 14:57:46 -08:00
|
|
|
try:
|
2022-06-28 07:21:35 -07:00
|
|
|
self.ct_error = False
|
2023-02-09 19:33:10 -08:00
|
|
|
self.ct_search_results = self.talker.search_for_series(
|
2024-12-09 23:00:36 -08:00
|
|
|
self.series_name,
|
|
|
|
callback=self.prog_callback,
|
|
|
|
refresh_cache=self.refresh,
|
|
|
|
literal=self.literal,
|
|
|
|
series_match_thresh=self.series_match_thresh,
|
|
|
|
on_rate_limit=RLCallBack(self.on_ratelimit, 10),
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
)
|
2022-06-28 07:21:35 -07:00
|
|
|
except TalkerError as e:
|
|
|
|
self.ct_search_results = []
|
|
|
|
self.ct_error = True
|
|
|
|
self.error_e = e
|
2015-02-12 14:57:46 -08:00
|
|
|
|
|
|
|
finally:
|
|
|
|
self.searchComplete.emit()
|
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def prog_callback(self, current: int, total: int) -> None:
|
2015-02-12 14:57:46 -08:00
|
|
|
self.progressUpdate.emit(current, total)
|
2012-11-12 16:12:43 -08:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
def on_ratelimit(self, full_time: float, sleep_time: float) -> None:
|
|
|
|
self.ratelimit.emit(full_time, sleep_time)
|
|
|
|
|
2012-11-12 16:12:43 -08:00
|
|
|
|
2015-02-13 15:08:07 -08:00
|
|
|
class IdentifyThread(QtCore.QThread):
|
2024-12-09 23:00:36 -08:00
|
|
|
ratelimit = pyqtSignal(float, float)
|
|
|
|
identifyComplete = pyqtSignal(IIResult, list)
|
2015-02-13 15:08:07 -08:00
|
|
|
identifyLogMsg = pyqtSignal(str)
|
|
|
|
identifyProgress = pyqtSignal(int, int)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
def __init__(self, ca: ComicArchive, config: SettngsNS, talker: ComicTalker, md: GenericMetadata) -> None:
|
2015-02-12 14:57:46 -08:00
|
|
|
QtCore.QThread.__init__(self)
|
2024-12-09 23:00:36 -08:00
|
|
|
iio = IssueIdentifierOptions(
|
|
|
|
series_match_search_thresh=config.Issue_Identifier__series_match_search_thresh,
|
|
|
|
series_match_identify_thresh=config.Issue_Identifier__series_match_identify_thresh,
|
|
|
|
use_publisher_filter=config.Auto_Tag__use_publisher_filter,
|
|
|
|
publisher_filter=config.Auto_Tag__publisher_filter,
|
|
|
|
quiet=config.Runtime_Options__quiet,
|
|
|
|
cache_dir=config.Runtime_Options__config.user_cache_dir,
|
|
|
|
border_crop_percent=config.Issue_Identifier__border_crop_percent,
|
|
|
|
talker=talker,
|
|
|
|
)
|
|
|
|
self.identifier = IssueIdentifier(
|
|
|
|
iio,
|
|
|
|
on_rate_limit=RLCallBack(self.on_ratelimit, 10),
|
|
|
|
output=self.log_output,
|
|
|
|
on_progress=self.progress_callback,
|
|
|
|
)
|
2024-02-23 20:47:04 -08:00
|
|
|
self.ca = ca
|
|
|
|
self.md = md
|
2012-11-12 16:12:43 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def log_output(self, text: str) -> None:
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
self.identifyLogMsg.emit(str(text))
|
2012-11-12 16:12:43 -08:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
def progress_callback(self, cur: int, total: int, image: bytes) -> None:
|
2015-02-13 15:08:07 -08:00
|
|
|
self.identifyProgress.emit(cur, total)
|
2012-11-12 16:12:43 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def run(self) -> None:
|
2024-02-23 20:47:04 -08:00
|
|
|
self.identifyComplete.emit(*self.identifier.identify(self.ca, self.md))
|
2012-11-12 16:12:43 -08:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
def cancel(self) -> None:
|
|
|
|
self.identifier.cancel = True
|
|
|
|
|
|
|
|
def on_ratelimit(self, full_time: float, sleep_time: float) -> None:
|
|
|
|
self.ratelimit.emit(full_time, sleep_time)
|
|
|
|
|
2012-11-12 16:12:43 -08:00
|
|
|
|
2025-01-14 17:41:00 -08:00
|
|
|
class SelectionWindow(QtWidgets.QDialog):
|
|
|
|
__metaclass__ = ABCMeta
|
2024-12-09 23:00:36 -08:00
|
|
|
ui_file = ui_path / "seriesselectionwindow.ui"
|
|
|
|
CoverImageMode = CoverImageWidget.URLMode
|
2025-01-14 17:41:00 -08:00
|
|
|
ratelimit = pyqtSignal(float, float)
|
2024-12-09 23:00:36 -08:00
|
|
|
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
def __init__(
|
|
|
|
self,
|
2022-05-17 13:57:04 -07:00
|
|
|
parent: QtWidgets.QWidget,
|
2023-06-09 16:20:00 -07:00
|
|
|
config: ct_ns,
|
2023-02-09 19:33:10 -08:00
|
|
|
talker: ComicTalker,
|
2024-12-09 23:00:36 -08:00
|
|
|
series_name: str = "",
|
|
|
|
issue_number: str = "",
|
|
|
|
comic_archive: ComicArchive | None = None,
|
|
|
|
year: int | None = None,
|
|
|
|
issue_count: int | None = None,
|
2022-05-17 13:57:04 -07:00
|
|
|
autoselect: bool = False,
|
2022-06-07 11:49:56 -07:00
|
|
|
literal: bool = False,
|
2022-05-17 13:57:04 -07:00
|
|
|
) -> None:
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
super().__init__(parent)
|
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
with self.ui_file.open(encoding="utf-8") as uifile:
|
2023-11-25 12:32:50 -08:00
|
|
|
uic.loadUi(uifile, self)
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
self.cover_widget = CoverImageWidget(
|
|
|
|
self.coverImageContainer,
|
|
|
|
self.CoverImageMode,
|
|
|
|
config.Runtime_Options__config.user_cache_dir,
|
2022-12-06 00:20:01 -08:00
|
|
|
)
|
2024-12-09 23:00:36 -08:00
|
|
|
gridlayout = QtWidgets.QGridLayout(self.coverImageContainer)
|
|
|
|
gridlayout.addWidget(self.cover_widget)
|
2015-02-15 02:44:00 -08:00
|
|
|
gridlayout.setContentsMargins(0, 0, 0, 0)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
self.teDescription: QtWidgets.QWidget
|
2024-05-21 20:32:01 -07:00
|
|
|
webengine = qtutils.new_web_view(self)
|
2023-07-01 23:29:38 -07:00
|
|
|
if webengine:
|
2024-12-09 23:00:36 -08:00
|
|
|
self.teDescription = qtutils.replaceWidget(self.splitter, self.teDescription, webengine)
|
|
|
|
logger.info("successfully loaded QWebEngineView")
|
|
|
|
else:
|
|
|
|
logger.info("failed to open QWebEngineView")
|
2023-07-01 23:29:38 -07:00
|
|
|
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
self.setWindowFlags(
|
|
|
|
QtCore.Qt.WindowType(
|
|
|
|
self.windowFlags()
|
|
|
|
| QtCore.Qt.WindowType.WindowSystemMenuHint
|
|
|
|
| QtCore.Qt.WindowType.WindowMaximizeButtonHint
|
|
|
|
)
|
|
|
|
)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2023-01-31 20:21:39 -08:00
|
|
|
self.config = config
|
2023-02-09 19:33:10 -08:00
|
|
|
self.talker = talker
|
2024-12-09 23:00:36 -08:00
|
|
|
self.issue_id: str = ""
|
2022-06-28 07:21:35 -07:00
|
|
|
|
2023-01-04 15:51:39 -08:00
|
|
|
# Display talker logo and set url
|
2024-12-09 23:00:36 -08:00
|
|
|
self.lblIssuesSourceName.setText(talker.attribution)
|
2023-01-12 08:58:50 -08:00
|
|
|
|
|
|
|
self.imageSourceWidget = CoverImageWidget(
|
2023-01-13 13:27:40 -08:00
|
|
|
self.imageSourceLogo,
|
2023-01-12 08:58:50 -08:00
|
|
|
CoverImageWidget.URLMode,
|
2023-11-19 23:14:40 -08:00
|
|
|
config.Runtime_Options__config.user_cache_dir,
|
2023-01-12 08:58:50 -08:00
|
|
|
False,
|
|
|
|
)
|
2023-02-09 16:43:05 -08:00
|
|
|
self.imageSourceWidget.showControls = False
|
2023-01-13 13:27:40 -08:00
|
|
|
gridlayoutSourceLogo = QtWidgets.QGridLayout(self.imageSourceLogo)
|
2023-01-12 08:58:50 -08:00
|
|
|
gridlayoutSourceLogo.addWidget(self.imageSourceWidget)
|
2023-01-13 13:27:40 -08:00
|
|
|
gridlayoutSourceLogo.setContentsMargins(0, 2, 0, 0)
|
2023-02-09 19:33:10 -08:00
|
|
|
self.imageSourceWidget.set_url(talker.logo_url)
|
2023-01-04 15:51:39 -08:00
|
|
|
|
2022-11-28 20:54:24 -08:00
|
|
|
# Set the minimum row height to the default.
|
|
|
|
# this way rows will be more consistent when resizeRowsToContents is called
|
|
|
|
self.twList.verticalHeader().setMinimumSectionSize(self.twList.verticalHeader().defaultSectionSize())
|
2024-12-09 23:00:36 -08:00
|
|
|
self.twList.resizeColumnsToContents()
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
self.twList.currentItemChanged.connect(self.current_item_changed)
|
|
|
|
self.twList.cellDoubleClicked.connect(self.cell_double_clicked)
|
2024-12-09 23:00:36 -08:00
|
|
|
self.leFilter.textChanged.connect(self.filter)
|
|
|
|
self.twList.selectRow(0)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2025-01-14 17:41:00 -08:00
|
|
|
@abstractmethod
|
|
|
|
def perform_query(self, refresh: bool = False) -> None: ...
|
|
|
|
|
|
|
|
@abstractmethod
|
|
|
|
def cell_double_clicked(self, r: int, c: int) -> None: ...
|
|
|
|
|
|
|
|
@abstractmethod
|
|
|
|
def update_row(self, row: int, series: ComicSeries) -> None: ...
|
|
|
|
|
|
|
|
def set_description(self, widget: QtWidgets.QWidget, text: str) -> None:
|
|
|
|
if isinstance(widget, QtWidgets.QTextEdit):
|
|
|
|
widget.setText(text.replace("</figure>", "</div>").replace("<figure", "<div"))
|
|
|
|
else:
|
|
|
|
html = text
|
|
|
|
widget.setHtml(html, QUrl(self.talker.website))
|
|
|
|
|
|
|
|
def filter(self, text: str) -> None:
|
|
|
|
rows = set(range(self.twList.rowCount()))
|
|
|
|
for r in rows:
|
|
|
|
self.twList.showRow(r)
|
|
|
|
if text.strip():
|
|
|
|
shown_rows = {x.row() for x in self.twList.findItems(text, QtCore.Qt.MatchFlag.MatchContains)}
|
|
|
|
for r in rows - shown_rows:
|
|
|
|
self.twList.hideRow(r)
|
|
|
|
|
|
|
|
@abstractmethod
|
|
|
|
def _fetch(self, row: int) -> ComicSeries: ...
|
|
|
|
|
|
|
|
def on_ratelimit(self, full_time: float, sleep_time: float) -> None:
|
|
|
|
self.ratelimit.emit(full_time, sleep_time)
|
|
|
|
|
|
|
|
def current_item_changed(self, curr: QtCore.QModelIndex | None, prev: QtCore.QModelIndex | None) -> None:
|
|
|
|
if curr is None:
|
|
|
|
return
|
|
|
|
if prev is not None and prev.row() == curr.row():
|
|
|
|
return
|
|
|
|
|
|
|
|
row = curr.row()
|
|
|
|
|
|
|
|
item = self._fetch(row)
|
|
|
|
QtWidgets.QApplication.restoreOverrideCursor()
|
|
|
|
|
|
|
|
# Update current record information
|
|
|
|
self.update_row(row, item)
|
|
|
|
|
|
|
|
|
|
|
|
class SeriesSelectionWindow(SelectionWindow):
|
|
|
|
ui_file = ui_path / "seriesselectionwindow.ui"
|
|
|
|
CoverImageMode = CoverImageWidget.URLMode
|
|
|
|
|
|
|
|
def __init__(
|
|
|
|
self,
|
|
|
|
parent: QtWidgets.QWidget,
|
|
|
|
config: ct_ns,
|
|
|
|
talker: ComicTalker,
|
|
|
|
series_name: str = "",
|
|
|
|
issue_number: str = "",
|
|
|
|
comic_archive: ComicArchive | None = None,
|
|
|
|
year: int | None = None,
|
|
|
|
issue_count: int | None = None,
|
|
|
|
autoselect: bool = False,
|
|
|
|
literal: bool = False,
|
|
|
|
) -> None:
|
|
|
|
super().__init__(
|
|
|
|
parent,
|
|
|
|
config,
|
|
|
|
talker,
|
|
|
|
series_name,
|
|
|
|
issue_number,
|
|
|
|
comic_archive,
|
|
|
|
year,
|
|
|
|
issue_count,
|
|
|
|
autoselect,
|
|
|
|
literal,
|
|
|
|
)
|
|
|
|
self.series_name = series_name
|
|
|
|
self.issue_number = issue_number
|
|
|
|
self.year = year
|
|
|
|
self.issue_count = issue_count
|
|
|
|
self.series_id: str = ""
|
|
|
|
self.comic_archive = comic_archive
|
|
|
|
self.immediate_autoselect = autoselect
|
|
|
|
self.series_list: dict[str, ComicSeries] = {}
|
|
|
|
self.literal = literal
|
|
|
|
self.iddialog: IDProgressWindow | None = None
|
|
|
|
self.id_thread: IdentifyThread | None = None
|
|
|
|
self.progdialog: QtWidgets.QProgressDialog | None = None
|
|
|
|
self.search_thread: SearchThread | None = None
|
|
|
|
|
|
|
|
self.use_publisher_filter = self.config.Auto_Tag__use_publisher_filter
|
2022-01-22 14:40:45 -08:00
|
|
|
|
2025-01-14 17:41:00 -08:00
|
|
|
self.btnRequery.clicked.connect(self.requery)
|
|
|
|
self.btnIssues.clicked.connect(self.show_issues)
|
|
|
|
self.btnAutoSelect.clicked.connect(self.auto_select)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2025-01-14 17:41:00 -08:00
|
|
|
self.cbxPublisherFilter.setChecked(self.use_publisher_filter)
|
|
|
|
self.cbxPublisherFilter.toggled.connect(self.publisher_filter_toggled)
|
2024-12-09 23:00:36 -08:00
|
|
|
|
2025-01-14 17:41:00 -08:00
|
|
|
self.ratelimit.connect(self.ratelimit_message)
|
2024-12-09 23:00:36 -08:00
|
|
|
|
2025-01-14 17:41:00 -08:00
|
|
|
self.update_buttons()
|
2024-12-09 23:00:36 -08:00
|
|
|
|
|
|
|
def showEvent(self, event: QtGui.QShowEvent) -> None:
|
|
|
|
self.perform_query()
|
|
|
|
if not self.series_list:
|
|
|
|
QtCore.QCoreApplication.processEvents()
|
|
|
|
QtWidgets.QMessageBox.information(self, "Search Result", "No matches found!")
|
|
|
|
QtCore.QTimer.singleShot(200, self.close_me)
|
|
|
|
|
|
|
|
elif self.immediate_autoselect:
|
|
|
|
# defer the immediate autoselect so this dialog has time to pop up
|
|
|
|
QtCore.QCoreApplication.processEvents()
|
|
|
|
QtCore.QTimer.singleShot(10, self.do_immediate_autoselect)
|
|
|
|
|
|
|
|
def perform_query(self, refresh: bool = False) -> None:
|
|
|
|
self.search_thread = SearchThread(
|
|
|
|
self.talker,
|
|
|
|
self.series_name,
|
|
|
|
refresh,
|
|
|
|
self.literal,
|
|
|
|
self.config.Issue_Identifier__series_match_search_thresh,
|
|
|
|
)
|
|
|
|
self.search_thread.searchComplete.connect(self.search_complete)
|
|
|
|
self.search_thread.progressUpdate.connect(self.search_progress_update)
|
2025-01-14 17:41:00 -08:00
|
|
|
self.search_thread.ratelimit.connect(self.ratelimit)
|
2024-12-09 23:00:36 -08:00
|
|
|
self.search_thread.start()
|
|
|
|
|
|
|
|
self.progdialog = QtWidgets.QProgressDialog("Searching Online", "Cancel", 0, 100, self)
|
|
|
|
self.progdialog.setWindowTitle("Online Search")
|
|
|
|
self.progdialog.canceled.connect(self.search_canceled)
|
|
|
|
self.progdialog.setModal(True)
|
|
|
|
self.progdialog.setMinimumDuration(300)
|
|
|
|
|
|
|
|
if refresh or self.search_thread.isRunning():
|
|
|
|
self.progdialog.exec()
|
|
|
|
else:
|
|
|
|
self.progdialog = None
|
|
|
|
|
|
|
|
def cell_double_clicked(self, r: int, c: int) -> None:
|
|
|
|
self.show_issues()
|
|
|
|
|
|
|
|
def update_row(self, row: int, series: ComicSeries) -> None:
|
|
|
|
item_text = series.name
|
|
|
|
item = self.twList.item(row, 0)
|
|
|
|
item.setText(item_text)
|
|
|
|
item.setData(QtCore.Qt.ItemDataRole.ToolTipRole, item_text)
|
|
|
|
item.setData(QtCore.Qt.ItemDataRole.UserRole, series.id)
|
|
|
|
item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
|
|
|
|
|
|
|
|
item_text = f"{series.start_year:04}" if series.start_year is not None else ""
|
|
|
|
item = self.twList.item(row, 1)
|
|
|
|
item.setText(item_text)
|
|
|
|
item.setData(QtCore.Qt.ItemDataRole.ToolTipRole, item_text)
|
|
|
|
item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
|
|
|
|
|
|
|
|
item_text = f"{series.count_of_issues:04}" if series.count_of_issues is not None else ""
|
|
|
|
item = self.twList.item(row, 2)
|
|
|
|
item.setText(item_text)
|
|
|
|
item.setData(QtCore.Qt.ItemDataRole.ToolTipRole, item_text)
|
|
|
|
item.setData(QtCore.Qt.ItemDataRole.DisplayRole, series.count_of_issues)
|
|
|
|
item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
|
|
|
|
|
|
|
|
item_text = series.publisher if series.publisher is not None else ""
|
|
|
|
item = self.twList.item(row, 3)
|
|
|
|
item.setText(item_text)
|
|
|
|
item.setData(QtCore.Qt.ItemDataRole.ToolTipRole, item_text)
|
|
|
|
item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
|
|
|
|
|
|
|
|
def set_description(self, widget: QtWidgets.QWidget, text: str) -> None:
|
|
|
|
if isinstance(widget, QtWidgets.QTextEdit):
|
|
|
|
widget.setText(text.replace("</figure>", "</div>").replace("<figure", "<div"))
|
|
|
|
else:
|
|
|
|
html = text
|
|
|
|
widget.setHtml(html, QUrl(self.talker.website))
|
2023-07-01 18:57:33 -07:00
|
|
|
|
|
|
|
def filter(self, text: str) -> None:
|
|
|
|
rows = set(range(self.twList.rowCount()))
|
|
|
|
for r in rows:
|
|
|
|
self.twList.showRow(r)
|
|
|
|
if text.strip():
|
|
|
|
shown_rows = {x.row() for x in self.twList.findItems(text, QtCore.Qt.MatchFlag.MatchContains)}
|
|
|
|
for r in rows - shown_rows:
|
|
|
|
self.twList.hideRow(r)
|
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
def _fetch(self, row: int) -> ComicSeries:
|
|
|
|
self.series_id = self.twList.item(row, 0).data(QtCore.Qt.ItemDataRole.UserRole)
|
|
|
|
|
|
|
|
# list selection was changed, update the info on the series
|
|
|
|
series = self.series_list[self.series_id]
|
|
|
|
if not (
|
|
|
|
series.name
|
|
|
|
and series.start_year
|
|
|
|
and series.count_of_issues
|
|
|
|
and series.publisher
|
|
|
|
and series.description
|
|
|
|
and series.image_url
|
|
|
|
):
|
|
|
|
QtWidgets.QApplication.setOverrideCursor(QtGui.QCursor(QtCore.Qt.CursorShape.WaitCursor))
|
|
|
|
try:
|
2024-12-24 21:17:59 -08:00
|
|
|
series = self.talker.fetch_series(self.series_id, on_rate_limit=RLCallBack(self.on_ratelimit, 10))
|
2024-12-09 23:00:36 -08:00
|
|
|
except TalkerError:
|
|
|
|
pass
|
|
|
|
self.set_description(self.teDescription, series.description or "")
|
|
|
|
self.cover_widget.set_url(series.image_url)
|
|
|
|
return series
|
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def update_buttons(self) -> None:
|
Convert ComicIssue into GenericMetadata
I could not find a good reason for ComicIssue to exist other than that
it had more attributes than GenericMetadata, so it has been replaced.
New attributes for GenericMetadata:
series_id: a string uniquely identifying the series to tag_origin
series_aliases: alternate series names that are not the canonical name
title_aliases: alternate issue titles that are not the canonical name
alternate_images: a list of urls to alternate cover images
Updated attributes for GenericMetadata:
genre -> genres: str -> list[str]
comments -> description: str -> str
story_arc -> story_arcs: str -> list[str]
series_group -> series_groups: str -> list[str]
character -> characters: str -> list[str]
team -> teams: str -> list[str]
location -> locations: str -> list[str]
tag_origin -> tag_origin: str -> TagOrigin (tuple[str, str])
ComicSeries has been relocated to the ComicAPI package, currently has no
usage within ComicAPI.
CreditMetadata has been renamed to Credit and has replaced Credit from
ComicTalker.
fetch_series has been added to ComicTalker, this is currently only used
in the GUI when a series is selected and does not already contain the
needed fields, this function should always be cached.
A new split function has been added to ComicAPI, all uses of split on
single characters have been updated to use this
cleanup_html and the corresponding setting are now only used in
ComicTagger proper, for display we want any html directly from the
upstream. When applying the metadata we then strip the description of
any html.
A new conversion has been added to the MetadataFormatter:
j: joins any lists into a string with ', '. Note this is a valid
operation on strings as well, it will add ', ' in between every
character.
parse_settings now assigns the given ComicTaggerPaths object to the
result ensuring that the correct path is always used.
2023-08-02 09:00:04 -07:00
|
|
|
enabled = bool(self.series_list)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2015-02-13 15:08:07 -08:00
|
|
|
self.btnRequery.setEnabled(enabled)
|
2022-06-28 07:21:35 -07:00
|
|
|
|
2022-11-18 15:18:41 -08:00
|
|
|
self.btnIssues.setEnabled(enabled)
|
|
|
|
self.btnAutoSelect.setEnabled(enabled)
|
2022-06-28 07:21:35 -07:00
|
|
|
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setEnabled(enabled)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def requery(self) -> None:
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
self.perform_query(refresh=True)
|
2015-02-12 14:57:46 -08:00
|
|
|
self.twList.selectRow(0)
|
2022-01-22 15:00:22 -08:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
def publisher_filter_toggled(self) -> None:
|
|
|
|
self.use_publisher_filter = self.cbxPublisherFilter.isChecked()
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
self.perform_query(refresh=False)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def auto_select(self) -> None:
|
2022-11-18 15:18:41 -08:00
|
|
|
if self.comic_archive is None:
|
|
|
|
QtWidgets.QMessageBox.information(self, "Auto-Select", "You need to load a comic first!")
|
|
|
|
return
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-11-18 15:18:41 -08:00
|
|
|
if self.issue_number is None or self.issue_number == "":
|
|
|
|
QtWidgets.QMessageBox.information(self, "Auto-Select", "Can't auto-select without an issue number (yet!)")
|
|
|
|
return
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-11-18 15:18:41 -08:00
|
|
|
self.iddialog = IDProgressWindow(self)
|
|
|
|
self.iddialog.setModal(True)
|
|
|
|
self.iddialog.show()
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-11-18 15:18:41 -08:00
|
|
|
md = GenericMetadata()
|
|
|
|
md.series = self.series_name
|
|
|
|
md.issue = self.issue_number
|
|
|
|
md.year = self.year
|
|
|
|
md.issue_count = self.issue_count
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
self.id_thread = IdentifyThread(self.comic_archive, self.config, self.talker, md)
|
2022-11-18 15:18:41 -08:00
|
|
|
self.id_thread.identifyComplete.connect(self.identify_complete)
|
2024-12-09 23:00:36 -08:00
|
|
|
self.id_thread.identifyLogMsg.connect(self.log_output)
|
2022-11-18 15:18:41 -08:00
|
|
|
self.id_thread.identifyProgress.connect(self.identify_progress)
|
2025-01-14 17:41:00 -08:00
|
|
|
self.id_thread.ratelimit.connect(self.ratelimit)
|
2024-12-09 23:00:36 -08:00
|
|
|
self.iddialog.rejected.connect(self.id_thread.cancel)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-11-18 15:18:41 -08:00
|
|
|
self.id_thread.start()
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-11-18 15:18:41 -08:00
|
|
|
self.iddialog.exec()
|
2025-01-14 17:41:00 -08:00
|
|
|
self.selector = None
|
2022-05-17 13:57:04 -07:00
|
|
|
|
|
|
|
def identify_progress(self, cur: int, total: int) -> None:
|
|
|
|
if self.iddialog is not None:
|
|
|
|
self.iddialog.progressBar.setMaximum(total)
|
|
|
|
self.iddialog.progressBar.setValue(cur)
|
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
def identify_complete(self, result: IIResult, issues: list[IssueResult]) -> None:
|
2024-02-23 20:47:04 -08:00
|
|
|
if self.iddialog is not None and self.comic_archive is not None:
|
2022-05-17 13:57:04 -07:00
|
|
|
|
|
|
|
found_match = None
|
|
|
|
choices = False
|
2024-12-09 23:00:36 -08:00
|
|
|
if result == IIResult.no_matches:
|
2024-02-23 20:47:04 -08:00
|
|
|
QtWidgets.QMessageBox.information(self, "Auto-Select Result", " No issues found :-(")
|
2024-12-09 23:00:36 -08:00
|
|
|
elif result == IIResult.single_bad_cover_score:
|
2022-05-17 13:57:04 -07:00
|
|
|
QtWidgets.QMessageBox.information(
|
|
|
|
self,
|
|
|
|
"Auto-Select Result",
|
2022-06-07 20:22:33 -07:00
|
|
|
" Found a match, but cover doesn't seem the same. Verify before committing!",
|
2022-05-17 13:57:04 -07:00
|
|
|
)
|
2024-02-23 20:47:04 -08:00
|
|
|
found_match = issues[0]
|
2024-12-09 23:00:36 -08:00
|
|
|
elif result == IIResult.multiple_bad_cover_scores:
|
2022-05-17 13:57:04 -07:00
|
|
|
QtWidgets.QMessageBox.information(
|
|
|
|
self, "Auto-Select Result", " Found some possibilities, but no confidence. Proceed manually."
|
|
|
|
)
|
|
|
|
choices = True
|
2024-12-09 23:00:36 -08:00
|
|
|
elif result == IIResult.single_good_match:
|
2024-02-23 20:47:04 -08:00
|
|
|
found_match = issues[0]
|
2024-12-09 23:00:36 -08:00
|
|
|
elif result == IIResult.multiple_good_matches:
|
2022-05-17 13:57:04 -07:00
|
|
|
QtWidgets.QMessageBox.information(
|
|
|
|
self, "Auto-Select Result", " Found multiple likely matches. Please select."
|
|
|
|
)
|
|
|
|
choices = True
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
if choices:
|
2022-12-06 00:20:01 -08:00
|
|
|
selector = MatchSelectionWindow(
|
2024-02-23 20:47:04 -08:00
|
|
|
self, issues, self.comic_archive, talker=self.talker, config=self.config
|
2022-12-06 00:20:01 -08:00
|
|
|
)
|
2022-05-17 13:57:04 -07:00
|
|
|
selector.setModal(True)
|
|
|
|
selector.exec()
|
|
|
|
if selector.result():
|
|
|
|
# we should now have a list index
|
|
|
|
found_match = selector.current_match()
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
if found_match is not None:
|
|
|
|
self.iddialog.accept()
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2023-12-17 15:51:43 -08:00
|
|
|
self.series_id = utils.xlate(found_match.series_id) or ""
|
|
|
|
self.issue_number = found_match.issue_number
|
2022-05-17 13:57:04 -07:00
|
|
|
self.select_by_id()
|
|
|
|
self.show_issues()
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def show_issues(self) -> None:
|
2024-12-09 23:00:36 -08:00
|
|
|
from comictaggerlib.issueselectionwindow import IssueSelectionWindow
|
|
|
|
|
2025-01-14 17:41:00 -08:00
|
|
|
self.selector = IssueSelectionWindow(self, self.config, self.talker, self.series_id, self.issue_number)
|
|
|
|
self.selector.ratelimit.connect(self.ratelimit)
|
2015-02-12 14:57:46 -08:00
|
|
|
title = ""
|
2023-09-03 15:18:56 -07:00
|
|
|
for series in self.series_list.values():
|
Convert ComicIssue into GenericMetadata
I could not find a good reason for ComicIssue to exist other than that
it had more attributes than GenericMetadata, so it has been replaced.
New attributes for GenericMetadata:
series_id: a string uniquely identifying the series to tag_origin
series_aliases: alternate series names that are not the canonical name
title_aliases: alternate issue titles that are not the canonical name
alternate_images: a list of urls to alternate cover images
Updated attributes for GenericMetadata:
genre -> genres: str -> list[str]
comments -> description: str -> str
story_arc -> story_arcs: str -> list[str]
series_group -> series_groups: str -> list[str]
character -> characters: str -> list[str]
team -> teams: str -> list[str]
location -> locations: str -> list[str]
tag_origin -> tag_origin: str -> TagOrigin (tuple[str, str])
ComicSeries has been relocated to the ComicAPI package, currently has no
usage within ComicAPI.
CreditMetadata has been renamed to Credit and has replaced Credit from
ComicTalker.
fetch_series has been added to ComicTalker, this is currently only used
in the GUI when a series is selected and does not already contain the
needed fields, this function should always be cached.
A new split function has been added to ComicAPI, all uses of split on
single characters have been updated to use this
cleanup_html and the corresponding setting are now only used in
ComicTagger proper, for display we want any html directly from the
upstream. When applying the metadata we then strip the description of
any html.
A new conversion has been added to the MetadataFormatter:
j: joins any lists into a string with ', '. Note this is a valid
operation on strings as well, it will add ', ' in between every
character.
parse_settings now assigns the given ComicTaggerPaths object to the
result ensuring that the correct path is always used.
2023-08-02 09:00:04 -07:00
|
|
|
if series.id == self.series_id:
|
2023-09-10 05:42:17 -07:00
|
|
|
title = f"{series.name} ({series.start_year:04}) - " if series.start_year else f"{series.name} - "
|
2015-02-12 14:57:46 -08:00
|
|
|
break
|
|
|
|
|
2025-01-14 17:41:00 -08:00
|
|
|
self.selector.setWindowTitle(title + "Select Issue")
|
|
|
|
self.selector.setModal(True)
|
|
|
|
self.selector.finished.connect(self.issue_selected)
|
|
|
|
self.selector.open()
|
|
|
|
|
|
|
|
def issue_selected(self, result) -> None:
|
|
|
|
if result and self.selector:
|
2022-12-21 17:00:59 -08:00
|
|
|
# we should now have a series ID
|
2025-01-14 17:41:00 -08:00
|
|
|
self.issue_number = self.selector.issue_number
|
|
|
|
self.issue_id = self.selector.issue_id
|
2015-02-12 14:57:46 -08:00
|
|
|
self.accept()
|
2023-04-25 01:59:24 -07:00
|
|
|
else:
|
2024-12-09 23:00:36 -08:00
|
|
|
self.cover_widget.update_content()
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def select_by_id(self) -> None:
|
2023-09-07 06:44:30 -07:00
|
|
|
for r in range(self.twList.rowCount()):
|
2023-09-03 15:18:56 -07:00
|
|
|
if self.series_id == self.twList.item(r, 0).data(QtCore.Qt.ItemDataRole.UserRole):
|
2015-02-13 15:08:07 -08:00
|
|
|
self.twList.selectRow(r)
|
2015-02-12 14:57:46 -08:00
|
|
|
break
|
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def search_canceled(self) -> None:
|
|
|
|
if self.progdialog is not None:
|
|
|
|
logger.info("query cancelled")
|
|
|
|
if self.search_thread is not None:
|
|
|
|
self.search_thread.searchComplete.disconnect()
|
|
|
|
self.search_thread.progressUpdate.disconnect()
|
|
|
|
self.progdialog.canceled.disconnect()
|
|
|
|
self.progdialog.reject()
|
|
|
|
QtCore.QTimer.singleShot(200, self.close_me)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def close_me(self) -> None:
|
2015-02-12 14:57:46 -08:00
|
|
|
self.reject()
|
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def search_progress_update(self, current: int, total: int) -> None:
|
|
|
|
if self.progdialog is not None:
|
2024-12-09 23:00:36 -08:00
|
|
|
QtCore.QCoreApplication.processEvents()
|
2022-05-17 13:57:04 -07:00
|
|
|
self.progdialog.setMaximum(total)
|
|
|
|
self.progdialog.setValue(current + 1)
|
2024-12-09 23:00:36 -08:00
|
|
|
QtCore.QCoreApplication.processEvents()
|
2022-05-17 13:57:04 -07:00
|
|
|
|
|
|
|
def search_complete(self) -> None:
|
|
|
|
if self.progdialog is not None:
|
|
|
|
self.progdialog.accept()
|
2023-09-05 11:41:07 -07:00
|
|
|
self.progdialog = None
|
2022-11-03 16:32:35 -07:00
|
|
|
if self.search_thread is not None and self.search_thread.ct_error:
|
|
|
|
# TODO Currently still opens the window
|
|
|
|
QtWidgets.QMessageBox.critical(
|
|
|
|
self,
|
|
|
|
f"{self.search_thread.error_e.source} {self.search_thread.error_e.code_name} Error",
|
|
|
|
f"{self.search_thread.error_e}",
|
|
|
|
)
|
|
|
|
return
|
|
|
|
|
2023-09-03 15:18:56 -07:00
|
|
|
tmp_list = self.search_thread.ct_search_results if self.search_thread is not None else []
|
|
|
|
self.series_list = {x.id: x for x in tmp_list}
|
2022-11-03 16:32:35 -07:00
|
|
|
# filter the publishers if enabled set
|
2024-12-09 23:00:36 -08:00
|
|
|
if self.use_publisher_filter:
|
2022-11-03 16:32:35 -07:00
|
|
|
try:
|
2024-02-06 16:02:12 -08:00
|
|
|
publisher_filter = {s.strip().casefold() for s in self.config.Auto_Tag__publisher_filter}
|
2022-11-03 16:32:35 -07:00
|
|
|
# use '' as publisher name if None
|
2023-09-03 15:18:56 -07:00
|
|
|
self.series_list = dict(
|
2022-11-03 16:32:35 -07:00
|
|
|
filter(
|
2023-09-03 15:18:56 -07:00
|
|
|
lambda d: ("" if d[1].publisher is None else str(d[1].publisher).casefold())
|
|
|
|
not in publisher_filter,
|
|
|
|
self.series_list.items(),
|
2022-05-17 13:57:04 -07:00
|
|
|
)
|
2022-11-03 16:32:35 -07:00
|
|
|
)
|
|
|
|
except Exception:
|
|
|
|
logger.exception("bad data error filtering publishers")
|
|
|
|
|
|
|
|
# pre sort the data - so that we can put exact matches first afterwards
|
|
|
|
# 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
|
2023-11-19 23:14:40 -08:00
|
|
|
if self.config.Issue_Identifier__sort_series_by_year:
|
2022-11-03 16:32:35 -07:00
|
|
|
try:
|
2023-09-03 15:18:56 -07:00
|
|
|
self.series_list = dict(
|
|
|
|
natsort.natsorted(
|
|
|
|
self.series_list.items(),
|
|
|
|
key=lambda i: (str(i[1].start_year), str(i[1].count_of_issues)),
|
|
|
|
reverse=True,
|
|
|
|
)
|
2022-11-03 16:32:35 -07:00
|
|
|
)
|
|
|
|
except Exception:
|
|
|
|
logger.exception("bad data error sorting results by start_year,count_of_issues")
|
|
|
|
else:
|
|
|
|
try:
|
2023-09-03 15:18:56 -07:00
|
|
|
self.series_list = dict(
|
|
|
|
natsort.natsorted(self.series_list.items(), key=lambda i: str(i[1].count_of_issues), reverse=True)
|
2022-11-03 16:32:35 -07:00
|
|
|
)
|
|
|
|
except Exception:
|
|
|
|
logger.exception("bad data error sorting results by count_of_issues")
|
|
|
|
|
|
|
|
# move sanitized matches to the front
|
2023-11-19 23:14:40 -08:00
|
|
|
if self.config.Issue_Identifier__exact_series_matches_first:
|
2022-11-03 16:32:35 -07:00
|
|
|
try:
|
|
|
|
sanitized = utils.sanitize_title(self.series_name, False).casefold()
|
|
|
|
sanitized_no_articles = utils.sanitize_title(self.series_name, True).casefold()
|
|
|
|
|
2023-09-03 15:18:56 -07:00
|
|
|
deques: list[deque[tuple[str, ComicSeries]]] = [deque(), deque(), deque()]
|
2022-11-03 16:32:35 -07:00
|
|
|
|
2022-12-21 17:00:59 -08:00
|
|
|
def categorize(result: ComicSeries) -> int:
|
2022-11-03 16:32:35 -07:00
|
|
|
# We don't remove anything on this one so that we only get exact matches
|
2022-12-23 01:58:10 -08:00
|
|
|
if utils.sanitize_title(result.name, True).casefold() == sanitized_no_articles:
|
2022-11-03 16:32:35 -07:00
|
|
|
return 0
|
|
|
|
|
|
|
|
# this ensures that 'The Joker' is near the top even if you search 'Joker'
|
2022-12-23 01:58:10 -08:00
|
|
|
if utils.sanitize_title(result.name, False).casefold() in sanitized:
|
2022-11-03 16:32:35 -07:00
|
|
|
return 1
|
|
|
|
return 2
|
|
|
|
|
2023-09-03 15:18:56 -07:00
|
|
|
for comic in self.series_list.items():
|
|
|
|
deques[categorize(comic[1])].append(comic)
|
2022-11-03 16:32:35 -07:00
|
|
|
logger.info("Length: %d, %d, %d", len(deques[0]), len(deques[1]), len(deques[2]))
|
2023-09-03 15:18:56 -07:00
|
|
|
self.series_list = dict(itertools.chain.from_iterable(deques))
|
2022-11-03 16:32:35 -07:00
|
|
|
except Exception:
|
|
|
|
logger.exception("bad data error filtering exact/near matches")
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-11-03 16:32:35 -07:00
|
|
|
self.update_buttons()
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-11-03 16:32:35 -07:00
|
|
|
self.twList.setSortingEnabled(False)
|
2022-05-17 13:57:04 -07:00
|
|
|
|
2022-11-03 16:32:35 -07:00
|
|
|
self.twList.setRowCount(0)
|
2022-05-17 13:57:04 -07:00
|
|
|
|
2023-09-03 15:18:56 -07:00
|
|
|
for row, series in enumerate(self.series_list.values()):
|
2022-11-03 16:32:35 -07:00
|
|
|
self.twList.insertRow(row)
|
2023-09-13 13:35:52 -07:00
|
|
|
for i in range(4):
|
|
|
|
self.twList.setItem(row, i, QtWidgets.QTableWidgetItem())
|
2022-11-03 16:32:35 -07:00
|
|
|
|
2023-09-13 13:35:52 -07:00
|
|
|
self.update_row(row, series)
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-11-03 16:32:35 -07:00
|
|
|
self.twList.setSortingEnabled(True)
|
|
|
|
self.twList.selectRow(0)
|
|
|
|
self.twList.resizeColumnsToContents()
|
2022-11-28 15:28:47 -08:00
|
|
|
# Get the width of the issues, year and publisher columns
|
|
|
|
owidth = self.twList.columnWidth(1) + self.twList.columnWidth(2) + self.twList.columnWidth(3)
|
|
|
|
# Get the remaining width after they fill the tableWidget
|
2022-11-28 20:55:50 -08:00
|
|
|
rwidth = self.twList.contentsRect().width() - owidth
|
2022-11-28 15:28:47 -08:00
|
|
|
|
|
|
|
# Default the tableWidget to truncate series names
|
|
|
|
self.twList.setColumnWidth(0, rwidth)
|
2022-05-17 13:57:04 -07:00
|
|
|
|
2022-11-28 15:34:15 -08:00
|
|
|
# Resize row height so the whole series can still be seen
|
|
|
|
self.twList.resizeRowsToContents()
|
2022-05-17 13:57:04 -07:00
|
|
|
|
|
|
|
def do_immediate_autoselect(self) -> None:
|
2015-02-15 02:44:00 -08:00
|
|
|
self.immediate_autoselect = False
|
Code cleanup
Remove no longer used google scripts
Remove convenience files from comicataggerlib and import comicapi directly
Add type-hints to facilitate auto-complete tools
Make PyQt5 code more compatible with PyQt6
Implement automatic tooling
isort and black for code formatting
Line length has been set to 120
flake8 for code standards with exceptions:
E203 - Whitespace before ':' - format compatiblity with black
E501 - Line too long - flake8 line limit cannot be set
E722 - Do not use bare except - fixing bare except statements is a
lot of overhead and there are already
many in the codebase
These changes, along with some manual fixes creates much more readable code.
See examples below:
diff --git a/comicapi/comet.py b/comicapi/comet.py
index d1741c5..52dc195 100644
--- a/comicapi/comet.py
+++ b/comicapi/comet.py
@@ -166,7 +166,2 @@ class CoMet:
- if credit['role'].lower() in set(self.editor_synonyms):
- ET.SubElement(
- root,
- 'editor').text = "{0}".format(
- credit['person'])
@@ -174,2 +169,4 @@ class CoMet:
self.indent(root)
+ if credit["role"].lower() in set(self.editor_synonyms):
+ ET.SubElement(root, "editor").text = str(credit["person"])
diff --git a/comictaggerlib/autotagmatchwindow.py b/comictaggerlib/autotagmatchwindow.py
index 4338176..9219f01 100644
--- a/comictaggerlib/autotagmatchwindow.py
+++ b/comictaggerlib/autotagmatchwindow.py
@@ -63,4 +63,3 @@ class AutoTagMatchWindow(QtWidgets.QDialog):
self.skipButton, QtWidgets.QDialogButtonBox.ActionRole)
- self.buttonBox.button(QtWidgets.QDialogButtonBox.Ok).setText(
- "Accept and Write Tags")
+ self.buttonBox.button(QtWidgets.QDialogButtonBox.StandardButton.Ok).setText("Accept and Write Tags")
diff --git a/comictaggerlib/cli.py b/comictaggerlib/cli.py
index 688907d..dbd0c2e 100644
--- a/comictaggerlib/cli.py
+++ b/comictaggerlib/cli.py
@@ -293,7 +293,3 @@ def process_file_cli(filename, opts, settings, match_results):
if opts.raw:
- print((
- "{0}".format(
- str(
- ca.readRawCIX(),
- errors='ignore'))))
+ print(ca.read_raw_cix())
else:
2022-04-01 16:50:46 -07:00
|
|
|
self.auto_select()
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2022-06-02 18:32:16 -07:00
|
|
|
def current_item_changed(self, curr: QtCore.QModelIndex | None, prev: QtCore.QModelIndex | None) -> None:
|
2015-02-12 14:57:46 -08:00
|
|
|
if curr is None:
|
|
|
|
return
|
|
|
|
if prev is not None and prev.row() == curr.row():
|
2015-02-15 02:44:00 -08:00
|
|
|
return
|
2015-02-12 14:57:46 -08:00
|
|
|
|
2023-09-10 05:31:20 -07:00
|
|
|
row = curr.row()
|
2022-01-22 15:00:22 -08:00
|
|
|
|
2024-12-09 23:00:36 -08:00
|
|
|
item = self._fetch(row)
|
2023-09-10 05:31:20 -07:00
|
|
|
QtWidgets.QApplication.restoreOverrideCursor()
|
|
|
|
|
|
|
|
# Update current record information
|
2024-12-09 23:00:36 -08:00
|
|
|
self.update_row(row, item)
|
2025-01-14 17:41:00 -08:00
|
|
|
|
|
|
|
def ratelimit_message(self, full_time: float, sleep_time: float) -> None:
|
|
|
|
self.log_output(
|
|
|
|
f"Rate limit reached: {full_time:.0f}s until next request. Waiting {sleep_time:.0f}s for ratelimit"
|
|
|
|
)
|
|
|
|
|
|
|
|
def log_output(self, text: str) -> None:
|
|
|
|
if self.iddialog is not None:
|
|
|
|
self.iddialog.textEdit.append(text.rstrip())
|
|
|
|
self.iddialog.textEdit.ensureCursorVisible()
|
|
|
|
QtCore.QCoreApplication.processEvents()
|
|
|
|
QtCore.QCoreApplication.processEvents()
|
|
|
|
QtCore.QCoreApplication.processEvents()
|