71 Commits

Author SHA1 Message Date
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
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
lordwelch
d641a17dc8 Update xml instead of overwrite 2022-01-05 22:01:00 -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
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