2015-02-21 18:30:32 -08:00
|
|
|
"""Support for mixed digit/string type Issue field
|
2015-02-16 04:27:21 -08:00
|
|
|
|
2015-02-21 18:30:32 -08:00
|
|
|
Class for handling the odd permutations of an 'issue number' that the
|
|
|
|
comics industry throws at us.
|
|
|
|
e.g.: "12", "12.1", "0", "-1", "5AU", "100-2"
|
2015-02-16 04:27:21 -08: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
|
2015-02-16 04:27:21 -08:00
|
|
|
|
2022-04-04 18:59:26 -07:00
|
|
|
import logging
|
2022-05-14 01:57:28 -07:00
|
|
|
import unicodedata
|
2022-04-04 18:59:26 -07:00
|
|
|
|
|
|
|
logger = logging.getLogger(__name__)
|
|
|
|
|
|
|
|
|
2015-02-16 04:27:21 -08:00
|
|
|
class IssueString:
|
2022-06-02 18:32:16 -07:00
|
|
|
def __init__(self, text: str | None) -> None:
|
2015-02-21 18:30:32 -08:00
|
|
|
# break up the issue number string into 2 parts: the numeric and suffix string.
|
|
|
|
# (assumes that the numeric portion is always first)
|
|
|
|
|
|
|
|
self.num = None
|
|
|
|
self.suffix = ""
|
2023-09-06 01:50:05 -07:00
|
|
|
self.prefix = ""
|
2015-02-21 18:30:32 -08:00
|
|
|
|
|
|
|
if text is None:
|
|
|
|
return
|
|
|
|
|
2022-02-21 20:05:07 -08:00
|
|
|
text = str(text)
|
2015-02-21 18:30:32 -08:00
|
|
|
|
|
|
|
if len(text) == 0:
|
|
|
|
return
|
|
|
|
|
2023-09-06 01:50:05 -07:00
|
|
|
for idx, r in enumerate(text):
|
|
|
|
if not r.isalpha():
|
|
|
|
break
|
|
|
|
self.prefix = text[:idx]
|
|
|
|
self.num, self.suffix = self.get_number(text[idx:])
|
|
|
|
|
|
|
|
def get_number(self, text: str) -> tuple[float | None, str]:
|
|
|
|
num, suffix = None, ""
|
|
|
|
start = 0
|
2015-02-21 18:30:32 -08:00
|
|
|
# skip the minus sign if it's first
|
2023-09-06 01:50:05 -07:00
|
|
|
if text[0] in ("-", "+"):
|
2015-02-21 18:30:32 -08:00
|
|
|
start = 1
|
|
|
|
|
|
|
|
# if it's still not numeric at start skip it
|
|
|
|
if text[start].isdigit() or text[start] == ".":
|
2022-06-02 18:32:16 -07:00
|
|
|
# walk through the string, look for split point (the first non-numeric)
|
2015-02-21 18:30:32 -08:00
|
|
|
decimal_count = 0
|
|
|
|
for idx in range(start, len(text)):
|
2023-09-06 01:50:05 -07:00
|
|
|
if not (text[idx].isdigit() or text[idx] in "."):
|
2015-02-21 18:30:32 -08:00
|
|
|
break
|
|
|
|
# special case: also split on second "."
|
|
|
|
if text[idx] == ".":
|
|
|
|
decimal_count += 1
|
|
|
|
if decimal_count > 1:
|
|
|
|
break
|
|
|
|
else:
|
|
|
|
idx = len(text)
|
|
|
|
|
|
|
|
# move trailing numeric decimal to suffix
|
|
|
|
# (only if there is other junk after )
|
|
|
|
if text[idx - 1] == "." and len(text) != idx:
|
|
|
|
idx = idx - 1
|
|
|
|
|
2022-06-02 18:32:16 -07:00
|
|
|
# if there is no numeric after the minus, make the minus part of the suffix
|
2015-02-21 18:30:32 -08:00
|
|
|
if idx == 1 and start == 1:
|
|
|
|
idx = 0
|
|
|
|
|
2023-09-06 01:50:05 -07:00
|
|
|
if text[0:idx]:
|
|
|
|
num = float(text[0:idx])
|
|
|
|
suffix = text[idx : len(text)]
|
2015-02-21 18:30:32 -08:00
|
|
|
else:
|
2023-09-06 01:50:05 -07:00
|
|
|
suffix = text
|
|
|
|
return num, suffix
|
2015-02-21 18:30:32 -08:00
|
|
|
|
2022-05-17 13:57:04 -07:00
|
|
|
def as_string(self, pad: int = 0) -> str:
|
2023-09-06 01:50:05 -07:00
|
|
|
"""return the number, left side zero-padded, with suffix attached"""
|
|
|
|
|
|
|
|
# if there is no number return the text
|
2015-02-21 18:30:32 -08:00
|
|
|
if self.num is None:
|
2023-09-06 01:50:05 -07:00
|
|
|
return self.prefix + self.suffix
|
2015-02-21 18:30:32 -08:00
|
|
|
|
2023-09-06 01:50:05 -07:00
|
|
|
# negative is added back in last
|
2015-02-21 18:30:32 -08:00
|
|
|
negative = self.num < 0
|
|
|
|
num_f = abs(self.num)
|
|
|
|
|
2023-09-06 01:50:05 -07:00
|
|
|
# used for padding
|
2015-02-21 18:30:32 -08:00
|
|
|
num_int = int(num_f)
|
|
|
|
|
2023-09-06 01:50:05 -07:00
|
|
|
if num_f.is_integer():
|
|
|
|
num_s = str(num_int)
|
|
|
|
else:
|
|
|
|
num_s = str(num_f)
|
2015-02-21 18:30:32 -08:00
|
|
|
|
|
|
|
# create padding
|
|
|
|
padding = ""
|
2023-09-06 01:50:05 -07:00
|
|
|
# we only pad the whole number part, we don't care about the decimal
|
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
|
|
|
length = len(str(num_int))
|
|
|
|
if length < pad:
|
|
|
|
padding = "0" * (pad - length)
|
2015-02-21 18:30:32 -08:00
|
|
|
|
2023-09-06 01:50:05 -07:00
|
|
|
# add the padding to the front
|
2015-02-21 18:30:32 -08:00
|
|
|
num_s = padding + num_s
|
2023-09-06 01:50:05 -07:00
|
|
|
|
|
|
|
# finally add the negative back in
|
2015-02-21 18:30:32 -08:00
|
|
|
if negative:
|
|
|
|
num_s = "-" + num_s
|
|
|
|
|
2023-09-06 01:50:05 -07:00
|
|
|
# return the prefix + formatted number + suffix
|
|
|
|
return self.prefix + num_s + self.suffix
|
2015-02-21 18:30:32 -08:00
|
|
|
|
2022-06-02 18:32:16 -07:00
|
|
|
def as_float(self) -> float | None:
|
2015-02-21 18:30:32 -08:00
|
|
|
# return the float, with no suffix
|
2022-05-14 01:57:28 -07:00
|
|
|
if len(self.suffix) == 1 and self.suffix.isnumeric():
|
|
|
|
return (self.num or 0) + unicodedata.numeric(self.suffix)
|
2015-02-21 18:30:32 -08:00
|
|
|
return self.num
|