WIP

Author: JWCook

naturtag/utils/thumbnails.py

@@ -72,7 +72,10 @@ def _open_raw_image(path: Path) -> Image.Image:
     import rawpy
 
     with rawpy.imread(str(path)) as raw:
-        thumb = raw.extract_thumb()
+        try:
+            thumb = raw.extract_thumb()
+        except rawpy.LibRawNoThumbnailError as e:
+            raise ValueError('No embedded thumbnail found in RAW file') from e
 
     if thumb.format == rawpy.ThumbFormat.JPEG:
         return Image.open(BytesIO(thumb.data))

test/controllers/test_image_gallery.py

@@ -8,6 +8,7 @@
 
 from naturtag.controllers.image_gallery import (
     ImageGallery,
+    MetaThumbnail,
     ThumbnailCard,
 )
 
@@ -422,6 +423,35 @@ def test_thumbnail_card__update_metadata_resets_pending_icons(thumbnail_card, mo
     assert icons.taxon_icon.pixmap().toImage() == before  # reset to secondary
 
 
+# --- MetaThumbnail ---
+
+
+def test_meta_thumbnail__get_pixmap_meta__returns_placeholder_on_error(qtbot):
+    """get_pixmap_meta returns (None, metadata, error_str) when thumbnail generation fails,
+    so the caller can show a placeholder image instead of crashing.
+    """
+    from PySide6.QtWidgets import QWidget
+
+    parent = QWidget()
+    qtbot.addWidget(parent)
+    thumbnail = MetaThumbnail(parent)
+    qtbot.addWidget(thumbnail)
+
+    with (
+        patch(
+            'naturtag.controllers.image_gallery.generate_thumbnail',
+            side_effect=ValueError('No embedded thumbnail found in RAW file'),
+        ),
+        patch('naturtag.controllers.image_gallery.DerivedMetadata') as mock_meta_cls,
+    ):
+        mock_meta_cls.return_value = MagicMock()
+        image, metadata, error = thumbnail.get_pixmap_meta(Path('/test/photo.ORF'))
+
+    assert image is None
+    assert 'No embedded thumbnail found in RAW file' in error
+    assert metadata is mock_meta_cls.return_value
+
+
 # --- Error handling ---
 
 

test/utils/test_thumbnails.py

@@ -46,9 +46,9 @@ class MockThumbFormat(Enum):
     mock.ThumbFormat = MockThumbFormat
     sys.modules['rawpy'] = mock
     yield mock
-    # Clean up
-    if 'rawpy' in sys.modules:
-        del sys.modules['rawpy']
+    # Remove all rawpy submodules so real rawpy can re-import cleanly in later tests
+    for key in [k for k in sys.modules if k == 'rawpy' or k.startswith('rawpy.')]:
+        del sys.modules[key]
 
 
 def _setup_rawpy_mock(mock_rawpy, thumb_data, thumb_format_enum):
@@ -122,6 +122,25 @@ def test_open_raw_image_imread_error(mock_rawpy):
         _open_raw_image(Path('test.ORF'))
 
 
+def test_open_raw_image_no_thumbnail(mock_rawpy):
+    """Test that LibRawNoThumbnailError is converted to a friendly ValueError"""
+
+    # Define a real exception class so it can be raised as a side_effect
+    class FakeLibRawNoThumbnailError(Exception):
+        pass
+
+    mock_rawpy.LibRawNoThumbnailError = FakeLibRawNoThumbnailError
+
+    mock_raw = MagicMock()
+    mock_raw.__enter__ = MagicMock(return_value=mock_raw)
+    mock_raw.__exit__ = MagicMock(return_value=False)
+    mock_raw.extract_thumb.side_effect = FakeLibRawNoThumbnailError
+    mock_rawpy.imread.return_value = mock_raw
+
+    with pytest.raises(ValueError, match='No embedded thumbnail found in RAW file'):
+        _open_raw_image(Path('test.ORF'))
+
+
 def test_open_raw_image_unsupported_format(mock_rawpy):
     """Test that an unsupported ThumbFormat enum value raises ValueError"""
     _setup_rawpy_mock(mock_rawpy, b'', mock_rawpy.ThumbFormat.UNKNOWN)
@@ -158,7 +177,6 @@ def test_generate_thumbnail__mock_raw(sample_image, mock_rawpy):
     mock_rawpy.imread.assert_called_once_with(str(raw_path))
 
 
-@pytest.mark.integration
 @pytest.mark.parametrize('raw_path', SAMPLE_RAW_FILES)
 def test_generate_thumbnail__real_raw(raw_path):
     """RAW file -> rawpy extraction -> PIL -> Qt QImage"""