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:
55 lines
1.2 KiB
Makefile
55 lines
1.2 KiB
Makefile
PIP ?= pip3
|
|
PYTHON ?= python3
|
|
VERSION_STR := $(shell $(PYTHON) setup.py --version)
|
|
|
|
ifeq ($(OS),Windows_NT)
|
|
OS_VERSION=win-$(PROCESSOR_ARCHITECTURE)
|
|
APP_NAME=comictagger.exe
|
|
FINAL_NAME=ComicTagger-$(VERSION_STR)-$(OS_VERSION).exe
|
|
else ifeq ($(shell uname -s),Darwin)
|
|
OS_VERSION=osx-$(shell defaults read loginwindow SystemVersionStampAsString)-$(shell uname -m)
|
|
APP_NAME=ComicTagger.app
|
|
FINAL_NAME=ComicTagger-$(VERSION_STR)-$(OS_VERSION).app
|
|
else
|
|
APP_NAME=comictagger
|
|
FINAL_NAME=ComicTagger-$(VERSION_STR)
|
|
endif
|
|
|
|
.PHONY: all clean pydist upload dist CI
|
|
|
|
all: clean dist
|
|
|
|
clean:
|
|
rm -rf *~ *.pyc *.pyo
|
|
rm -rf scripts/*.pyc
|
|
cd comictaggerlib; rm -f *~ *.pyc *.pyo
|
|
rm -rf dist MANIFEST
|
|
rm -rf *.deb
|
|
rm -rf logdict*.log
|
|
$(MAKE) -C mac clean
|
|
rm -rf build
|
|
rm -rf comictaggerlib/ui/__pycache__
|
|
rm comictaggerlib/ctversion.py
|
|
|
|
CI:
|
|
black .
|
|
isort .
|
|
flake8 .
|
|
|
|
pydist: CI
|
|
make clean
|
|
mkdir -p piprelease
|
|
rm -f comictagger-$(VERSION_STR).zip
|
|
$(PYTHON) setup.py sdist --formats=gztar
|
|
mv dist/comictagger-$(VERSION_STR).tar.gz piprelease
|
|
rm -rf comictagger.egg-info dist
|
|
|
|
upload:
|
|
$(PYTHON) setup.py register
|
|
$(PYTHON) setup.py sdist --formats=gztar upload
|
|
|
|
dist: CI
|
|
$(PIP) install .
|
|
pyinstaller -y comictagger.spec
|
|
cd dist && zip -r $(FINAL_NAME).zip $(APP_NAME)
|