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
|
|
|
[](https://travis-ci.org/comictagger/comictagger)
|
|
|
|
|
[](https://gitter.im/comictagger/community)
|
|
|
|
|
[](https://groups.google.com/forum/#!forum/comictagger)
|
|
|
|
|
[](https://twitter.com/comictagger)
|
|
|
|
|
[](https://www.facebook.com/ComicTagger-139615369550787/)
|
|
|
|
|
|
|
|
|
|
# ComicTagger
|
|
|
|
|
|
|
|
|
|
ComicTagger is a **multi-platform** app for **writing metadata to digital comics**, written in Python and PyQt.
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## Features
|
|
|
|
|
|
|
|
|
|
* Runs on macOS, Microsoft Windows, and Linux systems
|
|
|
|
|
* Get comic information from [Comic Vine](https://comicvine.gamespot.com/)
|
|
|
|
|
* **Automatic issue matching** using advanced image processing techniques
|
|
|
|
|
* **Batch processing** in the GUI for tagging hundreds or more comics at a time
|
|
|
|
|
* Support for **ComicRack** and **ComicBookLover** tagging formats
|
|
|
|
|
* Native full support for **CBZ** digital comics
|
|
|
|
|
* Native read only support for **CBR** digital comics: full support enabled installing additional [rar tools](https://www.rarlab.com/download.htm)
|
|
|
|
|
* Command line interface (CLI) enabling **custom scripting** and **batch operations on large collections**
|
|
|
|
|
|
|
|
|
|
For details, screen-shots, release notes, and more, visit [the Wiki](https://github.com/comictagger/comictagger/wiki)
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
## Installation
|
|
|
|
|
|
|
|
|
|
### Binaries
|
|
|
|
|
|
|
|
|
|
Windows and macOS binaries are provided in the [Releases Page](https://github.com/comictagger/comictagger/releases).
|
|
|
|
|
|
|
|
|
|
Just unzip the archive in any folder and run, no additional installation steps are required.
|
|
|
|
|
|
|
|
|
|
### PIP installation
|
|
|
|
|
|
|
|
|
|
A pip package is provided, you can install it with:
|
|
|
|
|
|
|
|
|
|
```
|
|
|
|
|
$ pip3 install comictagger[GUI]
|
|
|
|
|
```
|
|
|
|
|
|
|
|
|
|
### From source
|
|
|
|
|
|
|
|
|
|
1. Ensure you have a recent version of python3 installed
|
|
|
|
|
2. Clone this repository `git clone https://github.com/comictagger/comictagger.git`
|
|
|
|
|
3. `pip3 install -r requirements_dev.txt`
|
|
|
|
|
4. Optionally install the GUI `pip3 install -r requirements-GUI.txt`
|
|
|
|
|
5. Optionally install CBR support `pip3 install -r requirements-CBR.txt`
|
|
|
|
|
6. `python3 comictagger.py`
|