Merge remote-tracking branch 'upstream/main'

Author: Andrew Arneson

.github/workflows/apprun.yaml

@@ -0,0 +1,50 @@
+name: PySide App Test
+
+on: [ push, pull_request ]
+
+jobs:
+  test:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout code
+        uses: actions/checkout@v4
+
+      - name: Set up Python
+        uses: actions/setup-python@v5
+        with:
+          python-version: '3.12'
+          cache: 'pip'
+
+      - name: Install system dependencies
+        run: |
+          # dont run update, it is slow 
+          # sudo apt-get update
+          sudo apt-get install -y --no-install-recommends \
+            libxkbcommon-x11-0 \
+            x11-utils \
+            libyaml-dev \
+            libegl1-mesa \
+            libxcb-icccm4 \
+            libxcb-image0 \
+            libxcb-keysyms1 \
+            libxcb-randr0 \
+            libxcb-render-util0 \
+            libxcb-xinerama0 \
+            libopengl0 \
+            libxcb-cursor0
+
+      - name: Install dependencies
+        run: |
+          pip install -r requirements.txt
+
+      - name: Run TagStudio app and check exit code
+        run: |
+          xvfb-run --server-args="-screen 0, 1920x1200x24 -ac +extension GLX +render -noreset"  python tagstudio/tag_studio.py --ci -o /tmp/
+          exit_code=$?
+          if [ $exit_code -eq 0 ]; then
+            echo "TagStudio ran successfully"
+          else
+            echo "TagStudio failed with exit code $exit_code"
+            exit 1
+          fi

requirements-dev.txt

@@ -1,2 +1,3 @@
 ruff==0.4.2
 pre-commit==3.7.0
+Pyinstaller==6.6.0

requirements.txt

@@ -7,4 +7,3 @@ PySide6_Addons>=6.5.1.1,<=6.6.3.1
 PySide6_Essentials>=6.5.1.1,<=6.6.3.1
 typing_extensions>=3.10.0.0,<=4.11.0
 ujson>=5.8.0,<=5.9.0
-Pyinstaller==6.6.0

tagstudio/__init__.py

@@ -12,6 +12,7 @@
 import sys
 import time
 from PIL import Image, ImageOps, ImageChops, UnidentifiedImageError
+from PIL.Image import DecompressionBombError
 import pillow_avif
 from pathlib import Path
 import traceback
@@ -643,8 +644,12 @@ def print_thumbnail(
                         # raw.thumbnail((512, 512))
                         raw.thumbnail(self.external_preview_size)
                         raw.save(external_preview_path)
-                except:
-                    print(f'{ERROR} Could not load image "{filepath}"')
+                except (
+                    UnidentifiedImageError,
+                    FileNotFoundError,
+                    DecompressionBombError,
+                ) as e:
+                    print(f'{ERROR} Could not load image "{filepath} due to {e}"')
                     if self.args.external_preview:
                         self.set_external_preview_broken()
             elif file_type in VIDEO_TYPES:
@@ -1109,24 +1114,34 @@ def create_collage(self) -> str:
                             # sys.stdout.write(f'\r{INFO} Combining [{i+1}/{len(self.lib.entries)}]: {self.get_file_color(file_type)}{entry.path}{os.sep}{entry.filename}{RESET}')
                             # sys.stdout.flush()
                             if file_type in IMAGE_TYPES:
-                                with Image.open(
-                                    os.path.normpath(
-                                        f"{self.lib.library_dir}/{entry.path}/{entry.filename}"
-                                    )
-                                ) as pic:
-                                    if keep_aspect:
-                                        pic.thumbnail((thumb_size, thumb_size))
-                                    else:
-                                        pic = pic.resize((thumb_size, thumb_size))
-                                    if data_tint_mode and color:
-                                        pic = pic.convert(mode="RGB")
-                                        pic = ImageChops.hard_light(
-                                            pic,
-                                            Image.new(
-                                                "RGB", (thumb_size, thumb_size), color
-                                            ),
+                                try:
+                                    with Image.open(
+                                        os.path.normpath(
+                                            f"{self.lib.library_dir}/{entry.path}/{entry.filename}"
                                         )
-                                    collage.paste(pic, (y * thumb_size, x * thumb_size))
+                                    ) as pic:
+                                        if keep_aspect:
+                                            pic.thumbnail((thumb_size, thumb_size))
+                                        else:
+                                            pic = pic.resize((thumb_size, thumb_size))
+                                        if data_tint_mode and color:
+                                            pic = pic.convert(mode="RGB")
+                                            pic = ImageChops.hard_light(
+                                                pic,
+                                                Image.new(
+                                                    "RGB",
+                                                    (thumb_size, thumb_size),
+                                                    color,
+                                                ),
+                                            )
+                                        collage.paste(
+                                            pic, (y * thumb_size, x * thumb_size)
+                                        )
+                                except DecompressionBombError as e:
+                                    print(
+                                        f"[ERROR] One of the images was too big ({e})"
+                                    )
+
                             elif file_type in VIDEO_TYPES:
                                 video = cv2.VideoCapture(filepath)
                                 video.set(