2
0
Эх сурвалжийг харах

Merge branch 'master' into feature/ffmpeg-version-check

Max Git 5 жил өмнө
parent
commit
0f69ca8fa9

+ 1 - 1
Emby.Server.Implementations/Emby.Server.Implementations.csproj

@@ -40,7 +40,7 @@
     <PackageReference Include="Microsoft.Extensions.Hosting.Abstractions" Version="3.1.4" />
     <PackageReference Include="Mono.Nat" Version="2.0.1" />
     <PackageReference Include="prometheus-net.DotNetRuntime" Version="3.3.1" />
-    <PackageReference Include="ServiceStack.Text.Core" Version="5.8.0" />
+    <PackageReference Include="ServiceStack.Text.Core" Version="5.9.0" />
     <PackageReference Include="sharpcompress" Version="0.25.0" />
     <PackageReference Include="SQLitePCL.pretty.netstandard" Version="2.1.0" />
     <PackageReference Include="DotNet.Glob" Version="3.0.9" />

+ 1 - 1
Jellyfin.Drawing.Skia/Jellyfin.Drawing.Skia.csproj

@@ -21,7 +21,7 @@
     <PackageReference Include="BlurHashSharp" Version="1.0.1" />
     <PackageReference Include="BlurHashSharp.SkiaSharp" Version="1.0.0" />
     <PackageReference Include="SkiaSharp" Version="1.68.3" />
-    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.1" />
+    <PackageReference Include="SkiaSharp.NativeAssets.Linux" Version="1.68.3" />
     <PackageReference Include="Jellyfin.SkiaSharp.NativeAssets.LinuxArm" Version="1.68.1" />
   </ItemGroup>
 

+ 1 - 1
MediaBrowser.MediaEncoding/MediaBrowser.MediaEncoding.csproj

@@ -23,7 +23,7 @@
 
   <ItemGroup>
     <PackageReference Include="BDInfo" Version="0.7.6.1" />
-    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.0" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="4.7.1" />
     <PackageReference Include="UTF.Unknown" Version="2.3.0" />
   </ItemGroup>
 

+ 3 - 2
MediaBrowser.Providers/Plugins/Tmdb/Movies/TmdbSearch.cs

@@ -76,19 +76,20 @@ namespace MediaBrowser.Providers.Plugins.Tmdb.Movies
 
             var tmdbImageUrl = tmdbSettings.images.GetImageUrl("original");
 
-            // TODO: Investigate: Does this mean we are reparsing already parsed ItemLookupInfo?
+            // ParseName is required here.
+            // Caller provides the filename with extension stripped and NOT the parsed filename
             var parsedName = _libraryManager.ParseName(name);
             var yearInName = parsedName.Year;
             name = parsedName.Name;
             year ??= yearInName;
 
-            _logger.LogInformation("TmdbSearch: Finding id for item: {0} ({1})", name, year);
             var language = idInfo.MetadataLanguage.ToLowerInvariant();
 
             // Replace sequences of non-word characters with space
             // TMDB expects a space separated list of words make sure that is the case
             name = _cleanNonWord.Replace(name, " ").Trim();
 
+            _logger.LogInformation("TmdbSearch: Finding id for item: {0} ({1})", name, year);
             var results = await GetSearchResults(name, searchType, year, language, tmdbImageUrl, cancellationToken).ConfigureAwait(false);
 
             if (results.Count == 0)