Commit Graph

760 Commits

Author SHA1 Message Date
MichaelFitzurka
593f568ea7 method renamed to match new changes. 2022-04-03 15:39:03 -04:00
Timmy Welch
7b4dba35b5 Ensure that tags are overwritten when saving metadata 2022-04-02 15:41:50 -07:00
Timmy Welch
c95e700025 Merge branch 'CodeCleanup' into develop 2022-04-02 15:36:03 -07:00
Timmy Welch
e10f7dd7a7 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
84dc148cff Merge branch 'MichaelFitzurka-feature/239-add-web-btn' into develop 2022-04-02 12:57:14 -07:00
Timmy Welch
14c9609efe Merge branch 'MichaelFitzurka-feature/232-inv-page-type' into develop 2022-04-02 12:57:04 -07:00
MichaelFitzurka
2a3620ea21 Replacing requests validation with urlparse. 2022-04-01 09:48:53 -04:00
MichaelFitzurka
8c5d4869f9 Updates to comments. 2022-03-31 13:34:40 -04:00
MichaelFitzurka
c0aa665347 Adding web link convenience button to open a valid url value in a browser window. 2022-03-31 12:40:43 -04:00
MichaelFitzurka
6900368251 Displaying invalid value with Error indicator, that way the user can see what is the invalid value and has the option to leave it or change it. 2022-03-31 10:25:00 -04:00
Timmy Welch
ac1bdf2f9c Merge branch 'abuchanan920-develop' into develop 2022-03-29 22:29:48 -07:00
Timmy Welch
c840724c9c Merge branch 'rhaussmann-natsort_fix' into develop 2022-03-29 22:23:00 -07:00
Richard Haussmann
220606a046
Merge branch 'comictagger:develop' into natsort_fix 2022-03-29 09:28:38 -06:00
Richard Haussmann
223269cc2e update requirements 2022-03-29 09:23:05 -06:00
lordwelch
31b96fdbb9 Merge branch 'feature/179-7zip' into develop 2022-03-28 23:29:02 -07:00
MichaelFitzurka
908a500e7e One more. 2022-03-26 12:45:33 -04:00
MichaelFitzurka
ae20a2eec8 Updates as requested. 2022-03-26 12:42:33 -04:00
Michael Fitzurka
287c5f39c1
Merge branch 'comictagger:develop' into feature/179-7zip 2022-03-26 12:27:34 -04:00
Timmy Welch
cfd2489228 Merge branch 'feature-227-data-src-alt-covers' into develop 2022-03-21 17:52:22 -07:00
MichaelFitzurka
86a83021a6 Update to look for images in data-src as well as src. 2022-03-21 15:29:31 -04:00
Michael Fitzurka
d7595f5ca1
Merge branch 'comictagger:develop' into feature/179-7zip 2022-03-21 09:27:47 -04:00
Timmy Welch
5a2bb66d5b Merge branch 'unicodeFix' into develop 2022-03-20 10:43:02 -07:00
Timmy Welch
5de2ce65a4 Remove print statements
Fixes #223
2022-03-20 10:40:30 -07:00
Timmy Welch
95d167561d Fix locale for macOS 2022-03-20 02:10:11 -07:00
Timmy Welch
7d2702c3b6 Update pyinstaller 2022-03-20 02:09:47 -07:00
Timmy Welch
d0f96b6511 Ensure XML is UTF-8 encoded 2022-03-19 18:17:38 -07:00
MichaelFitzurka
ba71e61d87 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
191d72554c Explicitly specify unsigned integer sort to fix comic page order 2022-03-14 13:27:03 -04:00
Timmy Welch
628251c75b Merge branch 'metadataEdit' into develop 2022-02-21 20:22:28 -08:00
Timmy Welch
71499c3d7c Merge branch 'bugFixes' into develop
Closes #65,#59,#154,#180,#187,#209
2022-02-21 20:06:44 -08:00
Timmy Welch
03b8bf4671 Bug fixes
Closes #65,#59,#154,#180,#187,#209
2022-02-21 20:05:07 -08:00
Timmy Welch
773735bf6e
Merge pull request #213 from lordwelch/series_sort
Cleanup settings from #200
2022-01-22 17:29:26 -08:00
Timmy Welch
b62e291749 Cleanup settings from #200
Rename blacklist to filter to be more accurate
2022-01-22 15:00:22 -08:00
thFrgttn
a66b5ea0e3
Series sorting filtering (#200)
Because additional series results are now returned due to #143 the series selection window can with a large number of results that are not usually sorted in a useful way.

I've created 3 settings that can help finding the corect series quickly

use the publisher black list - can be toggled from the series selction screen, as well as a setting for is default behaviour
a setting to make the result initially sorted by start year instead of the default no of issues
a setting to initially put exact and near matches at the top of the list
2022-01-22 14:40:45 -08:00
lordwelch
615650f822 Update xml instead of overwrite 2022-01-05 22:01:00 -08:00
Timmy Welch
ed16199940
Merge pull request #132 from lordwelch/FixLanguageSort
Sort language correctly
2021-12-15 23:41:40 -08:00
Timmy Welch
7005bd296e
Merge pull request #131 from lordwelch/PageListEditorExtendedSelection
Allow extended selection in the page list editor
2021-12-15 23:40:08 -08:00
lordwelch
cdeca34791 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
aefe778b36 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
lordwelch
c6e1dc87dc Allow extended selection in the page list editor 2021-12-15 10:53:01 -08:00
lordwelch
ef37158e57 Sort language correctly 2021-12-15 10:52:25 -08:00
Timmy Welch
444e67100c
Merge pull request #207 from jpcranford/patch-1
Fixed typo
2021-12-15 08:49:15 -08:00
J.P. Cranford
82d054fd05
Fixed typo 2021-12-14 16:52:48 -07:00
Timmy Welch
f82c024f8d
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
da4daa6a8a Fix rarfile import as by default it is optional 2021-12-12 18:46:28 -08:00
Timmy Welch
6e1e8959c9
Merge pull request #204 from lordwelch/buildSystem
Update build
2021-12-12 18:15:58 -08:00
lordwelch
aedc5bedb4 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
Timmy Welch
93f5061c8f
Add GitHub Actions yaml file (#201)
Upload artifacts this allows easy testing of macOS and Windows binaries
Update unrar-cffi for Python 3.9 wheels
2021-09-29 01:17:04 -07:00
Timmy Welch
d46e171bd6
Merge pull request #199 from lordwelch/seriesSearch
Improve issue identification
2021-09-26 17:09:54 -07:00
lordwelch
e7fe520660 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