shinestacker 1.6.1__tar.gz → 1.8.0__tar.gz

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

@@ -40,18 +40,20 @@ jobs:
           pip install -e .[dev]
 
       - name: Build and package release
-        working-directory: scripts
         run: |
-          python build_release.py
+          python scripts/build_release.py
 
       - name: Upload artifacts
         uses: actions/upload-artifact@v4
         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.dmg' || '' }}
           if-no-files-found: ignore
+
   create-release:
     needs: publish-release
     runs-on: ubuntu-latest
@@ -64,8 +66,11 @@ 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
-          cp artifacts/shinestacker-macos-latest/shinestacker-release.tar.gz release_assets/shinestacker-macos.tar.gz
+          # macOS
+          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/
@@ -78,6 +83,6 @@ jobs:
           draft: true
           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.8.0}/CHANGELOG.md

@@ -2,15 +2,50 @@
 
 This page reports the main releases only and the main changes therein.
 
+## [v1.8.0] - 2025-10-08
+** Minor improvements and accessibility fix **
+
+### Added
+- temporary disk space can be cleaned up with a new option to scratch output files at the end of a job 
+
+### Fixed
+- new project dialog displays well also with dark background settings
+
+### Changed
+- icons now adapt automatically to light or dark desktop theme
+- additional alignment parameters added to default settings
+- minor GUI stability fix
+- redundant macOS .tar.gz installer removed, replaced by .dmg image
+
+-----
+
+## [v1.7.0] - 2025-10-04
+** New image adjustment actions and macOS dmg image 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.8.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: shinestacker
-Version: 1.6.1
+Version: 1.8.0
 Summary: ShineStacker
 Author-email: Luca Lista <luka.lista@gmail.com>
 License-Expression: LGPL-3.0
@@ -85,11 +85,11 @@ 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 installed the app from the ```dmg``` image under ```Applications```):
 ```bash
-xattr -cr ~/Downloads/shinestacker/shinestacker.app
+xattr -cr /Applications/shinestacker/shinestacker.app
 ```
-5. Now you can double-click the Sine Stacker icon app in the ```shiestacker``` folder and it should run.
+5. Now you can double-click the Sine Stacker icon app and it should run.
 
 macOS adds a quarantine flag to all files downloaded from the internet. The above command removes that flag while preserving all other application functionality.
 

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

@@ -53,11 +53,11 @@ 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 installed the app from the ```dmg``` image under ```Applications```):
 ```bash
-xattr -cr ~/Downloads/shinestacker/shinestacker.app
+xattr -cr /Applications/shinestacker/shinestacker.app
 ```
-5. Now you can double-click the Sine Stacker icon app in the ```shiestacker``` folder and it should run.
+5. Now you can double-click the Sine Stacker icon app and it should run.
 
 macOS adds a quarantine flag to all files downloaded from the internet. The above command removes that flag while preserving all other application functionality.
 

shinestacker-1.8.0/scripts/build_release.py

@@ -0,0 +1,210 @@
+import os
+import shutil
+import tarfile
+import subprocess
+from pathlib import Path
+import platform
+
+
+def setup_environment():
+    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)
+
+
+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.8.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.8.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.8.0/src/shinestacker/_version.py

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

shinestacker-1.8.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.6.1 → shinestacker-1.8.0}/src/shinestacker/algorithms/stack.py

@@ -65,6 +65,9 @@ class FocusStackBase(TaskBase, ImageSequenceManager):
         if self.exif_path != '':
             self.exif_path = os.path.join(working_path, self.exif_path)
 
+    def end_job(self):
+        ImageSequenceManager.end_job(self)
+
 
 def get_bunches(collection, n_frames, n_overlap):
     bunches = [collection[x:x + n_frames]
@@ -100,6 +103,9 @@ class FocusStackBunch(SequentialTask, FocusStackBase):
     def end(self):
         SequentialTask.end(self)
 
+    def end_job(self):
+        FocusStackBase.end_job(self)
+
     def run_step(self, action_count=-1):
         self.print_message(
             color_str(f"fusing bunch: {action_count + 1}/{self.total_action_counts}",
@@ -126,3 +132,6 @@ class FocusStack(FocusStackBase):
 
     def init(self, job, _working_path=''):
         FocusStackBase.init(self, job, self.working_path)
+
+    def end_job(self):
+        FocusStackBase.end_job(self)

{shinestacker-1.6.1 → shinestacker-1.8.0}/src/shinestacker/algorithms/stack_framework.py

@@ -46,7 +46,8 @@ class StackJob(Job):
 class ImageSequenceManager:
     def __init__(self, name, input_path='', output_path='', working_path='',
                  plot_path=constants.DEFAULT_PLOTS_PATH,
-                 scratch_output_dir=True, resample=1,
+                 scratch_output_dir=True, delete_output_at_end=False,
+                 resample=1,
                  reverse_order=constants.DEFAULT_FILE_REVERSE_ORDER, **_kwargs):
         self.name = name
         self.working_path = working_path
@@ -56,6 +57,7 @@ class ImageSequenceManager:
         self._resample = resample
         self.reverse_order = reverse_order
         self.scratch_output_dir = scratch_output_dir
+        self.delete_output_at_end = delete_output_at_end
         self.enabled = None
         self.base_message = ''
         self._input_full_path = None
@@ -122,6 +124,24 @@ class ImageSequenceManager:
                                      constants.LOG_COLOR_LEVEL_2))
         self.base_message = color_str(self.name, constants.LOG_COLOR_LEVEL_1, "bold")
 
+    def scratch_outout_folder(self):
+        if self.enabled:
+            output_dir = self.output_full_path()
+            list_dir = os.listdir(output_dir)
+            n_files = len(list_dir)
+            if n_files > 0:
+                for filename in list_dir:
+                    file_path = os.path.join(output_dir, filename)
+                    if os.path.isfile(file_path):
+                        os.remove(file_path)
+            self.print_message(
+                color_str(f"output directory {self.output_path} content erased",
+                          'yellow'))
+        else:
+            self.print_message(
+                color_str(f"module disabled, output directory {self.output_path}"
+                          " not scratched", 'yellow'))
+
     def init(self, job):
         if self.working_path == '':
             self.working_path = job.working_path
@@ -130,22 +150,10 @@ class ImageSequenceManager:
         if not os.path.exists(output_dir):
             os.makedirs(output_dir)
         else:
-            list_dir = os.listdir(output_dir)
-            if len(list_dir) > 0:
+            if len(os.listdir(output_dir)):
                 if self.scratch_output_dir:
-                    if self.enabled:
-                        for filename in list_dir:
-                            file_path = os.path.join(output_dir, filename)
-                            if os.path.isfile(file_path):
-                                os.remove(file_path)
-                        self.print_message(
-                            color_str(f": output directory {self.output_path} content erased",
-                                      'yellow'))
-                    else:
-                        self.print_message(
-                            color_str(f": module disabled, output directory {self.output_path}"
-                                      " not scratched", 'yellow'))
-                else:
+                    self.scratch_outout_folder()
+                elif self.enabled:
                     self.print_message(
                         color_str(
                             f": output directory {self.output_path} not empty, "
@@ -168,6 +176,11 @@ class ImageSequenceManager:
                     self._input_filepaths.append(filepath)
         job.add_action_path(self.output_path)
 
+    def end_job(self):
+        if self.delete_output_at_end:
+            self.scratch_outout_folder()
+            os.rmdir(self.output_full_path())
+
     def folder_list_str(self):
         if isinstance(self.input_full_path(), list):
             file_list = ", ".join(
@@ -206,6 +219,9 @@ class ReferenceFrameTask(SequentialTask, ImageSequenceManager):
     def end(self):
         SequentialTask.end(self)
 
+    def end_job(self):
+        ImageSequenceManager.end_job(self)
+
     def run_frame(self, _idx, _ref_idx):
         return None
 
@@ -323,6 +339,9 @@ class CombinedActions(ReferenceFrameTask):
             if a.enabled:
                 a.end()
 
+    def end_job(self):
+        ReferenceFrameTask.end_job(self)
+
     def sequential_processing(self):
         for a in self._actions:
             if a.sequential_processing():

{shinestacker-1.6.1 → shinestacker-1.8.0}/src/shinestacker/algorithms/utils.py

@@ -140,8 +140,12 @@ def save_plot(filename, fig=None):
         if not os.path.isdir(dir_path):
             os.makedirs(dir_path)
         if fig is None:
+            logging_level = logging.getLogger().level
+            logger = logging.getLogger()
+            logger.setLevel(logging.WARNING)
             fig = plt.gcf()
-        fig.savefig(filename, dpi=150)
+            fig.savefig(filename, dpi=150)
+            logger.setLevel(logging_level)
         if config.JUPYTER_NOTEBOOK:
             plt.show()
         plt.close(fig)