Merge pull request #17146 from theguymadmax/fix-identify-search

Fix Identify returning wrong results

Emby.Server.Implementations/Library/Resolvers/TV/SeriesResolver.cs

@@ -57,6 +57,11 @@ namespace Emby.Server.Implementations.Library.Resolvers.TV
                     return null;
                 }
 
+                if (args.Parent is not null && args.Parent.IsRoot)
+                {
+                    return null;
+                }
+
                 var seriesInfo = Naming.TV.SeriesResolver.Resolve(_namingOptions, args.Path);
 
                 var collectionType = args.GetCollectionType();

Emby.Server.Implementations/Localization/Core/pt-PT.json

@@ -107,5 +107,6 @@
     "TaskMoveTrickplayImagesDescription": "Move os ficheiros trickplay existentes de acordo com as definições da mediateca.",
     "CleanupUserDataTaskDescription": "Apaga todos os dados de utilizador (estados de reprodução, favoritos, etc) de arquivos média não presentes há 90 dias ou mais.",
     "CleanupUserDataTask": "Limpeza de dados de utilizador",
-    "Original": "Original"
+    "Original": "Original",
+    "LyricDownloadFailureFromForItem": "Erro ao descarregar letras de {0} para {1}"
 }

Emby.Server.Implementations/Localization/Core/sl-SI.json

@@ -106,5 +106,7 @@
     "TaskAudioNormalization": "Normalizacija zvoka",
     "TaskAudioNormalizationDescription": "Pregled datotek za podatke o normalizaciji zvoka.",
     "CleanupUserDataTask": "Čiščenje uporabniških podatkov",
-    "CleanupUserDataTaskDescription": "Izbriše vse uporabniške podatke (stanje ogleda, priljubljene itd.) za vsebine, ki že več kot 90 dni niso na voljo."
+    "CleanupUserDataTaskDescription": "Izbriše vse uporabniške podatke (stanje ogleda, priljubljene itd.) za vsebine, ki že več kot 90 dni niso na voljo.",
+    "LyricDownloadFailureFromForItem": "Besedila ni bilo mogoče prenesti iz {0} za {1}",
+    "Original": "Original"
 }

Jellyfin.Api/Controllers/TrailersController.cs

@@ -122,6 +122,7 @@ public class TrailersController : BaseJellyfinApiController
     /// <returns>A <see cref="QueryResult{BaseItemDto}"/> with the trailers.</returns>
     [HttpGet]
     [ProducesResponseType(StatusCodes.Status200OK)]
+    [Obsolete("Use GetItems with includeItemTypes=Trailer instead.")]
     public async Task<ActionResult<QueryResult<BaseItemDto>>> GetTrailers(
         [FromQuery] Guid? userId,
         [FromQuery] string? maxOfficialRating,

MediaBrowser.Controller/MediaEncoding/EncodingHelper.cs

@@ -7870,13 +7870,14 @@ namespace MediaBrowser.Controller.MediaEncoding
                 audioTranscodeParams.Add("-ar " + state.BaseRequest.AudioBitRate);
             }
 
-            if (!string.Equals(outputCodec, "opus", StringComparison.OrdinalIgnoreCase))
+            var sampleRate = state.OutputAudioSampleRate;
+            if (sampleRate.HasValue)
             {
-                // opus only supports specific sampling rates
-                var sampleRate = state.OutputAudioSampleRate;
-                if (sampleRate.HasValue)
+                var sampleRateValue = sampleRate.Value;
+                if (string.Equals(outputCodec, "opus", StringComparison.OrdinalIgnoreCase))
                 {
-                    var sampleRateValue = sampleRate.Value switch
+                    // opus only supports specific sampling rates
+                    sampleRateValue = sampleRate.Value switch
                     {
                         <= 8000 => 8000,
                         <= 12000 => 12000,
@@ -7884,9 +7885,9 @@ namespace MediaBrowser.Controller.MediaEncoding
                         <= 24000 => 24000,
                         _ => 48000
                     };
-
-                    audioTranscodeParams.Add("-ar " + sampleRateValue.ToString(CultureInfo.InvariantCulture));
                 }
+
+                audioTranscodeParams.Add("-ar " + sampleRateValue.ToString(CultureInfo.InvariantCulture));
             }
 
             // Copy the movflags from GetProgressiveVideoFullCommandLine

MediaBrowser.Providers/Manager/MetadataService.cs

@@ -831,8 +831,16 @@ namespace MediaBrowser.Providers.Manager
             var isLocalLocked = temp.Item.IsLocked;
             if (!isLocalLocked && (options.ReplaceAllMetadata || options.MetadataRefreshMode > MetadataRefreshMode.ValidationOnly))
             {
-                var remoteResult = await ExecuteRemoteProviders(temp, logName, false, id, providers.OfType<IRemoteMetadataProvider<TItemType, TIdType>>(), cancellationToken)
-                    .ConfigureAwait(false);
+                var remoteProviders = providers.OfType<IRemoteMetadataProvider<TItemType, TIdType>>();
+
+                // When identifying, run the provider the user picked first so the correct IDs are used.
+                if (!string.IsNullOrEmpty(options.SearchResult?.SearchProviderName))
+                {
+                    remoteProviders = remoteProviders
+                        .OrderBy(i => string.Equals(i.Name, options.SearchResult.SearchProviderName, StringComparison.OrdinalIgnoreCase) ? 0 : 1);
+                }
+
+                var remoteResult = await ExecuteRemoteProviders(temp, logName, false, id, remoteProviders, cancellationToken).ConfigureAwait(false);
 
                 refreshResult.UpdateType |= remoteResult.UpdateType;
                 refreshResult.ErrorMessage = remoteResult.ErrorMessage;

tests/Jellyfin.Controller.Tests/MediaEncoding/EncodingHelperTests.cs

@@ -11,6 +11,7 @@ using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.MediaInfo;
 using Moq;
 using Xunit;
 
@@ -203,6 +204,50 @@ public class EncodingHelperTests
         }
     }
 
+    [Theory]
+    [InlineData("aac", 44100, 44100)] // non-opus: requested rate must be preserved (issue #17026)
+    [InlineData("aac", 48000, 48000)]
+    [InlineData("mp3", 22050, 22050)]
+    [InlineData("flac", 96000, 96000)]
+    [InlineData("opus", 44100, 48000)] // opus: must snap to a libopus-supported rate
+    [InlineData("opus", 22050, 24000)]
+    [InlineData("opus", 8000, 8000)]
+    public void GetProgressiveAudioFullCommandLine_SampleRate_OnlyClampedForOpus(
+        string audioCodec,
+        int requestedSampleRate,
+        int expectedSampleRate)
+    {
+        var state = BuildAudioState(audioCodec, requestedSampleRate);
+        var args = CreateHelper().GetProgressiveAudioFullCommandLine(state, new EncodingOptions(), "/tmp/out");
+
+        Assert.Contains("-ar " + expectedSampleRate, args, StringComparison.Ordinal);
+    }
+
+    private static EncodingJobInfo BuildAudioState(string audioCodec, int requestedSampleRate)
+    {
+        var audio = new MediaStream { Index = 0, Type = MediaStreamType.Audio, Codec = "flac", SampleRate = 96000 };
+
+        return new EncodingJobInfo(TranscodingJobType.Progressive)
+        {
+            MediaSource = new MediaSourceInfo
+            {
+                Container = "flac",
+                MediaStreams = new List<MediaStream> { audio },
+                Path = "/media/track.flac",
+                Protocol = MediaProtocol.File,
+            },
+            AudioStream = audio,
+            OutputAudioCodec = audioCodec,
+            BaseRequest = new VideoRequestDto
+            {
+                AudioCodec = audioCodec,
+                AudioSampleRate = requestedSampleRate,
+            },
+            IsVideoRequest = false,
+            IsInputVideo = false,
+        };
+    }
+
     private static EncodingJobInfo BuildState(
         MediaStream? subtitle,
         SubtitleDeliveryMethod? deliveryMethod,