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:
64 lines
2.0 KiB
Python
64 lines
2.0 KiB
Python
"""A PyQT4 class to load a page image from a ComicArchive in a background thread"""
|
|
|
|
# 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.
|
|
|
|
from PyQt5 import QtCore
|
|
|
|
from comicapi.comicarchive import ComicArchive
|
|
|
|
|
|
class PageLoader(QtCore.QThread):
|
|
"""
|
|
This class holds onto a reference of each instance in a list since
|
|
problems occur if the ref count goes to zero and the GC tries to reap
|
|
the object while the thread is going.
|
|
If the client class wants to stop the thread, they should mark it as
|
|
"abandoned", and no signals will be issued.
|
|
"""
|
|
|
|
loadComplete = QtCore.pyqtSignal(bytes)
|
|
|
|
instanceList = []
|
|
mutex = QtCore.QMutex()
|
|
|
|
# Remove all finished threads from the list
|
|
@staticmethod
|
|
def reap_instances():
|
|
for obj in reversed(PageLoader.instanceList):
|
|
if obj.isFinished():
|
|
PageLoader.instanceList.remove(obj)
|
|
|
|
def __init__(self, ca: ComicArchive, page_num):
|
|
QtCore.QThread.__init__(self)
|
|
self.ca: ComicArchive = ca
|
|
self.page_num: int = page_num
|
|
self.abandoned = False
|
|
|
|
# remove any old instances, and then add ourself
|
|
PageLoader.mutex.lock()
|
|
PageLoader.reap_instances()
|
|
PageLoader.instanceList.append(self)
|
|
PageLoader.mutex.unlock()
|
|
|
|
def run(self):
|
|
image_data = self.ca.get_page(self.page_num)
|
|
if self.abandoned:
|
|
return
|
|
|
|
if image_data is not None:
|
|
if self.abandoned:
|
|
return
|
|
self.loadComplete.emit(image_data)
|