56 Commits

Author SHA1 Message Date
Timmy Welch
f3d564ccbf Merge branch 'abuchanan920-develop' into develop 2022-04-10 10:50:41 -07: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
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
beville
3506befd0c Limit Comic Vine search result queries (#119)
* Tweaked search string based on new comic vine search behavior
Placated Beaufitul Soup by passing the parser

* Limit search results fetching after recent Comic Vine changes.
Also, minor debug comment tweaks.
2019-02-04 20:16:44 +01:00
tlc
6667f4a24f Enable Zip64 (#96) 2018-09-20 00:09:24 +02:00
davide-romanini
8918369b05 Python3 and QT5 upgrade (#109)
* Tweaked search string based on new comic vine search behavior
Placated Beaufitul Soup by passing the parser

* First cut at porting to Python 3 and PyQt5

* remove debug print

* tweaked progress dialog handling for issues on ubuntu gui

* Handle bad key more gracefullu

* More integration of unrarlib into settings and rest of app

* Better handling of "personal" unrar lib setting

* PEP 440-compliant version string

* Tuned linux rar help strings

* Got setup working again
* Attempts to build unrar on install
* Some minimal desktop integration on various platforms

* Fix wrong shortfile

* More setup.py enhancements
* Use proper temp file
* Added comment block at top

* Comment out desktop integration attempt for now

* Updated some links and info

* Fixed the html a bit

* Repaired some images that caused libpng to complain

* update readme re:  py3qt5 branch changes

* another note

* #108 feat: try to simplify windows build using only pip and python3

* #108 feat: fix python location on appveyor (try 1)

* #108 feat: use venv (try 2)

* #108 feat: use venv (try 3)

* #108 feat: update to latest pyinstaller develop branch

* #108 feat: update to latest pyinstaller develop branch (again)

* #108: add ssl libraries for windows packaging

* #108: refresh env in win build to pick the right mingw

* #108: change order of win build script operations

* #113: fix subprocess usage in pyinstaller package

* bump version
2018-09-19 22:05:39 +02:00
davide-romanini
d05133bd57 #98 Multiplatform pyinstaller dist (#99)
Multiplatform pyinstaller dist (#98)
2018-01-14 16:41:27 +01:00
davide-romanini
efd4a08d51 #87 Update comic vine url and ssl config (#93)
* #87 fix ssl comicvine communication

* handle missing libunrar. update macos makefile. remove version check window. bump version.

* update release notes

* #87 fix ssl context in several places. update comicvine api url.

* fix drag and drop issues on macOS

* bump version to 1.1.16-beta-rc2

* use PNG conversion for Windows build
2017-12-21 15:19:45 +01:00
fcanc
10d78ca536 fixed typo 2015-03-06 11:26:47 +01:00
davide-romanini
54011ae5a6 updated to unrar 0.3 2015-03-01 16:14:01 +01:00
davide-romanini
d84110ccb2 Merge branch 'fcanc-master' 2015-03-01 15:44:11 +01:00
fcanc
e71bf98c26 Huge code cleanup
- `autopep8 -aa` for general cleanup;
- Changed order of imports, they should be ordered into 3 groups:
1. standard library imports;
2. 3rd party packages;
3. project imports.
- I commented various imports that were reported as unused by my IDE.
If everything goes fine we can consider to delete them;
- The Apache license disclaimers are now comments since triple-quotes
should be used only for docstrings;
- Fix - `utils.centerWindowOnParent` did not resolve, changed to
`centerWindowOnParent`
2015-02-22 03:30:32 +01:00
fcanc
2a08e57318 Merge pull request #1 from davide-romanini/master
Merge davide-romanini commits
2015-02-18 20:44:28 +01:00
Davide Romanini
65bc97f3f6 various fixes after merging comicstream-integr 2015-02-16 16:19:38 +01:00