shinestacker 0.3.2__py3-none-any.whl → 0.3.4__py3-none-any.whl

shinestacker/app/main.py

@@ -1,3 +1,4 @@
+# pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201
 import sys
 import os
 import logging
@@ -14,9 +15,8 @@ from shinestacker.config.constants import constants
 from shinestacker.core.logging import setup_logging
 from shinestacker.gui.main_window import MainWindow
 from shinestacker.retouch.image_editor_ui import ImageEditorUI
-from shinestacker.app.gui_utils import disable_macos_special_menu_items
+from shinestacker.app.gui_utils import disable_macos_special_menu_items, fill_app_menu
 from shinestacker.app.help_menu import add_help_action
-from shinestacker.app.about_dialog import show_about_dialog
 from shinestacker.app.open_frames import open_frames
 
 
@@ -35,8 +35,10 @@ class MainApp(QMainWindow):
         self.stacked_widget.addWidget(self.project_window)
         self.stacked_widget.addWidget(self.retouch_window)
         self.app_menu = self.create_menu()
-        self.project_window.menuBar().insertMenu(self.project_window.menuBar().actions()[0], self.app_menu)
-        self.retouch_window.menuBar().insertMenu(self.retouch_window.menuBar().actions()[0], self.app_menu)
+        self.project_window.menuBar().insertMenu(
+            self.project_window.menuBar().actions()[0], self.app_menu)
+        self.retouch_window.menuBar().insertMenu(
+            self.retouch_window.menuBar().actions()[0], self.app_menu)
         add_help_action(self.project_window)
         add_help_action(self.retouch_window)
 
@@ -71,18 +73,7 @@ class MainApp(QMainWindow):
         app_menu.addAction(self.switch_to_project_action)
         app_menu.addAction(self.switch_to_retouch_action)
         app_menu.addSeparator()
-        about_action = QAction(f"About {constants.APP_STRING}", self)
-        about_action.triggered.connect(show_about_dialog)
-        app_menu.addAction(about_action)
-        app_menu.addSeparator()
-        if config.DONT_USE_NATIVE_MENU:
-            quit_txt, quit_short = "&Quit", "Ctrl+Q"
-        else:
-            quit_txt, quit_short = "Shut dw&wn", "Ctrl+Q"
-        exit_action = QAction(quit_txt, self)
-        exit_action.setShortcut(quit_short)
-        exit_action.triggered.connect(self.quit)
-        app_menu.addAction(exit_action)
+        fill_app_menu(self, app_menu)
         return app_menu
 
     def quit(self):
@@ -161,8 +152,8 @@ expert options are visible by default.
             main_app.switch_to_retouch()
         else:
             main_app.switch_to_project()
-            QTimer.singleShot(100, lambda: main_app.project_window.new_project())
-    QTimer.singleShot(100, lambda: main_app.setFocus())
+            QTimer.singleShot(100, main_app.project_window.new_project)
+    QTimer.singleShot(100, main_app.setFocus)
     sys.exit(app.exec())
 
 

shinestacker/app/open_frames.py

@@ -1,3 +1,4 @@
+# pylint: disable=C0114, C0116, E0611
 import os
 import sys
 from PySide6.QtCore import QTimer
@@ -20,13 +21,13 @@ def open_files(editor, filenames):
         ))
 
 
-def open_frames(editor, filename, path):
+def open_frames(editor, filename, path_list):
     if filename:
         filenames = filename.split(';')
         open_files(editor, filenames)
-    elif path:
+    elif path_list:
         reverse = False
-        paths = path.split(';')
+        paths = path_list.split(';')
         filenames = []
         for path in paths:
             if os.path.exists(path) and os.path.isdir(path):
@@ -37,5 +38,5 @@ def open_frames(editor, filename, path):
                 filenames += full_paths
             else:
                 print(f"path {path} is invalid", file=sys.stderr)
-                exit(1)
+                sys.exit(1)
         open_files(editor, filenames)

shinestacker/app/project.py

@@ -1,3 +1,4 @@
+# pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201
 import os
 import sys
 import logging
@@ -6,16 +7,15 @@ import matplotlib
 import matplotlib.backends.backend_pdf
 matplotlib.use('agg')
 from PySide6.QtWidgets import QApplication, QMenu
-from PySide6.QtGui import QIcon, QAction
+from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt, QTimer, QEvent
 from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, DONT_USE_NATIVE_MENU=True)
 from shinestacker.config.constants import constants
 from shinestacker.core.logging import setup_logging
 from shinestacker.gui.main_window import MainWindow
-from shinestacker.app.gui_utils import disable_macos_special_menu_items
+from shinestacker.app.gui_utils import disable_macos_special_menu_items, fill_app_menu
 from shinestacker.app.help_menu import add_help_action
-from shinestacker.app.about_dialog import show_about_dialog
 
 
 class ProjectApp(MainWindow):
@@ -28,18 +28,7 @@ class ProjectApp(MainWindow):
 
     def create_menu(self):
         app_menu = QMenu(constants.APP_STRING)
-        about_action = QAction(f"About {constants.APP_STRING}", self)
-        about_action.triggered.connect(show_about_dialog)
-        app_menu.addAction(about_action)
-        app_menu.addSeparator()
-        if config.DONT_USE_NATIVE_MENU:
-            quit_txt, quit_short = "&Quit", "Ctrl+Q"
-        else:
-            quit_txt, quit_short = "Shut dw&wn", "Ctrl+Q"
-        exit_action = QAction(quit_txt, self)
-        exit_action.setShortcut(quit_short)
-        exit_action.triggered.connect(self.quit)
-        app_menu.addAction(exit_action)
+        fill_app_menu(self, app_menu)
         return app_menu
 
     def _retouch_callback(self, filename):
@@ -83,7 +72,7 @@ expert options are visible by default.
     if filename:
         QTimer.singleShot(100, lambda: window.open_project(filename))
     else:
-        QTimer.singleShot(100, lambda: window.new_project())
+        QTimer.singleShot(100, window.new_project)
     sys.exit(app.exec())
 
 

shinestacker/app/retouch.py

@@ -1,17 +1,16 @@
+# pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201
 import os
 import sys
 import argparse
 from PySide6.QtWidgets import QApplication, QMenu
-from PySide6.QtGui import QIcon, QAction
+from PySide6.QtGui import QIcon
 from PySide6.QtCore import Qt, QEvent
 from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, DONT_USE_NATIVE_MENU=True)
-from shinestacker.config.config import config
 from shinestacker.config.constants import constants
 from shinestacker.retouch.image_editor_ui import ImageEditorUI
-from shinestacker.app.gui_utils import disable_macos_special_menu_items
+from shinestacker.app.gui_utils import disable_macos_special_menu_items, fill_app_menu
 from shinestacker.app.help_menu import add_help_action
-from shinestacker.app.about_dialog import show_about_dialog
 from shinestacker.app.open_frames import open_frames
 
 
@@ -24,18 +23,7 @@ class RetouchApp(ImageEditorUI):
 
     def create_menu(self):
         app_menu = QMenu(constants.APP_STRING)
-        about_action = QAction(f"About {constants.APP_STRING}", self)
-        about_action.triggered.connect(show_about_dialog)
-        app_menu.addAction(about_action)
-        app_menu.addSeparator()
-        if config.DONT_USE_NATIVE_MENU:
-            quit_txt, quit_short = "&Quit", "Ctrl+Q"
-        else:
-            quit_txt, quit_short = "Shut dw&wn", "Ctrl+Q"
-        exit_action = QAction(quit_txt, self)
-        exit_action.setShortcut(quit_short)
-        exit_action.triggered.connect(self.quit)
-        app_menu.addAction(exit_action)
+        fill_app_menu(self, app_menu)
         return app_menu
 
 
@@ -64,7 +52,7 @@ Multiple directories can be specified separated by ';'.
     path = args['path']
     if filename and path:
         print("can't specify both arguments --filename and --path", file=sys.stderr)
-        exit(1)
+        sys.exit(1)
     app = Application(sys.argv)
     if config.DONT_USE_NATIVE_MENU:
         app.setAttribute(Qt.AA_DontUseNativeMenuBar)

shinestacker/core/colors.py

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0116, C0201
+# pylint: disable=C0114, C0116
 COLORS = {
     "black": 30,
     "red": 31,
@@ -50,11 +50,11 @@ EFFECTS = {
 def color_str(text, *args):
     text_colored = text
     for arg in args:
-        if arg in COLORS.keys():
+        if arg in COLORS:
             text_colored = f"\033[{COLORS[arg]}m{text_colored}"
-        elif arg in BG_COLORS.keys():
+        elif arg in BG_COLORS:
             text_colored = f"\033[{BG_COLORS[arg]}m{text_colored}"
-        elif arg in EFFECTS.keys():
+        elif arg in EFFECTS:
             text_colored = f"\033[{EFFECTS[arg]}m{text_colored}"
         else:
             raise ValueError(f"Color or effect not supported: {arg}")

shinestacker/core/core_utils.py

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0116, C0201
+# pylint: disable=C0114, C0116
 import os
 import sys
 import platform

shinestacker/core/exceptions.py

@@ -8,7 +8,8 @@ class InvalidOptionError(FocusStackError):
         self.option = option
         self.value = value
         self.details = details
-        super().__init__(f"Invalid option {option} = {value}" + ("" if details == "" else f": {details}"))
+        super().__init__(f"Invalid option {option} = {value}" +
+                         ("" if details == "" else f": {details}"))
 
 
 class ImageLoadError(FocusStackError):

shinestacker/core/framework.py

@@ -1,4 +1,4 @@
-# pylint: disable=C0114, C0115, C0116
+# pylint: disable=C0114, C0115, C0116, R0917, R0913, R0902
 import time
 import logging
 from .. config.config import config
@@ -8,7 +8,7 @@ from .core_utils import make_tqdm_bar
 from .exceptions import RunStopException
 
 LINE_UP = "\r\033[A"
-trailing_spaces = " " * 30
+TRAILING_SPACES = " " * 30
 
 
 class TqdmCallbacks:
@@ -17,12 +17,12 @@ class TqdmCallbacks:
     callbacks = {
         'step_counts': lambda id, name, counts: TqdmCallbacks.instance().step_counts(name, counts),
         'begin_steps': lambda id, name: TqdmCallbacks.instance().begin_steps(name),
-        'end_steps': lambda id, name: TqdmCallbacks.instance().end_steps(name),
-        'after_step': lambda id, name, steps: TqdmCallbacks.instance().after_step(name)
+        'end_steps': lambda id, name: TqdmCallbacks.instance().end_steps(),
+        'after_step': lambda id, name, steps: TqdmCallbacks.instance().after_step()
     }
 
     def __init__(self):
-        self.bar = None
+        self.tbar = None
         self.counts = -1
 
     @classmethod
@@ -33,20 +33,20 @@ class TqdmCallbacks:
 
     def step_counts(self, name, counts):
         self.counts = counts
-        self.bar = make_tqdm_bar(name, self.counts)
+        self.tbar = make_tqdm_bar(name, self.counts)
 
     def begin_steps(self, name):
         pass
 
-    def end_steps(self, name):
-        if self.bar is None:
+    def end_steps(self):
+        if self.tbar is None:
             raise RuntimeError("tqdm bar not initialized")
-        self.bar.close()
-        self.bar = None
+        self.tbar.close()
+        self.tbar = None
 
-    def after_step(self, name):
-        self.bar.write("")
-        self.bar.update(1)
+    def after_step(self):
+        self.tbar.write("")
+        self.tbar.update(1)
 
 
 tqdm_callbacks = TqdmCallbacks()
@@ -58,7 +58,7 @@ def elapsed_time_str(start):
     ss = dt - mm * 60
     hh = mm // 60
     mm -= hh * 60
-    return "{:02d}:{:02d}:{:05.2f}s".format(hh, mm, ss)
+    return f"{hh:02d}:{mm:02d}:{ss:05.2f}s"
 
 
 class JobBase:
@@ -67,8 +67,11 @@ class JobBase:
         self.name = name
         self.enabled = enabled
         self.base_message = ''
+        self.logger = None
+        self._t0 = None
+        self.callbacks = None
         if config.JUPYTER_NOTEBOOK:
-            self.begin_r, self.end_r = "", "\r",
+            self.begin_r, self.end_r = "", "\r"
         else:
             self.begin_r, self.end_r = LINE_UP, None
 
@@ -80,29 +83,28 @@ class JobBase:
                 return callback(*args)
         return None
 
+    def run_core(self):
+        pass
+
     def run(self):
-        self.__t0 = time.time()
+        self._t0 = time.time()
         if not self.enabled:
             self.get_logger().warning(color_str(self.name + ": entire job disabled", 'red'))
         self.callback('before_action', self.id, self.name)
         self.run_core()
         self.callback('after_action', self.id, self.name)
-        self.get_logger().info(
-            color_str(self.name + ": ",
-                      "green", "bold") + color_str("elapsed "
-                                                   "time: {}".format(elapsed_time_str(self.__t0)),
-                                                   "green") + trailing_spaces)
-        self.get_logger().info(
-            color_str(self.name + ": ",
-                      "green", "bold") + color_str("completed", "green") + trailing_spaces)
+        msg_name = color_str(self.name + ":", "green", "bold")
+        msg_time = color_str(f"elapsed time: {elapsed_time_str(self._t0)}", "green")
+        msg_completed = color_str("completed", "green")
+        self.get_logger().info(msg=f"{msg_name} {msg_time}{TRAILING_SPACES}")
+        self.get_logger().info(msg=f"{msg_name} {msg_completed}{TRAILING_SPACES}")
 
     def get_logger(self, tqdm=False):
         if config.DISABLE_TQDM:
             tqdm = False
         if self.logger is None:
             return logging.getLogger("tqdm" if tqdm else __name__)
-        else:
-            return self.logger
+        return self.logger
 
     def set_terminator(self, tqdm=False, end='\n'):
         if config.DISABLE_TQDM:
@@ -117,14 +119,20 @@ class JobBase:
         if msg != '':
             self.base_message += (': ' + msg)
         self.set_terminator(tqdm, end)
-        self.get_logger(tqdm).log(level, begin + color_str(self.base_message, 'blue', 'bold') + trailing_spaces)
+        self.get_logger(tqdm).log(
+            level=level,
+            msg=f"{begin}{color_str(self.base_message, 'blue', 'bold')}{TRAILING_SPACES}"
+        )
         self.set_terminator(tqdm)
 
     def sub_message(self, msg, level=logging.INFO, end=None, begin='', tqdm=False):
         if config.DISABLE_TQDM:
             tqdm = False
         self.set_terminator(tqdm, end)
-        self.get_logger(tqdm).log(level, begin + self.base_message + msg + trailing_spaces)
+        self.get_logger(tqdm).log(
+            level=level,
+            msg=f"{begin}{self.base_message}{msg}{TRAILING_SPACES}"
+        )
         self.set_terminator(tqdm)
 
     def print_message_r(self, msg='', level=logging.INFO):
@@ -141,11 +149,12 @@ class Job(JobBase):
         self.__actions = []
         if logger_name is None:
             setup_logging(log_file=log_file)
-        self.logger = None if logger_name is None else logging.getLogger(logger_name)
+        if logger_name is not None:
+            self.logger = logging.getLogger(logger_name)
         self.callbacks = TqdmCallbacks.callbacks if callbacks == 'tqdm' else callbacks
 
     def time(self):
-        return time.time() - self.__t0
+        return time.time() - self._t0
 
     def init(self, a):
         pass
@@ -177,6 +186,8 @@ class Job(JobBase):
 class ActionList(JobBase):
     def __init__(self, name, enabled=True, **kwargs):
         JobBase.__init__(self, name, enabled, **kwargs)
+        self.counts = None
+        self.count = None
 
     def set_counts(self, counts):
         self.counts = counts
@@ -192,19 +203,21 @@ class ActionList(JobBase):
         self.count = 1
         return self
 
+    def run_step(self):
+        pass
+
     def __next__(self):
         if self.count <= self.counts:
             self.run_step()
             x = self.count
             self.count += 1
             return x
-        else:
-            raise StopIteration
+        raise StopIteration
 
     def run_core(self):
         self.print_message('begin run', end='\n')
         self.begin()
-        for x in iter(self):
+        for _ in iter(self):
             self.callback('after_step', self.id, self.name, self.count)
             if self.callback('check_running', self.id, self.name) is False:
                 raise RunStopException(self.name)

shinestacker/core/logging.py

@@ -1,3 +1,4 @@
+# pylint: disable=C0114, C0115, C0116
 import logging
 import sys
 from pathlib import Path
@@ -26,28 +27,26 @@ class ConsoleFormatter(logging.Formatter):
 
 class FileFormatter(logging.Formatter):
     def format(self, record):
-        fmt = f"[%(levelname).3s %(asctime)s] %(message)s"  # noqa
-        return constants.ANSI_ESCAPE.sub('', logging.Formatter(fmt).format(record).replace("\r", "").rstrip())
+        fmt = "[%(levelname).3s %(asctime)s] %(message)s"
+        return constants.ANSI_ESCAPE.sub(
+            '',
+            logging.Formatter(fmt).format(record).replace("\r", "").rstrip()
+        )
 
 
 class TqdmLoggingHandler(logging.StreamHandler):
     def emit(self, record):
         if not config.DISABLE_TQDM:
-            try:
-                tqdm.write(self.format(record), end=self.terminator)
-            except RecursionError:
-                raise
-            except Exception:
-                self.handleError(record)
+            tqdm.write(self.format(record), end=self.terminator)
         else:
             logging.StreamHandler.emit(self, record)
 
 
 def setup_logging(console_level=logging.INFO, file_level=logging.DEBUG, log_file='',
                   disable_console=False):
-    if hasattr(setup_logging, '_called'):
+    if hasattr(setup_logging, 'called'):
         return
-    setup_logging._called = True
+    setup_logging.called = True
     root_logger = logging.getLogger()
     root_logger.setLevel(logging.DEBUG)
     if not disable_console: