e10f7dd7a7
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:
120 lines
3.7 KiB
Python
Executable File
120 lines
3.7 KiB
Python
Executable File
#!/usr/bin/python
|
|
"""Moves comic files based on metadata organizing in a tree by Publisher/Series (Volume)"""
|
|
|
|
# This script is based on make_links.py by Anthony Beville
|
|
|
|
# Copyright 2015 Fabio Cancedda, Anthony Beville
|
|
|
|
# Licensed under the Apache License, Version 2.0 (the "License");
|
|
# you may not use this file except in compliance with the License.
|
|
# You may obtain a copy of the License at
|
|
|
|
# http://www.apache.org/licenses/LICENSE-2.0
|
|
|
|
# Unless required by applicable law or agreed to in writing, software
|
|
# distributed under the License is distributed on an "AS IS" BASIS,
|
|
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
|
# See the License for the specific language governing permissions and
|
|
# limitations under the License.
|
|
|
|
import shutil
|
|
|
|
from comicapi.comicarchive import *
|
|
from comictaggerlib.settings import *
|
|
|
|
# import sys
|
|
# import os
|
|
# import platform
|
|
|
|
|
|
# from comicapi.issuestring import *
|
|
# import comicapi.utils
|
|
|
|
|
|
def make_folder(folder):
|
|
if not os.path.exists(folder):
|
|
try:
|
|
os.makedirs(folder)
|
|
except Exception as e:
|
|
print "{0} Can't make {1} -- quitting".format(e, folder)
|
|
quit()
|
|
|
|
|
|
def move_file(source, filename):
|
|
if not os.path.exists(filename):
|
|
shutil.move(os.path.abspath(source), filename)
|
|
|
|
|
|
def main():
|
|
utils.fix_output_encoding()
|
|
settings = ComicTaggerSettings()
|
|
|
|
style = MetaDataStyle.CIX
|
|
|
|
if platform.system() == "Windows":
|
|
print >> sys.stderr, "Sorry, this script works only on UNIX systems"
|
|
|
|
if len(sys.argv) < 3:
|
|
print >> sys.stderr, "Usage: {0} [comic_root][tree_root]".format(sys.argv[0])
|
|
return
|
|
|
|
comic_root = sys.argv[1]
|
|
tree_root = sys.argv[2]
|
|
|
|
print "Root is:", comic_root
|
|
if not os.path.exists(comic_root):
|
|
print >> sys.stderr, "The comic root doesn't seem a directory or it doesn't exists. -- quitting"
|
|
return
|
|
|
|
filelist = utils.get_recursive_filelist([comic_root])
|
|
|
|
if len(filelist) == 0:
|
|
print >> sys.stderr, "The comic root seems empty. -- quitting"
|
|
return
|
|
|
|
make_folder(tree_root)
|
|
|
|
# first find all comics with metadata
|
|
print "Reading in all comics..."
|
|
comic_list = []
|
|
max_name_len = 2
|
|
fmt_str = ""
|
|
for filename in filelist:
|
|
ca = ComicArchive(filename, settings.rar_exe_path, ComicTaggerSettings.getGraphic("nocover.png"))
|
|
if ca.seemsToBeAComicArchive() and ca.hasMetadata(style):
|
|
|
|
comic_list.append((filename, ca.readMetadata(style)))
|
|
|
|
max_name_len = max(max_name_len, len(filename))
|
|
fmt_str = u"{{0:{0}}}".format(max_name_len)
|
|
print >> sys.stderr, fmt_str.format(filename) + "\r",
|
|
sys.stderr.flush()
|
|
|
|
print >> sys.stderr, fmt_str.format("")
|
|
|
|
print "Found {0} tagged comics.".format(len(comic_list))
|
|
|
|
# walk through the comic list and moves each one
|
|
for filename, md in comic_list:
|
|
print >> sys.stderr, fmt_str.format(filename) + "\r",
|
|
sys.stderr.flush()
|
|
|
|
# do publisher/series organizing:
|
|
series_name = md.series
|
|
publisher_name = md.publisher
|
|
start_year = md.volume
|
|
if series_name is not None:
|
|
# some tweaks to keep various filesystems happy
|
|
series_name = series_name.replace(":", " -")
|
|
series_name = series_name.replace("/", "-")
|
|
series_name = series_name.replace("?", "")
|
|
series_folder = os.path.join(
|
|
tree_root, unicode(publisher_name), unicode(series_name) + " (" + unicode(start_year) + ")"
|
|
)
|
|
make_folder(series_folder)
|
|
move_file(filename, os.path.join(series_folder, os.path.basename(filename)))
|
|
|
|
|
|
if __name__ == "__main__":
|
|
main()
|