🐛 Fixed external image url Bug

=> Sometimes the images where not downloaded the url in metadata was an external url. -> Client requested images from external url insted of oms-BE

Also cleaned year from folder name for tmdb query

Author: redinsch

OpenMediaServer.Test/Services/DiscoveryShowServiceShould.cs

@@ -169,6 +169,8 @@ public async Task CreateFromPaths_FirstItemSeason(string path, string? folderPat
     [InlineData("/media/Shows/test/The Expanse/Season 1/The EXPANSE - S01 E02.mp4", "The Expanse", "/media/Shows/test/The Expanse")]
     [InlineData("/media/Shows/test/The 100/Season 1/S01E02.mp4", "The 100", "/media/Shows/test/The 100")]
     [InlineData("/media/Shows/test/Cyberpunk Edegrunners/Season 1/Cyberpunk - Edgerunners - S01E02 - DUAL 1080p WEB H.264 -Asdfdf (AG).mkv", "Cyberpunk Edegrunners", "/media/Shows/test/Cyberpunk Edegrunners")]
+    [InlineData("/media/Shows/ONE PIECE (2023)/Season 1/ONE.PIECE.2023.S01E01.German.ML.EAC3.2160p.NF.WEB.H265-ZeroTwo.mkv", "ONE PIECE", "/media/Shows/ONE PIECE (2023)")]
+
     public async Task CreateFromPaths_FirstItemShow(string path, string title, string? folderPath)
     {
         // Arrange

OpenMediaServer/Services/Discovery/DiscoveryShowService.cs

@@ -35,20 +35,22 @@ public async Task CreateShow(string path)
 
         _logger.LogDebug("Show detected");
 
+        
+        var cleanedFolderTitle = !string.IsNullOrWhiteSpace(discoveryInfo.Year) ? folderTitle?.Replace(discoveryInfo.Year, "")?.Replace("()", "")?.Trim() : folderTitle?.Trim();
         // Show
-        var showPath = Path.Combine(Globals.MediaFolder, "Shows", folderTitle);
+        var showPath = Path.Combine(Globals.MediaFolder, "Shows", cleanedFolderTitle);
         var show = await _inventoryService.GetItem("Show", i => i.FolderPath == showPath);
 
         if (show == null)
         {
-            show = await _binService.GetItem<InventoryItem>(folderTitle, "Show");
+            show = await _binService.GetItem<InventoryItem>(cleanedFolderTitle, "Show");
 
             if (show == null)
             {
                 show = new InventoryItem
                 {
                     Id = Guid.NewGuid(),
-                    Title = folderTitle,
+                    Title = cleanedFolderTitle,
                     Category = "Show",
                 };
 

OpenMediaServer/Services/Metadata/EpisodeMetadataService.cs

@@ -39,7 +39,9 @@ public async Task<MetadataModel> GetEpisodeMetadata(string? year, string title,
         {
             episodeInfo = await tMDbApi.GetEpisode(showData.Id, (int)season, (int)episode, Globals.TmdbApiKey);
         }
-
+        
+        var stillPath = episodeInfo?.StillPath ?? omdbData?.Poster;
+        
         var backdropBlurHash =
             await WriteImageAndReturnBlurHash(episodeInfo?.StillPath, "backdrop", "Episode", metadataId.ToString());
 
@@ -58,9 +60,9 @@ public async Task<MetadataModel> GetEpisodeMetadata(string? year, string title,
             Language = omdbData?.Language,
             Country = omdbData?.Country,
             Awards = omdbData?.Awards,
-            Backdrop = episodeInfo?.StillPath != null
+            Backdrop = stillPath != null
                 ? $"{Globals.Domain}/images/Episode/{metadataId}/backdrop"
-                : omdbData?.Poster,
+                : null,
             BackdropBlurHash = backdropBlurHash,
             Metascore = omdbData?.Metascore,
             ImdbRating = omdbData?.ImdbRating,

OpenMediaServer/Services/Metadata/MovieMetadataService.cs

@@ -35,8 +35,13 @@ public async Task<MetadataModel> GetMetadata(string? year, string title, string?
             tmdbImages = await tMDbApi.GetMovieImages(tmdbData.Id, apiKey: Globals.TmdbApiKey);
         }
 
-        var logoPath = tmdbImages?.Logos.Where(i => i.Iso_639_1 == language).FirstOrDefault()?.FilePath;
-        var posterPath = tmdbImages?.Posters.Where(i => i.Iso_639_1 == language).FirstOrDefault()?.FilePath;
+        var tmdbLogosSorted = tmdbImages?.Logos?.OrderBy(i => i.VoteAverage)?.ToList();
+        var tmdbPostersSorted = tmdbImages?.Posters?.OrderBy(i => i.VoteAverage)?.ToList();
+        
+        var logoPath = tmdbLogosSorted?.FirstOrDefault(i => i.Iso_639_1 == language)?.FilePath ??
+                       tmdbLogosSorted?.FirstOrDefault()?.FilePath;
+        var posterPath = tmdbPostersSorted?.FirstOrDefault(i => i.Iso_639_1 == language)?.FilePath ?? 
+                         tmdbPostersSorted?.FirstOrDefault()?.FilePath ?? omdbData?.Poster;
 
         var backdropBlurHash = await WriteImageAndReturnBlurHash(tmdbData?.BackdropPath, "backdrop", "Movie", metadataId.ToString());
         var logoBlurHash = await WriteImageAndReturnBlurHash(logoPath, "logo", "Movie", metadataId.ToString());
@@ -57,7 +62,7 @@ public async Task<MetadataModel> GetMetadata(string? year, string title, string?
             Language = omdbData?.Language,
             Country = omdbData?.Country,
             Awards = omdbData?.Awards,
-            Poster = posterPath != null ? $"{Globals.Domain}/images/Movie/{metadataId}/poster" : omdbData?.Poster,
+            Poster = posterPath != null ? $"{Globals.Domain}/images/Movie/{metadataId}/poster" : null,
             PosterBlurHash = posterBlurHash,
             Backdrop = tmdbData?.BackdropPath != null ? $"{Globals.Domain}/images/Movie/{metadataId}/backdrop" : null,
             BackdropBlurHash = backdropBlurHash,