96 Commits

Author SHA1 Message Date
lordwelch
a80c17bf36 Remove unused imports 2022-05-24 11:44:26 -07:00
lordwelch
f2ad417069 Cleanup setCheckState
Fix word splitting when auto-tagging
Remove commented code
2022-05-24 11:38:10 -07:00
lordwelch
563d05cdfd Fix crash on startup
Add publishers.json to pip package
Add exception handling to prevent crash
2022-05-19 20:13:59 -07:00
lordwelch
2bf943e971 Fix build errors
Add wordninja to requirements.txt
Fix typing to allow unrar-cffi to be optional
2022-05-19 18:08:05 -07:00
lordwelch
59eff520c8 Merge branch 'wordSplit' into develop 2022-05-19 17:58:45 -07:00
lordwelch
bd69aecd97 Merge branch 'AutoImprint' into develop 2022-05-19 13:28:18 -07:00
lordwelch
2942c64bae Typed 2022-05-19 13:19:19 -07:00
lordwelch
a375a63328 Fix #291
ComicTagger now accounts for any single unicode numeric value
2022-05-14 01:59:44 -07:00
lordwelch
9021c34cca Restore test cbz
Add test to ensure that metadata is read correctly
Add tests for IssueString
2022-05-14 01:59:39 -07:00
Timmy Welch
42da653b6e Merge branch 'filenameParser' into develop 2022-05-06 00:33:36 -07:00
Timmy Welch
bd423257ac Add new filename parser
I created a new, mostly over complicated, filename parser
The new parser works well in many cases and will collect more data than
the original parser but will sometimes give odd results because of how
complicated it has been made e.g.
'100 page giant' will cause issues however '100-page giant' will not

Remove the parse scan info setting as it was not respected in many cases
2022-05-06 00:30:33 -07:00
Timmy Welch
1a93b28c9d Merge branch 'removeIndent' into develop 2022-04-30 00:01:53 -07:00
Timmy Welch
a448282f42 Remove utils.indent, python 3.9 provides a similar function 2022-04-30 00:01:00 -07:00
Timmy Welch
dc0237b136 Merge branch 'MichaelFitzurka-feature-258/community-rating' into develop 2022-04-29 23:22:58 -07:00
Timmy Welch
2507b53907 Merge branch 'MichaelFitzurka-feature-278/remove-empty-tags' into develop 2022-04-26 04:25:51 -07:00
MichaelFitzurka
3f0fb7ed44 Remove empty versus clearing. 2022-04-22 09:48:47 -04:00
MichaelFitzurka
9dcccc503f Adding CommunityRating. fitxes #258 2022-04-22 09:39:32 -04:00
Timmy Welch
1dc7f401c3 Merge branch 'cleanup' into develop 2022-04-20 13:15:44 -07:00
Timmy Welch
7798aec1db Code cleanup 2022-04-20 13:13:03 -07:00
Timmy Welch
d56238663d Merge branch 'removeEnum' into develop 2022-04-20 11:44:42 -07:00
Timmy Welch
27854f2303 Partial revert of 'bd3a3a241a949833eadc90474d7c87a5c0f65c04'
Changing PageType to an Enum creates too many issues
2022-04-20 11:41:42 -07:00
Timmy Welch
f9888c5c8f Merge branch 'fixSerialization' into develop 2022-04-19 14:55:50 -07:00
Timmy Welch
9c45f90829 Fix serialization errors
Add tests to ensure issue is fixed
Add make check
Add pytest to make CI
2022-04-19 13:16:33 -07:00
Timmy Welch
548432ef31 Merge branch 'Renaming' into develop 2022-04-18 22:56:49 -07:00
Timmy Welch
6ba74e3566 Add a strict mode to file renaming
Strict renaming removes all reserved names and characters regardless
 of operating system, with out strict mode only for the current
 Operating System
Add more edge cases to smart cleanup
Add more tests for file renaming
2022-04-18 22:55:13 -07:00
Timmy Welch
49839dc0cb Allow switching between old and new rename templates
Show a message dialog explaining that there is a new template format
Add a dynamic label to show the effect of a rename
Add tests for FileRenamer
Remove the filename parameter from the determine_name function
2022-04-18 20:12:20 -07:00
Timmy Welch
bd3a3a241a Merge branch 'CodeCleanup' into develop 2022-04-18 20:10:08 -07:00
Timmy Welch
c4b4dbcfeb Code cleanup 2022-04-18 19:40:04 -07:00
Timmy Welch
5d2989f4cb Improve file renaming
Moves to Python format strings for renaming, handles directory
structures, moving of files to a destination directory, sanitizes
file paths with pathvalidate and takes a different approach to
smart filename cleanup using the Python string.Formatter class

Moving to Python format strings means we can point to python
documentation for syntax and all we have to do is document the
properties and types that are attached to the GenericMetadata class.

Switching to pathvalidate allows comictagger to more simply handle both
directories and symbols in filenames.

The only changes to the string.Formatter class is:
1. format_field returns
an empty string if the value is none or an empty string regardless of
the format specifier.
2. _vformat drops the previous literal text if the field value
is an empty string and lstrips the following literal text of closing
special characters.
2022-04-18 18:52:53 -07:00
Timmy Welch
35669dd1e3 Fix rar_support variable 2022-04-14 16:25:25 -07:00
Timmy Welch
94115baa82 Fix CI 2022-04-14 13:16:51 -07:00
lordwelch
68e33ce19d Merge branch 'feature/149-add-tests' into develop 2022-04-12 15:20:58 -07:00
Timmy Welch
a9ded80636 Merge branch 'fileEncoding' into develop 2022-04-11 18:02:26 -07:00
Timmy Welch
826b3ce898 Fix #242
Fix file encoding inconsistencies, windows defaults to cp1252, which is
not Unicode compatible.
Add logging for all exceptions in the comicapi package
Ensure that all exceptions are logged and shown to the user
2022-04-11 14:52:41 -07:00
Timmy Welch
96b44d4cba Merge branch 'MichaelFitzurka-feature/246-dbl-page' into develop 2022-04-10 10:57:46 -07:00
Timmy Welch
77143b0198 Merge branch 'feature/246-dbl-page' of https://github.com/MichaelFitzurka/comictagger into MichaelFitzurka-feature/246-dbl-page 2022-04-10 10:54:49 -07:00
Timmy Welch
f3d564ccbf Merge branch 'abuchanan920-develop' into develop 2022-04-10 10:50:41 -07:00
MichaelFitzurka
c3002e4e63 Adding attribs to ImageMetadata class. 2022-04-05 11:23:18 -04:00
abuchanan920
e85fae86f4 Use more idiomatic regular expression string
Co-authored-by: Timmy Welch <timmy@narnian.us>
2022-04-05 10:37:33 -04:00
Andrew W. Buchanan
4c7d4c312d Fix parsing of filenames that end with an ID such as [__######__] 2022-04-04 22:34:31 -04:00
Timmy Welch
5f320b4b91 Merge branch 'logging' into develop 2022-04-04 19:16:54 -07:00
Timmy Welch
7256903da4 Add basic logging 2022-04-04 19:10:22 -07:00
Timmy Welch
62baa79d23 Merge branch 'MichaelFitzurka-feature/247-empty-tags' into develop 2022-04-04 14:16:29 -07:00
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