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:
168 lines
6.2 KiB
Python
168 lines
6.2 KiB
Python
"""A PyQT4 dialog to confirm rename"""
|
|
|
|
# Copyright 2012-2014 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 os
|
|
from typing import List
|
|
|
|
from PyQt5 import QtCore, QtWidgets, uic
|
|
|
|
import comicapi.comicarchive
|
|
from comicapi import utils
|
|
from comicapi.comicarchive import MetaDataStyle
|
|
from comictaggerlib.filerenamer import FileRenamer
|
|
from comictaggerlib.settings import ComicTaggerSettings
|
|
from comictaggerlib.settingswindow import SettingsWindow
|
|
from comictaggerlib.ui.qtutils import center_window_on_parent
|
|
|
|
|
|
class RenameWindow(QtWidgets.QDialog):
|
|
def __init__(self, parent, comic_archive_list: List[comicapi.comicarchive.ComicArchive], data_style, settings):
|
|
super().__init__(parent)
|
|
|
|
uic.loadUi(ComicTaggerSettings.get_ui_file("renamewindow.ui"), self)
|
|
self.label.setText(f"Preview (based on {MetaDataStyle.name[data_style]} tags):")
|
|
|
|
self.setWindowFlags(
|
|
QtCore.Qt.WindowType(
|
|
self.windowFlags()
|
|
| QtCore.Qt.WindowType.WindowSystemMenuHint
|
|
| QtCore.Qt.WindowType.WindowMaximizeButtonHint
|
|
)
|
|
)
|
|
|
|
self.settings = settings
|
|
self.comic_archive_list = comic_archive_list
|
|
self.data_style = data_style
|
|
self.rename_list = []
|
|
|
|
self.btnSettings.clicked.connect(self.modify_settings)
|
|
self.renamer = FileRenamer(None)
|
|
self.config_renamer()
|
|
self.do_preview()
|
|
|
|
def config_renamer(self):
|
|
self.renamer.set_template(self.settings.rename_template)
|
|
self.renamer.set_issue_zero_padding(self.settings.rename_issue_number_padding)
|
|
self.renamer.set_smart_cleanup(self.settings.rename_use_smart_string_cleanup)
|
|
|
|
def do_preview(self):
|
|
while self.twList.rowCount() > 0:
|
|
self.twList.removeRow(0)
|
|
|
|
self.twList.setSortingEnabled(False)
|
|
|
|
for ca in self.comic_archive_list:
|
|
|
|
new_ext = None # default
|
|
if self.settings.rename_extension_based_on_archive:
|
|
if ca.is_sevenzip():
|
|
new_ext = ".cb7"
|
|
elif ca.is_zip():
|
|
new_ext = ".cbz"
|
|
elif ca.is_rar():
|
|
new_ext = ".cbr"
|
|
|
|
md = ca.read_metadata(self.data_style)
|
|
if md.is_empty:
|
|
md = ca.metadata_from_filename(self.settings.parse_scan_info)
|
|
self.renamer.set_metadata(md)
|
|
new_name = self.renamer.determine_name(ca.path, ext=new_ext)
|
|
|
|
row = self.twList.rowCount()
|
|
self.twList.insertRow(row)
|
|
folder_item = QtWidgets.QTableWidgetItem()
|
|
old_name_item = QtWidgets.QTableWidgetItem()
|
|
new_name_item = QtWidgets.QTableWidgetItem()
|
|
|
|
item_text = os.path.split(ca.path)[0]
|
|
folder_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
|
|
self.twList.setItem(row, 0, folder_item)
|
|
folder_item.setText(item_text)
|
|
folder_item.setData(QtCore.Qt.ItemDataRole.ToolTipRole, item_text)
|
|
|
|
item_text = os.path.split(ca.path)[1]
|
|
old_name_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
|
|
self.twList.setItem(row, 1, old_name_item)
|
|
old_name_item.setText(item_text)
|
|
old_name_item.setData(QtCore.Qt.ItemDataRole.ToolTipRole, item_text)
|
|
|
|
new_name_item.setFlags(QtCore.Qt.ItemFlag.ItemIsSelectable | QtCore.Qt.ItemFlag.ItemIsEnabled)
|
|
self.twList.setItem(row, 2, new_name_item)
|
|
new_name_item.setText(new_name)
|
|
new_name_item.setData(QtCore.Qt.ItemDataRole.ToolTipRole, new_name)
|
|
|
|
dict_item = {}
|
|
dict_item["archive"] = ca
|
|
dict_item["new_name"] = new_name
|
|
self.rename_list.append(dict_item)
|
|
|
|
# Adjust column sizes
|
|
self.twList.setVisible(False)
|
|
self.twList.resizeColumnsToContents()
|
|
self.twList.setVisible(True)
|
|
if self.twList.columnWidth(0) > 200:
|
|
self.twList.setColumnWidth(0, 200)
|
|
|
|
self.twList.setSortingEnabled(True)
|
|
|
|
def modify_settings(self):
|
|
settingswin = SettingsWindow(self, self.settings)
|
|
settingswin.setModal(True)
|
|
settingswin.show_rename_tab()
|
|
settingswin.exec()
|
|
if settingswin.result():
|
|
self.config_renamer()
|
|
self.do_preview()
|
|
|
|
def accept(self):
|
|
|
|
prog_dialog = QtWidgets.QProgressDialog("", "Cancel", 0, len(self.rename_list), self)
|
|
prog_dialog.setWindowTitle("Renaming Archives")
|
|
prog_dialog.setWindowModality(QtCore.Qt.WindowModality.WindowModal)
|
|
prog_dialog.setMinimumDuration(100)
|
|
center_window_on_parent(prog_dialog)
|
|
QtCore.QCoreApplication.processEvents()
|
|
|
|
for idx, item in enumerate(self.rename_list):
|
|
|
|
QtCore.QCoreApplication.processEvents()
|
|
if prog_dialog.wasCanceled():
|
|
break
|
|
idx += 1
|
|
prog_dialog.setValue(idx)
|
|
prog_dialog.setLabelText(item["new_name"])
|
|
center_window_on_parent(prog_dialog)
|
|
QtCore.QCoreApplication.processEvents()
|
|
|
|
if item["new_name"] == os.path.basename(item["archive"].path):
|
|
print(item["new_name"], "Filename is already good!")
|
|
continue
|
|
|
|
if not item["archive"].is_writable(check_rar_status=False):
|
|
continue
|
|
|
|
folder = os.path.dirname(os.path.abspath(item["archive"].path))
|
|
new_abs_path = utils.unique_file(os.path.join(folder, item["new_name"]))
|
|
|
|
os.rename(item["archive"].path, new_abs_path)
|
|
|
|
item["archive"].rename(new_abs_path)
|
|
|
|
prog_dialog.hide()
|
|
QtCore.QCoreApplication.processEvents()
|
|
|
|
QtWidgets.QDialog.accept(self)
|