[2] Properly use per-season backdrop files in Card creation

CollinHeist · Nov 3, 2024 · 4639e7a · 4639e7a
1 parent 07cdaa5
commit 4639e7a
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 11 deletions.
diff --git a/app/internal/cards.py b/app/internal/cards.py
@@ -656,13 +656,18 @@ def resolve_card_settings(
             card_settings['watched_style' if watched else 'unwatched_style'],
         )
     else:
-        card_settings['source_file'] = CleanPath(preferences.source_directory \
-            / series.path_safe_name \
-            / FormatString.new(
-                card_settings['source_file'], data=card_settings,
-                name='source file format', series=series, episode=episode,
-                log=log,
-            )).sanitize()
+        card_settings['source_file'] = CleanPath(
+            preferences.source_directory \
+                / series.path_safe_name \
+                / FormatString.new(
+                    card_settings['source_file'],
+                    data=card_settings,
+                    name='source file format',
+                    series=series,
+                    episode=episode,
+                    log=log,
+                )
+            ).sanitize()
 
     # Exit if the source file does not exist
     if (CardClass.USES_SOURCE_IMAGES

diff --git a/app/models/episode.py b/app/models/episode.py
@@ -445,7 +445,12 @@ def get_source_file(self, style: Style) -> Path:
         # No manually specified source, use default based on style
         if (source_name := self.source_file) is None:
             if 'art' in style:
-                source_name = 'backdrop.jpg'
+                return self.series.get_backdrop_file(
+                    self.season_number
+                    if self.series.use_per_season_assets
+                    else None,
+                    fallback=True,
+                ).resolve()
             else:
                 source_name = f's{self.season_number}e{self.episode_number}.jpg'
 

diff --git a/app/models/series.py b/app/models/series.py
@@ -747,9 +747,9 @@ def get_backdrop_file(self,
             return source_dir / 'backdrop.jpg'
 
         # Look for the season-specific poster
-        if ((logo := source_dir / f'backdrop_season{season_number}.jpg').exists()
+        if ((file := source_dir / f'backdrop_season{season_number}.jpg').exists()
             or not fallback):
-            return logo
+            return file
 
         return source_dir / 'backdrop.jpg'
 

diff --git a/modules/ref/version_webui b/modules/ref/version_webui
@@ -1 +1 @@
-v2.0-alpha.13.0-webui1
+v2.0-alpha.13.0-webui2