Merge branch 'master' into fix/8241-chromecast-discovery

Author: gitedmond

src/apps/legacy/controllers/itemDetails/index.js

@@ -1087,7 +1087,7 @@ function renderMoreFromSeason(view, item, apiClient) {
             cardBuilder.buildCards(result.Items, {
                 parentContainer: section,
                 itemsContainer: itemsContainer,
-                shape: 'autooverflow',
+                shape: 'overflowBackdrop',
                 sectionTitleTagName: 'h2',
                 scalable: true,
                 showTitle: true,

src/components/cardbuilder/utils/url.ts

@@ -35,6 +35,8 @@ export function getCardImageUrl({
     let imgType: ImageType | undefined;
     let itemId = null;
 
+    const skipEpisodeParentPoster = item.Type === 'Episode' && uiAspect != null && uiAspect > 1;
+
     /* eslint-disable sonarjs/no-duplicated-branches */
     if (options.preferThumb && item.ImageTags?.Thumb) {
         imgType = ImageType.Thumb;
@@ -68,6 +70,16 @@ export function getCardImageUrl({
         imgType = ImageType.Backdrop;
         imgTag = item.ParentBackdropImageTags[0];
         itemId = item.ParentBackdropItemId;
+    } else if (options.preferParentPoster && !options.preferThumb && item.Type === 'Episode'
+        && ((item.ParentPrimaryImageTag && item.ParentPrimaryImageItemId) || (item.SeriesPrimaryImageTag && item.SeriesId))) {
+        imgType = ImageType.Primary;
+        if (item.ParentPrimaryImageTag && item.ParentPrimaryImageItemId) {
+            imgTag = item.ParentPrimaryImageTag;
+            itemId = item.ParentPrimaryImageItemId;
+        } else {
+            imgTag = item.SeriesPrimaryImageTag;
+            itemId = item.SeriesId;
+        }
     } else if (item.ImageTags?.Primary && (item.Type !== 'Episode' || item.ChildCount !== 0)) {
         imgType = ImageType.Primary;
         imgTag = item.ImageTags.Primary;
@@ -80,7 +92,7 @@ export function getCardImageUrl({
         if (primaryImageAspectRatio && uiAspect) {
             coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
         }
-    } else if (item.SeriesPrimaryImageTag) {
+    } else if (item.SeriesPrimaryImageTag && !skipEpisodeParentPoster) {
         imgType = ImageType.Primary;
         imgTag = item.SeriesPrimaryImageTag;
         itemId = item.SeriesId;
@@ -97,7 +109,7 @@ export function getCardImageUrl({
         if (primaryImageAspectRatio && uiAspect) {
             coverImage = (Math.abs(primaryImageAspectRatio - uiAspect) / uiAspect) <= 0.2;
         }
-    } else if (item.ParentPrimaryImageTag) {
+    } else if (item.ParentPrimaryImageTag && !skipEpisodeParentPoster) {
         imgType = ImageType.Primary;
         imgTag = item.ParentPrimaryImageTag;
         itemId = item.ParentPrimaryImageItemId;

src/components/homesections/sections/recentlyAdded.ts

@@ -83,6 +83,7 @@ function getLatestItemsHtmlFn(
             items: items,
             shape: shape,
             preferThumb: viewType !== 'movies' && viewType !== 'tvshows' && itemType !== 'Channel' && viewType !== 'music' ? 'auto' : null,
+            preferParentPoster: true,
             showUnplayedIndicator: false,
             showChildCountIndicator: true,
             context: 'home',

src/strings/is-is.json

@@ -865,5 +865,15 @@
     "LabelAuthProvider": "Auðkennisveita",
     "LabelAutomaticallyAddToCollection": "Bæta sjálfkrafa í myndasyrpu",
     "LabelAutomaticallyAddToCollectionHelp": "Þegar að minnsta kosti tvær kvikmyndir deila sama myndasyrpu heiti verður þeim bætt sjálfkrafa í syrpuna.",
-    "LabelAutomaticallyRefreshInternetMetadataEvery": "Uppfæra lýsigögn sjálfkrafa af netinu"
+    "LabelAutomaticallyRefreshInternetMetadataEvery": "Uppfæra lýsigögn sjálfkrafa af netinu",
+    "LabelAutomaticDiscovery": "Virkja sjálfvirka greiningu",
+    "LabelAutomaticDiscoveryHelp": "Leyfa forritum að finna Jellyfin sjálfkrafa með því að nota UDP-port 7359.",
+    "LabelAvailable": "Aðgengilegt",
+    "LabelBackupsUnavailable": "Engin öryggisafrit fundust",
+    "LabelBackupWarning": "Tíma stillt verkefni eru nú þegar í gangi. Mælt er með því að stöðva þau eða bíða eftir að þeim ljúki áður en tekin er öryggisafrit.",
+    "LabelBaseUrl": "Grunn slóð (URL)",
+    "LabelBaseUrlHelp": "Bættu við undirmöppu við vefslóð þjónsins. Til dæmis: https://example.com/<baseurl>",
+    "LabelBackdropScreensaverInterval": "Tími milli bakgrunnsmynda",
+    "LabelBackdropScreensaverIntervalHelp": "Hversu margar sekúndur líða á milli þess að bakgrunnsmyndir skiptast í skjávaranum.",
+    "LabelSlideshowInterval": "Tími milli mynda"
 }

src/types/cardOptions.ts

@@ -28,6 +28,7 @@ export interface CardOptions {
     preferThumb?: boolean | string | null;
     preferDisc?: boolean;
     preferLogo?: boolean;
+    preferParentPoster?: boolean;
     scalable?: boolean;
     shape?: CardShape;
     defaultShape?: CardShape;