125 Commits

Author SHA1 Message Date
MichaelFitzurka
c2768c160b Empty metadata should not assign an empty tag. 2022-04-03 16:50:27 -04:00
MichaelFitzurka
d16f6af137 Bookmark functionality. Fixes #212. 2022-04-03 15:44:20 -04:00
MichaelFitzurka
147f9b2ea3 method renamed to match new changes. 2022-04-03 15:39:03 -04:00
Timmy Welch
bedfb233da Ensure that tags are overwritten when saving metadata 2022-04-02 15:41:50 -07:00
Timmy Welch
64d6a33f13 Merge branch 'CodeCleanup' into develop 2022-04-02 15:36:03 -07:00
Timmy Welch
e96d1d5c97 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-02 14:21:37 -07:00
Timmy Welch
6f4de04a00 Merge branch 'abuchanan920-develop' into develop 2022-03-29 22:29:48 -07:00
lordwelch
8ff4da68a4 Merge branch 'feature/179-7zip' into develop 2022-03-28 23:29:02 -07:00
MichaelFitzurka
bd1601ecf8 Updates as requested. 2022-03-26 12:42:33 -04:00
Michael Fitzurka
1540903121 Merge branch 'comictagger:develop' into feature/179-7zip 2022-03-21 09:27:47 -04:00
Timmy Welch
f0f30e8416 Merge branch 'unicodeFix' into develop 2022-03-20 10:43:02 -07:00
Timmy Welch
66f5a7d4fb Remove print statements
Fixes #223
2022-03-20 10:40:30 -07:00
Timmy Welch
dfea08903e Ensure XML is UTF-8 encoded 2022-03-19 18:17:38 -07:00
MichaelFitzurka
615b0f581f Added 7zip support thru py7zr.
Tweaked save of archive file and images in comicarchive.
2022-03-18 15:14:42 -04:00
Andrew W. Buchanan
d4dcddcd76 Explicitly specify unsigned integer sort to fix comic page order 2022-03-14 13:27:03 -04:00
Timmy Welch
478de83639 Merge branch 'metadataEdit' into develop 2022-02-21 20:22:28 -08:00
Timmy Welch
077de5c7b7 Merge branch 'bugFixes' into develop
Closes #65,#59,#154,#180,#187,#209
2022-02-21 20:06:44 -08:00
Timmy Welch
1dcca36772 Bug fixes
Closes #65,#59,#154,#180,#187,#209
2022-02-21 20:05:07 -08:00
Ozzie Isaacs
7267dac0ae Added support for bmp files
version update
2022-01-22 11:26:30 +01:00
lordwelch
d641a17dc8 Update xml instead of overwrite 2022-01-05 22:01:00 -08:00
lordwelch
af84e4a6e8 Add experimental word splitting to the filename parser
Adds a global setting as well as a setting that is only in effect
during auto-tagging
2021-12-15 10:58:34 -08:00
lordwelch
19b764ba55 Add publisher and imprint handling
Imprint handling has been added to utils and uses a subclassed dict to
return a tuple for imprint matching, this may not be the best idea but
it works for now.

Add settings option auto_imprint
Add cli flag -a, --auto-import
2021-12-15 10:54:16 -08:00
Timmy Welch
55cacf8f37 Merge pull request #206 from lordwelch/rarOptionalFix
Fix rarfile import as by default it is optional
2021-12-12 18:49:05 -08:00
lordwelch
10a3aa8080 Fix rarfile import as by default it is optional 2021-12-12 18:46:28 -08:00
Timmy Welch
3bba3f6667 Merge pull request #204 from lordwelch/buildSystem
Update build
2021-12-12 18:15:58 -08:00
lordwelch
4acfa2d2d7 Update build
Separate dependencies into files and add optional dependencies
Update natsort usage to be compliant with the latest version (#203)
Set PyQt5 to 5.15.3, 5.15.4 has issues with pyinstaller
Add pyproject.toml with setuptools, isort and black configuration
Add optional dependencies (#191)
Update README (#174)
2021-10-23 21:39:58 -07:00
lordwelch
a884974a9c Improve issue identification
Move title sanitizing code to utils module
Update issue identifier to compare sanitized names
2021-09-26 17:06:30 -07:00
lordwelch
9abd8f0cc8 Improve searchForSeries
Refactor removearticles to only remove articles
Add normalization on the search string and the series name results

Searching now only compares ASCII a-z and 0-9 and all other characters
are replaced with single space, this is done to both the search string
and the result. This fixes an with names that are separated by a
hyphen (-) in the filename but in the Comic Vine name are separated by a
slash (/) and other similar issues.
2021-08-29 17:35:34 -07:00
lordwelch
4c103d1ad8 Cleanup metadata handling
Mainly corrects for consistency in most situations
CoMet is not touched as there is no support in the gui and has an odd requirements on attributes
2021-08-07 21:54:29 -07:00
Ozzie Isaacs
59e7830f62 Update to 2.2.0
Removed pdf support -> PyPDF2 is not necessary any more
2021-03-18 18:53:18 +01:00
Ozzie Isaacs
6798cd2a83 Update version and classifier information 2021-01-17 10:30:00 +01:00
Ozzieisaacs
7aa91ea95e Fix for rarfile import on python3.5 2020-11-30 18:35:15 +01:00
Ozzie Isaacs
b323fab55e
UNRAR_TOOL variable is set on load archive 2020-08-27 21:02:16 +02:00
Ozzieisaacs
3e15b950b7 Integrated cbt/tar file support
Added logging capability
Code cosmetics
2020-05-23 16:09:10 +02:00
Ozzieisaacs
15dff9ce4e Changed unrar to rarfile
Removed unused pypdf dependency in setup
2020-04-28 20:32:10 +02:00
Ozzie Isaacs
ad8bfe5a1c
Updated dependency requirements 2020-01-19 17:38:02 +01:00
Davide Romanini
62897a15cf add pytest 2019-10-19 23:57:49 +02:00
davide-romanini
c813126fa2 Changed: use unrar-cffi for cbr handling (#151) 2019-10-05 23:59:52 +02:00
Davide Romanini
0c426a3af6 Merge tag '1.2.0+2' into develop
1.2.0+2
2019-09-25 01:55:29 +02:00
Davide Romanini
f0da9b8b3e Merge branch 'release/1.2.0+2' 2019-09-25 01:55:15 +02:00
Davide Romanini
547ff34afc Merge tag '1.2.0+1' into develop
1.2.0+1
2019-09-25 01:30:32 +02:00
Davide Romanini
d66af813a6 Merge branch 'release/1.2.0+1' 2019-09-25 01:30:03 +02:00
Davide Romanini
1fa0604218 Release 1.2.0 2019-09-25 00:51:28 +02:00
Davide Romanini
57763c74ae Release 1.2.0 2019-09-25 00:50:50 +02:00
Ozzie Isaacs
5346716578
changed Minimum python version 2019-07-15 20:17:36 +02:00
Iris W
cb279168f9 fixed syntax error 2019-04-09 15:18:28 -04:00
Iris W
0f36fdd81b made cbr support optional cos it's a hassle, and added README.md 2019-04-03 15:32:13 -04:00
Iris W
b1b6931de0 removed unused UnRAR2 and added gitignore 2019-04-03 14:58:04 -04:00
Iris Wildthyme
c57bda958e bumped pypdf2 version requirement 2019-04-02 20:51:29 -04:00
Iris Wildthyme
710771c666 license was missing - added from ComicStreamer. restructured and packaged module 2019-04-02 20:33:58 -04:00