shinestacker 1.6.1__tar.gz → 1.7.0__tar.gz

{shinestacker-1.6.1 → shinestacker-1.7.0}/.github/workflows/release.yml

@@ -49,9 +49,13 @@ jobs:
         with:
           name: shinestacker-${{ matrix.os }}
           path: |
-            ${{ matrix.os == 'windows-latest' && 'dist/shinestacker-release.zip' || 'dist/shinestacker-release.tar.gz' }}
+            ${{ matrix.os == 'windows-latest' && 'dist/shinestacker-release.zip' || '' }}
             ${{ matrix.os == 'windows-latest' && 'dist/*.exe' || '' }}
+            ${{ matrix.os == 'ubuntu-latest' && 'dist/shinestacker-release.tar.gz' || '' }}
+            ${{ matrix.os == 'macos-latest' && 'dist/shinestacker-release.tar.gz' || '' }}
+            ${{ matrix.os == 'macos-latest' && 'dist/shinestacker-release.dmg' || '' }}
           if-no-files-found: ignore
+
   create-release:
     needs: publish-release
     runs-on: ubuntu-latest
@@ -64,8 +68,12 @@ jobs:
       - name: Prepare release assets
         run: |
           mkdir -p release_assets
+          # Linux
           cp artifacts/shinestacker-ubuntu-latest/shinestacker-release.tar.gz release_assets/shinestacker-ubuntu.tar.gz
+          # macOS - include both formats
           cp artifacts/shinestacker-macos-latest/shinestacker-release.tar.gz release_assets/shinestacker-macos.tar.gz
+          cp artifacts/shinestacker-macos-latest/shinestacker-release.dmg release_assets/shinestacker-macos.dmg
+          # Windows
           cp artifacts/shinestacker-windows-latest/shinestacker-release.zip release_assets/shinestacker-windows.zip
           if ls artifacts/shinestacker-windows-latest/shinestacker-setup.exe 1> /dev/null 2>&1; then
             cp artifacts/shinestacker-windows-latest/shinestacker-setup.exe release_assets/
@@ -79,5 +87,6 @@ jobs:
           files: |
             release_assets/shinestacker-ubuntu.tar.gz
             release_assets/shinestacker-macos.tar.gz
+            release_assets/shinestacker-macos.dmg
             release_assets/shinestacker-windows.zip
             release_assets/shinestacker-setup.exe

{shinestacker-1.6.1 → shinestacker-1.7.0}/CHANGELOG.md

@@ -2,15 +2,33 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [v1.7.0] - 2025-10-04
+** New image adjustment actions and macOS dmg installer **
+
+### Added
+- luminosity and contrast adjustment action
+- saturation and vibrance adjustment action
+- macOS dmg installer
+
+### Changed
+- improved windows installer
+- white balance moved from filters to edit > adjust menu
+- minor GUI cosmetic improvements
+- code refactoring
+
+-----
+
 ## [v1.6.1] - 2025-10-01
-** Unreleased updates **
+** Performance improvements **
+
+### Added
+- windows installer
 
 ### Changed
 - improved display update performance by refreshing only the painted area
 - multiple frame import now runs in a separate thread, avoiding UI freezes
 - reduced dependencies and code refactored for more robust architecture
-- added windows installer
-- dropped examples and test images reduces distribution file size
+- dropped examples and test images to reduce distribution file size
 
 -----
 

{shinestacker-1.6.1/src/shinestacker.egg-info → shinestacker-1.7.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.6.1
+Version: 1.7.0
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -85,7 +85,7 @@ In order to prevent this, follow the instructions below:
 1. Download the compressed archive ```shinestacker-macos.tar.gz``` in your ```Download``` folder.
 2. Double-click the archive to uncompress it. You will find a new folder ```shinestacker```.
 3. Open a terminal (*Applications > Utilities > Terminal*)
-4. Type the folliwng command on the terminal:
+4. Type the folliwng command on the terminal (assuming you have expanded the ```tar.gz``` under ```Downloads```):
 ```bash
 xattr -cr ~/Downloads/shinestacker/shinestacker.app
 ```

{shinestacker-1.6.1 → shinestacker-1.7.0}/README.md

@@ -53,7 +53,7 @@ In order to prevent this, follow the instructions below:
 1. Download the compressed archive ```shinestacker-macos.tar.gz``` in your ```Download``` folder.
 2. Double-click the archive to uncompress it. You will find a new folder ```shinestacker```.
 3. Open a terminal (*Applications > Utilities > Terminal*)
-4. Type the folliwng command on the terminal:
+4. Type the folliwng command on the terminal (assuming you have expanded the ```tar.gz``` under ```Downloads```):
 ```bash
 xattr -cr ~/Downloads/shinestacker/shinestacker.app
 ```

shinestacker-1.7.0/scripts/build_release.py

@@ -0,0 +1,215 @@
+import os
+import shutil
+import tarfile
+import subprocess
+from pathlib import Path
+import platform
+
+
+def setup_environment():
+    os.chdir("../")
+    project_root = Path(__file__).resolve().parent.parent
+    dist_dir = project_root / "dist"
+    project_name = "shinestacker"
+    app_name = "shinestacker"
+    hooks_dir = "scripts/hooks"
+    hook_files = list(Path(hooks_dir).glob("hook-*.py"))
+    for hook in hook_files:
+        print(f"  - {hook.name}")
+    return project_root, dist_dir, project_name, app_name
+
+
+def build_pyinstaller_command(sys_name, dist_dir, project_name, app_name, hooks_dir):
+    if sys_name == 'darwin':
+        return [
+            "pyinstaller", "--windowed",
+            f"--name={app_name}",
+            f"--distpath={dist_dir}",
+            "--paths=src",
+            "--icon=src/shinestacker/gui/ico/shinestacker.icns",
+            "--argv-emulation",
+            f"--additional-hooks-dir={hooks_dir}",
+            f"--collect-all={project_name}",
+            "--collect-data=imagecodecs",
+            "--collect-submodules=imagecodecs",
+            "--copy-metadata=imagecodecs",
+            "src/shinestacker/app/main.py"
+        ]
+    elif sys_name == 'windows':
+        return [
+            "pyinstaller", "--onedir", "--windowed",
+            f"--name={app_name}",
+            f"--distpath={dist_dir}",
+            "--paths=src",
+            "--icon=src/shinestacker/gui/ico/shinestacker.ico",
+            f"--collect-all={project_name}",
+            "--collect-data=imagecodecs", "--collect-submodules=imagecodecs",
+            "--copy-metadata=imagecodecs", f"--additional-hooks-dir={hooks_dir}",
+            "src/shinestacker/app/main.py"
+        ]
+    else:
+        return [
+            "pyinstaller", "--onedir",
+            f"--name={app_name}",
+            f"--distpath={dist_dir}",
+            "--paths=src",
+            f"--collect-all={project_name}",
+            "--collect-data=imagecodecs", "--collect-submodules=imagecodecs",
+            "--copy-metadata=imagecodecs", f"--additional-hooks-dir={hooks_dir}",
+            "src/shinestacker/app/main.py"
+        ]
+
+
+def package_windows(dist_dir, app_name):
+    shutil.make_archive(
+        base_name=str(dist_dir / "shinestacker-release"),
+        format="zip",
+        root_dir=dist_dir,
+        base_dir=app_name
+    )
+
+
+def package_macos(dist_dir, app_name, project_root):
+    app_bundle = dist_dir / f"{app_name}.app"
+    if not app_bundle.exists():
+        print(f"ERROR: .app bundle not found at {app_bundle}")
+        return
+    version = get_version(project_root)
+    build_number = version.replace('.', '') + '0'  # Convert x.y.z -> xyz0
+    info_plist_template = project_root / "scripts" / "Info.plist"
+    info_plist_target = app_bundle / "Contents" / "Info.plist"
+    if info_plist_template.exists():
+        print("Processing Info.plist...")
+        with open(info_plist_template, 'r') as f:
+            plist_content = f.read()
+        plist_content = plist_content.replace('{{VERSION}}', version)
+        plist_content = plist_content.replace('{{BUILD_NUMBER}}', build_number)
+        info_plist_target.parent.mkdir(parents=True, exist_ok=True)
+        with open(info_plist_target, 'w') as f:
+            f.write(plist_content)
+        print(f"Info.plist created at: {info_plist_target}")
+    else:
+        print(f"WARNING: Info.plist template not found at {info_plist_template}")
+    icon_source = project_root / "src" / "shinestacker" / "gui" / "ico" / "shinestacker.icns"
+    dmg_temp_dir = dist_dir / "dmg_temp"
+    if dmg_temp_dir.exists():
+        shutil.rmtree(dmg_temp_dir)
+    shutil.copytree(app_bundle, dmg_temp_dir / app_bundle.name, symlinks=True)
+    os.symlink("/Applications", dmg_temp_dir / "Applications")
+    dmg_path = dist_dir / f"{app_name}-release.dmg"
+    dmg_cmd = [
+        "hdiutil", "create",
+        "-volname", app_name,
+        "-srcfolder", str(dmg_temp_dir),
+        "-ov", str(dmg_path),
+        "-format", "UDBZ",
+        "-fs", "HFS+"
+    ]
+    subprocess.run(dmg_cmd, check=True)
+    print(f"Created DMG: {dmg_path.name}")
+    if icon_source.exists():
+        print("Setting custom icon...")
+        try:
+            subprocess.run(["sips", "-i", str(icon_source)], check=True)
+            subprocess.run(["DeRez", "-only", "icns", str(icon_source)],
+                           stdout=open("/tmp/icon.r", "w"), check=True)
+            subprocess.run(["Rez", "-append", "/tmp/icon.r", "-o", str(dmg_path)], check=True)
+            subprocess.run(["SetFile", "-a", "C", str(dmg_path)], check=True)
+            print("Custom icon set successfully!")
+        except subprocess.CalledProcessError as e:
+            print(f"Could not set custom icon: {e}")
+    shutil.rmtree(dmg_temp_dir)
+    archive_path = dist_dir / "shinestacker-release.tar.gz"
+    with tarfile.open(archive_path, "w:gz") as tar:
+        tar.add(app_bundle, arcname=app_bundle.name, recursive=True)
+    print(f"Created tar.gz: {archive_path.name}")
+
+
+def package_linux(dist_dir, app_name):
+    archive_path = dist_dir / "shinestacker-release.tar.gz"
+    linux_app_dir = dist_dir / app_name
+    if linux_app_dir.exists():
+        with tarfile.open(archive_path, "w:gz") as tar:
+            tar.add(linux_app_dir, arcname=app_name, recursive=True)
+        print(f"Packaged Linux application: {app_name}")
+    else:
+        print(f"ERROR: Linux app directory not found at {linux_app_dir}")
+
+
+def get_version(project_root):
+    version_file = project_root / "src" / "shinestacker" / "_version.py"
+    version = "0.0.0"
+    if version_file.exists():
+        with open(version_file, 'r') as f:
+            content = f.read()
+            import re
+            match = re.search(r"__version__\s*=\s*['\"]([^'\"]+)['\"]", content)
+            if match:
+                version = match.group(1)
+    return version
+
+
+def create_windows_installer(project_root, dist_dir):
+    inno_paths = [
+        r"C:\Program Files (x86)\Inno Setup 6\ISCC.exe",
+        r"C:\Program Files (x86)\Inno Setup 5\ISCC.exe",
+        r"C:\Program Files\Inno Setup 6\ISCC.exe",
+        r"C:\Program Files\Inno Setup 5\ISCC.exe"
+    ]
+    iscc_exe = None
+    for path in inno_paths:
+        if os.path.exists(path):
+            iscc_exe = path
+            break
+    if not iscc_exe:
+        try:
+            subprocess.run(["choco", "--version"], check=True, capture_output=True)
+            subprocess.run(["choco", "install", "innosetup", "-y",
+                            "--no-progress", "--accept-license"], check=True)
+            for path in inno_paths:
+                if os.path.exists(path):
+                    iscc_exe = path
+                    break
+        except (subprocess.CalledProcessError, FileNotFoundError):
+            pass
+    if iscc_exe:
+        iss_script_source = project_root / "scripts" / "shinestacker-inno-setup.iss"
+        iss_script_temp = project_root / "shinestacker-inno-setup.iss"
+        if iss_script_source.exists():
+            version = get_version(project_root)
+            with open(iss_script_source, 'r') as f:
+                iss_content = f.read()
+            old_version_line = f'#define MyAppVersion "{"x.x.x"}"'
+            new_version_line = f'#define MyAppVersion "{version}"'
+            iss_content = iss_content.replace(old_version_line, new_version_line)
+            with open(iss_script_temp, 'w') as f:
+                f.write(iss_content)
+            subprocess.run([iscc_exe, str(iss_script_temp)], check=True)
+            iss_script_temp.unlink()
+            if dist_dir.exists():
+                installer_files = list(dist_dir.glob("*.exe"))
+                if installer_files:
+                    print(f"Installer created: {installer_files[0].name}")
+
+
+def main():
+    project_root, dist_dir, project_name, app_name = setup_environment()
+    sys_name = platform.system().lower()
+    hooks_dir = "scripts/hooks"
+    pyinstaller_cmd = build_pyinstaller_command(
+        sys_name, dist_dir, project_name, app_name, hooks_dir)
+    print(" ".join(pyinstaller_cmd))
+    subprocess.run(pyinstaller_cmd, check=True)
+    if sys_name == 'windows':
+        package_windows(dist_dir, app_name)
+    elif sys_name == 'darwin':
+        package_macos(dist_dir, app_name, project_root)
+    else:
+        package_linux(dist_dir, app_name)
+    if sys_name == 'windows':
+        print("=== CREATING WINDOWS INSTALLER ===")
+        create_windows_installer(project_root, dist_dir)
+
+
+if __name__ == "__main__":
+    main()

shinestacker-1.7.0/scripts/create_macos_icon.py

@@ -0,0 +1,58 @@
+import os
+import shutil
+import subprocess
+from pathlib import Path
+
+def create_macos_icon():
+    script_dir = Path(__file__).parent
+    project_root = script_dir.parent
+    png_source = project_root / "src" / "shinestacker" / "gui" / "ico" / "shinestacker.png"
+    icns_output = project_root / "src" / "shinestacker" / "gui" / "ico" / "shinestacker.icns"
+    
+    if not png_source.exists():
+        print(f"ERROR: Source PNG not found at {png_source}")
+        return False
+        
+    print(f"Creating macOS icon from {png_source}")
+    
+    iconset_dir = project_root / "src" / "shinestacker" / "gui" / "ico" / "shinestacker.iconset"
+    if iconset_dir.exists():
+        shutil.rmtree(iconset_dir)
+    iconset_dir.mkdir()
+    
+    sizes = [
+        ("16x16", 16),
+        ("16x16@2x", 32),
+        ("32x32", 32), 
+        ("32x32@2x", 64),
+        ("128x128", 128),
+        ("128x128@2x", 256),
+        ("256x256", 256),
+        ("256x256@2x", 512),
+        ("512x512", 512),
+        ("512x512@2x", 1024)
+    ]
+    
+    for name, size in sizes:
+        output_file = iconset_dir / f"icon_{name}.png"
+        print(f"  Creating {name}...")
+        subprocess.run([
+            "sips", "-z", str(size), str(size), 
+            str(png_source), 
+            "--out", str(output_file)
+        ], check=True)
+    
+    print("Converting to .icns format...")
+    subprocess.run([
+        "iconutil", "-c", "icns", 
+        str(iconset_dir), 
+        "-o", str(icns_output)
+    ], check=True)
+    
+    shutil.rmtree(iconset_dir)
+    print(f"SUCCESS: Created {icns_output}")
+    return True
+
+
+if __name__ == "__main__":
+    create_macos_icon()

{shinestacker-1.6.1 → shinestacker-1.7.0/scripts}/shinestacker-inno-setup.iss

@@ -1,5 +1,5 @@
 #define MyAppName "ShineStacker"
-#define MyAppVersion "1.6.1"
+#define MyAppVersion "x.x.x"
 #define MyAppPublisher "Luca Lista"
 #define MyAppURL "https://shinestacker.wordpress.com/"
 #define MyAppExeName "shinestacker.exe"
@@ -34,30 +34,34 @@ LicenseFile=.\LICENSE
 ; Uncomment the following line to run in non administrative install mode (install for current user only).
 ;PrivilegesRequired=lowest
 OutputBaseFilename=shinestacker-setup
-OutputDir=.\dist
+OutputDir=dist
 VersionInfoVersion={#MyAppVersion}
 VersionInfoCompany={#MyAppPublisher}
-SetupIconFile=.\src\shinestacker\gui\ico\shinestacker.ico
+SetupIconFile=src\shinestacker\gui\ico\shinestacker.ico
 SolidCompression=yes
 WizardStyle=modern
 
 [Languages]
 Name: "english"; MessagesFile: "compiler:Default.isl"
 
+[Messages]
+WelcomeLabel1=Welcome to the {#MyAppName} Setup Wizard
+WelcomeLabel2=This wizard will install {#MyAppName} {#MyAppVersion}, an open-source focus stacking application developed by Luca Lista.%n%nThe source code is available on GitHub.
+FinishedLabel=Setup has finished installing {#MyAppName} on your computer. The application may be launched by selecting the installed shortcuts.%n%nClick Finish to exit Setup.
+
 [Tasks]
 Name: "desktopicon"; Description: "{cm:CreateDesktopIcon}"; GroupDescription: "{cm:AdditionalIcons}"; Flags: unchecked
 
 [Files]
 ; Copy the entire shinestacker folder structure that contains both the exe and _internal
-Source: ".\dist\shinestacker\shinestacker\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
-Source: ".\examples\*"; DestDir: "{app}\examples"; Flags: ignoreversion recursesubdirs
+Source: "dist\shinestacker\*"; DestDir: "{app}"; Flags: ignoreversion recursesubdirs createallsubdirs
 ; NOTE: Don't use "Flags: ignoreversion" on any shared system files
 
 [Registry]
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocExt}\OpenWithProgids"; ValueType: string; ValueName: "{#MyAppAssocKey}"; ValueData: ""; Flags: uninsdeletevalue
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}"; ValueType: string; ValueName: ""; ValueData: "{#MyAppAssocName}"; Flags: uninsdeletekey
 Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\DefaultIcon"; ValueType: string; ValueName: ""; ValueData: "{app}\{#MyAppExeName},0"
-Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" ""%1"""
+Root: HKA; Subkey: "Software\Classes\{#MyAppAssocKey}\shell\open\command"; ValueType: string; ValueName: ""; ValueData: """{app}\{#MyAppExeName}"" -f ""%1"""
 
 [Icons]
 Name: "{autoprograms}\{#MyAppName}"; Filename: "{app}\{#MyAppExeName}"

shinestacker-1.7.0/src/shinestacker/_version.py

@@ -0,0 +1 @@
+__version__ = '1.7.0'

shinestacker-1.7.0/src/shinestacker/algorithms/corrections.py

@@ -0,0 +1,26 @@
+# pylint: disable=C0114, C0115, C0116, E1101
+import numpy as np
+import cv2
+from ..config.constants import constants
+
+
+def gamma_correction(img, gamma):
+    max_px_val = constants.MAX_UINT8 if img.dtype == np.uint8 else constants.MAX_UINT16
+    ar = np.arange(0, max_px_val + 1, dtype=np.float64)
+    lut = (((ar / max_px_val) ** (1.0 / gamma)) * max_px_val).astype(img.dtype)
+    return cv2.LUT(img, lut) if img.dtype == np.uint8 else np.take(lut, img)
+
+
+def contrast_correction(img, k):
+    max_px_val = constants.MAX_UINT8 if img.dtype == np.uint8 else constants.MAX_UINT16
+    ar = np.arange(0, max_px_val + 1, dtype=np.float64)
+    x = 2.0 * (ar / max_px_val) - 1.0
+    # f(x) = x * exp(k) / (1 + (exp(k) - 1)|x|),  -1 < x < +1
+    # note that: f(f(x, k), -k) = x
+    exp_k = np.exp(k)
+    numerator = x * exp_k
+    denominator = 1 + (exp_k - 1) * np.abs(x)
+    corrected = numerator / denominator
+    corrected = (corrected + 1.0) * 0.5 * max_px_val
+    lut = np.clip(corrected, 0, max_px_val).astype(img.dtype)
+    return cv2.LUT(img, lut) if img.dtype == np.uint8 else np.take(lut, img)

shinestacker-1.7.0/src/shinestacker/app/args_parser_opts.py

@@ -0,0 +1,66 @@
+# pylint: disable=C0114, C0116
+import sys
+
+
+def add_project_arguments(parser):
+    parser.add_argument('-x', '--expert', action='store_true', help='''
+expert options are visible by default.
+''')
+    parser.add_argument('-n', '--no-new-project', dest='new-project',
+                        action='store_false', default=True, help='''
+Do not open new project dialog at startup (default: open).
+''')
+
+
+def add_retouch_arguments(parser):
+    parser.add_argument('-p', '--path', nargs='?', help='''
+import frames from one or more directories.
+Multiple directories can be specified separated by ';'.
+''')
+    view_group = parser.add_mutually_exclusive_group()
+    view_group.add_argument('-v1', '--view-overlaid', action='store_true', help='''
+set overlaid view.
+''')
+    view_group.add_argument('-v2', '--view-side-by-side', action='store_true', help='''
+set side-by-side view.
+''')
+    view_group.add_argument('-v3', '--view-top-bottom', action='store_true', help='''
+set top-bottom view.
+''')
+
+
+def extract_positional_filename():
+    positional_filename = None
+    filtered_args = []
+    for arg in sys.argv[1:]:
+        if not arg.startswith('-') and not positional_filename:
+            positional_filename = arg
+        else:
+            filtered_args.append(arg)
+    return positional_filename, filtered_args
+
+
+def setup_filename_argument(parser, use_const=True):
+    if use_const:
+        parser.add_argument('-f', '--filename', nargs='?', const=True, help='''
+filename to open. Can be a project file or image file.
+Multiple files can be specified separated by ';'.
+''')
+    else:
+        parser.add_argument('-f', '--filename', nargs='?', help='''
+filename to open. Can be a project file or image file.
+Multiple files can be specified separated by ';'.
+''')
+
+
+def process_filename_argument(args, positional_filename):
+    filename = args.get('filename')
+    if positional_filename and not filename:
+        filename = positional_filename
+    if filename is True:
+        if positional_filename:
+            filename = positional_filename
+        else:
+            print("Error: -f flag used but no filename provided", file=sys.stderr)
+            sys.exit(1)
+    return filename

{shinestacker-1.6.1 → shinestacker-1.7.0}/src/shinestacker/app/gui_utils.py

@@ -1,12 +1,15 @@
 # pylint: disable=C0114, C0116, E0611, R0913, R0917
 import os
 import sys
-from PySide6.QtCore import QCoreApplication, QProcess
-from PySide6.QtGui import QAction
+import logging
+from PySide6.QtCore import Qt, QCoreApplication, QProcess
+from PySide6.QtGui import QAction, QIcon
 from shinestacker.config.constants import constants
 from shinestacker.config.config import config
+from shinestacker.config.settings import StdPathFile
 from shinestacker.app.about_dialog import show_about_dialog
 from shinestacker.app.settings_dialog import show_settings_dialog
+from shinestacker.core.logging import setup_logging
 
 
 def disable_macos_special_menu_items():
@@ -71,3 +74,17 @@ def set_css_style(app):
         }
 """
     app.setStyleSheet(css_style)
+
+
+def make_app(application_class):
+    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True,
+                  log_file=StdPathFile('shinestacker.log').get_file_path())
+    app = application_class(sys.argv)
+    if config.DONT_USE_NATIVE_MENU:
+        app.setAttribute(Qt.AA_DontUseNativeMenuBar)
+    else:
+        disable_macos_special_menu_items()
+    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
+    app.setWindowIcon(QIcon(icon_path))
+    set_css_style(app)
+    return app

{shinestacker-1.6.1 → shinestacker-1.7.0}/src/shinestacker/app/main.py

@@ -1,27 +1,26 @@
 # pylint: disable=C0114, C0115, C0116, C0413, E0611, R0903, E1121, W0201, R0915, R0912
 import sys
-import os
-import logging
 import argparse
 import matplotlib
 import matplotlib.backends.backend_pdf
 matplotlib.use('agg')
 from PySide6.QtWidgets import (QApplication, QMainWindow, QVBoxLayout, QHBoxLayout, QStackedWidget,
                                QMenu, QMessageBox, QDialog, QLabel, QListWidget, QPushButton)
-from PySide6.QtGui import QAction, QIcon, QGuiApplication
-from PySide6.QtCore import Qt, QEvent, QTimer, Signal
+from PySide6.QtGui import QAction, QGuiApplication
+from PySide6.QtCore import QEvent, QTimer, Signal
 from shinestacker.config.config import config
 config.init(DISABLE_TQDM=True, COMBINED_APP=True, DONT_USE_NATIVE_MENU=True)
 from shinestacker.config.constants import constants
-from shinestacker.config.settings import StdPathFile
-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, fill_app_menu, set_css_style)
+from shinestacker.app.gui_utils import fill_app_menu
 from shinestacker.app.help_menu import add_help_action
 from shinestacker.app.open_frames import open_frames
-from shinestacker.app.args_parser_opts import add_project_arguments, add_retouch_arguments
+from shinestacker.app.args_parser_opts import (
+    add_project_arguments, add_retouch_arguments, extract_positional_filename,
+    setup_filename_argument, process_filename_argument
+)
+from shinestacker.app.gui_utils import make_app
 
 
 class SelectionDialog(QDialog):
@@ -206,15 +205,12 @@ class Application(QApplication):
 
 
 def main():
+    positional_filename, filtered_args = extract_positional_filename()
     parser = argparse.ArgumentParser(
-        prog=f'{constants.APP_STRING.lower()}-retouch',
+        prog=f'{constants.APP_STRING.lower()}',
         description='Focus stacking App.',
         epilog=f'This app is part of the {constants.APP_STRING} package.')
-    parser.add_argument('-f', '--filename', nargs='?', help='''
-if a single file is specified, it can be either a project or an image.
-Multiple frames can be specified as a list of files.
-Multiple files can be specified separated by ';'.
-''')
+    setup_filename_argument(parser, use_const=True)
     app_group = parser.add_mutually_exclusive_group()
     app_group.add_argument('-j', '--project', action='store_true', help='''
 open project window at startup instead of project windows (default).
@@ -224,24 +220,17 @@ open retouch window at startup instead of project windows.
 ''')
     add_project_arguments(parser)
     add_retouch_arguments(parser)
-    args = vars(parser.parse_args(sys.argv[1:]))
-    filename = args['filename']
+    args = vars(parser.parse_args(filtered_args))
+    filename = process_filename_argument(args, positional_filename)
     path = args['path']
     if filename and path:
         print("can't specify both arguments --filename and --path", file=sys.stderr)
         sys.exit(1)
-    setup_logging(console_level=logging.DEBUG, file_level=logging.DEBUG, disable_console=True,
-                  log_file=StdPathFile('shinestacker.log').get_file_path())
-    app = Application(sys.argv)
-    if config.DONT_USE_NATIVE_MENU:
-        app.setAttribute(Qt.AA_DontUseNativeMenuBar)
-    else:
-        disable_macos_special_menu_items()
-    icon_path = f"{os.path.dirname(__file__)}/../gui/ico/shinestacker.png"
-    app.setWindowIcon(QIcon(icon_path))
+
+    app = make_app(Application)
     main_app = MainApp()
     app.main_app = main_app
-    set_css_style(app)
+
     main_app.show()
     main_app.activateWindow()
     if args['expert']: