e10f7dd7a7
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:
123 lines
3.4 KiB
Python
123 lines
3.4 KiB
Python
"""Support for mixed digit/string type Issue field
|
|
|
|
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"
|
|
"""
|
|
|
|
# Copyright 2012-2014 Anthony Beville
|
|
|
|
# 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
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
# 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.
|
|
|
|
|
|
class IssueString:
|
|
def __init__(self, text):
|
|
|
|
# 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 = ""
|
|
|
|
if text is None:
|
|
return
|
|
|
|
text = str(text)
|
|
|
|
if len(text) == 0:
|
|
return
|
|
|
|
# skip the minus sign if it's first
|
|
if text[0] == "-":
|
|
start = 1
|
|
else:
|
|
start = 0
|
|
|
|
# if it's still not numeric at start skip it
|
|
if text[start].isdigit() or text[start] == ".":
|
|
# walk through the string, look for split point (the first
|
|
# non-numeric)
|
|
decimal_count = 0
|
|
for idx in range(start, len(text)):
|
|
if text[idx] not in "0123456789.":
|
|
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
|
|
|
|
# if there is no numeric after the minus, make the minus part of
|
|
# the suffix
|
|
if idx == 1 and start == 1:
|
|
idx = 0
|
|
|
|
part1 = text[0:idx]
|
|
part2 = text[idx : len(text)]
|
|
|
|
if part1 != "":
|
|
self.num = float(part1)
|
|
self.suffix = part2
|
|
else:
|
|
self.suffix = text
|
|
|
|
def as_string(self, pad=0):
|
|
# return the float, left side zero-padded, with suffix attached
|
|
if self.num is None:
|
|
return self.suffix
|
|
|
|
negative = self.num < 0
|
|
|
|
num_f = abs(self.num)
|
|
|
|
num_int = int(num_f)
|
|
num_s = str(num_int)
|
|
if float(num_int) != num_f:
|
|
num_s = str(num_f)
|
|
|
|
num_s += self.suffix
|
|
|
|
# create padding
|
|
padding = ""
|
|
length = len(str(num_int))
|
|
if length < pad:
|
|
padding = "0" * (pad - length)
|
|
|
|
num_s = padding + num_s
|
|
if negative:
|
|
num_s = "-" + num_s
|
|
|
|
return num_s
|
|
|
|
def as_float(self):
|
|
# return the float, with no suffix
|
|
if self.suffix == "½":
|
|
if self.num is not None:
|
|
return self.num + 0.5
|
|
|
|
return 0.5
|
|
return self.num
|
|
|
|
def as_int(self):
|
|
# return the int version of the float
|
|
if self.num is None:
|
|
return None
|
|
return int(self.num)
|