Update actions/checkout action to v7

.github/workflows/ci-codeql-analysis.yml

@@ -24,7 +24,7 @@ jobs:
 
     steps:
     - name: Checkout repository
-      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
     - name: Setup .NET
       uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0

.github/workflows/ci-compat.yml

@@ -11,7 +11,7 @@ jobs:
     permissions: read-all
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}
@@ -40,7 +40,7 @@ jobs:
     permissions: read-all
     steps:
       - name: Checkout repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ github.event.pull_request.head.sha }}
           repository: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/ci-format.yml

@@ -15,7 +15,7 @@ jobs:
   format-check:
     runs-on: ubuntu-latest
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
         with:

.github/workflows/ci-tests.yml

@@ -20,7 +20,7 @@ jobs:
 
     runs-on: "${{ matrix.os }}"
     steps:
-      - uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      - uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
 
       - uses: actions/setup-dotnet@9a946fdbd5fb07b82b2f5a4466058b876ab72bb2 # v5.3.0
         with:

.github/workflows/commands.yml

@@ -24,7 +24,7 @@ jobs:
           reactions: '+1'
 
       - name: Checkout the latest code
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           token: ${{ secrets.JF_BOT_TOKEN }}
           fetch-depth: 0
@@ -40,7 +40,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
       - name: pull in script
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           repository: jellyfin/jellyfin-triage-script
 

.github/workflows/issue-template-check.yml

@@ -10,7 +10,7 @@ jobs:
       issues: write
     steps:
       - name: pull in script
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           repository: jellyfin/jellyfin-triage-script
 

.github/workflows/openapi-generate.yml

@@ -22,7 +22,7 @@ jobs:
     runs-on: ubuntu-latest
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       with:
         ref: ${{ inputs.ref }}
         repository: ${{ inputs.repository }}

.github/workflows/openapi-pull-request.yml

@@ -10,7 +10,7 @@ jobs:
       base_ref: ${{ steps.ancestor.outputs.base_ref }}
     steps:
     - name: Checkout Repository
-      uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+      uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
       with:
         ref: ${{ github.event.pull_request.head.sha }}
         repository: ${{ github.event.pull_request.head.repo.full_name }}

.github/workflows/release-bump-version.yaml

@@ -33,7 +33,7 @@ jobs:
           yq-version: v4.9.8
 
       - name: Checkout Repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ env.TAG_BRANCH }}
 
@@ -66,7 +66,7 @@ jobs:
       NEXT_VERSION: ${{ github.event.inputs.NEXT_VERSION }}
     steps:
       - name: Checkout Repository
-        uses: actions/checkout@df4cb1c069e1874edd31b4311f1884172cec0e10 # v6.0.3
+        uses: actions/checkout@9c091bb21b7c1c1d1991bb908d89e4e9dddfe3e0 # v7.0.0
         with:
           ref: ${{ env.TAG_BRANCH }}
 

Directory.Packages.props

@@ -47,7 +47,7 @@
     <PackageVersion Include="Microsoft.Extensions.Http" Version="10.0.9" />
     <PackageVersion Include="Microsoft.Extensions.Logging" Version="10.0.9" />
     <PackageVersion Include="Microsoft.Extensions.Options" Version="10.0.9" />
-    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.7.0" />
+    <PackageVersion Include="Microsoft.NET.Test.Sdk" Version="18.6.0" />
     <PackageVersion Include="MimeTypes" Version="2.5.2" />
     <PackageVersion Include="Morestachio" Version="5.0.1.670" />
     <PackageVersion Include="Moq" Version="4.18.4" />

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

@@ -57,11 +57,6 @@ 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/az.json

@@ -1,19 +0,0 @@
-{
-    "Books": "Kitablar",
-    "HomeVideos": "Ev Videoları",
-    "Latest": "Ən son",
-    "MixedContent": "Qarışıq məzmun",
-    "Movies": "Filmlər",
-    "Music": "Musiqi",
-    "MusicVideos": "Musiqi Videoları",
-    "NameSeasonUnknown": "Mövsüm Naməlum",
-    "NewVersionIsAvailable": "Jellyfin Serverin yeni versiyası yükləmək üçün əlçatandır.",
-    "NotificationOptionApplicationUpdateAvailable": "Tətbiq yeniləməsi mövcuddur",
-    "NotificationOptionApplicationUpdateInstalled": "Tətbiq yeniləməsi quraşdırılıb",
-    "NotificationOptionAudioPlayback": "Audio oxutma başladı",
-    "NotificationOptionAudioPlaybackStopped": "Audio oxutma dayandırıldı",
-    "NotificationOptionCameraImageUploaded": "Kamera şəkli yükləndi",
-    "NotificationOptionInstallationFailed": "Quraşdırma uğursuzluğu",
-    "NotificationOptionNewLibraryContent": "Yeni məzmun əlavə edildi",
-    "NotificationOptionPluginError": "Plugin uğursuzluğu"
-}

Emby.Server.Implementations/Localization/Core/en_US.json

@@ -1,64 +0,0 @@
-{
-    "AppDeviceValues": "App: {0}, Device: {1}",
-    "Artists": "Artists",
-    "AuthenticationSucceededWithUserName": "{0} successfully authenticated",
-    "Books": "Books",
-    "ChapterNameValue": "Chapter {0}",
-    "Collections": "Collections",
-    "Default": "Default",
-    "External": "External",
-    "FailedLoginAttemptWithUserName": "Failed login attempt from {0}",
-    "Favorites": "Favorites",
-    "Folders": "Folders",
-    "Forced": "Forced",
-    "Genres": "Genres",
-    "HeaderContinueWatching": "Continue Watching",
-    "HeaderFavoriteEpisodes": "Favorite Episodes",
-    "HeaderFavoriteShows": "Favorite Shows",
-    "HeaderLiveTV": "Live TV",
-    "HeaderNextUp": "Next Up",
-    "HearingImpaired": "Hearing Impaired",
-    "HomeVideos": "Home Videos",
-    "Inherit": "Inherit",
-    "LabelIpAddressValue": "IP address: {0}",
-    "LabelRunningTimeValue": "Running time: {0}",
-    "Latest": "Latest",
-    "LyricDownloadFailureFromForItem": "Lyrics failed to download from {0} for {1}",
-    "MixedContent": "Mixed content",
-    "Movies": "Movies",
-    "Music": "Music",
-    "MusicVideos": "Music Videos",
-    "NameInstallFailed": "{0} installation failed",
-    "NameSeasonNumber": "Season {0}",
-    "NameSeasonUnknown": "Season Unknown",
-    "NewVersionIsAvailable": "A new version of Jellyfin Server is available for download.",
-    "NotificationOptionApplicationUpdateAvailable": "Application update available",
-    "NotificationOptionApplicationUpdateInstalled": "Application update installed",
-    "NotificationOptionAudioPlayback": "Audio playback started",
-    "NotificationOptionAudioPlaybackStopped": "Audio playback stopped",
-    "NotificationOptionCameraImageUploaded": "Camera image uploaded",
-    "NotificationOptionInstallationFailed": "Installation failure",
-    "NotificationOptionNewLibraryContent": "New content added",
-    "NotificationOptionPluginError": "Plugin failure",
-    "NotificationOptionPluginInstalled": "Plugin installed",
-    "NotificationOptionPluginUninstalled": "Plugin uninstalled",
-    "NotificationOptionPluginUpdateInstalled": "Plugin update installed",
-    "NotificationOptionServerRestartRequired": "Server restart required",
-    "NotificationOptionTaskFailed": "Scheduled task failure",
-    "NotificationOptionUserLockedOut": "User locked out",
-    "NotificationOptionVideoPlayback": "Video playback started",
-    "NotificationOptionVideoPlaybackStopped": "Video playback stopped",
-    "Original": "Original",
-    "Photos": "Photos",
-    "PluginInstalledWithName": "{0} was installed",
-    "PluginUninstalledWithName": "{0} was uninstalled",
-    "PluginUpdatedWithName": "{0} was updated",
-    "ScheduledTaskFailedWithName": "{0} failed",
-    "Shows": "Shows",
-    "StartupEmbyServerIsLoading": "Jellyfin Server is loading. Please try again shortly.",
-    "SubtitleDownloadFailureFromForItem": "Subtitles failed to download from {0} to {1}",
-    "TvShows": "TV Shows",
-    "Undefined": "Undefined",
-    "UserCreatedWithName": "User {0} has been created",
-    "UserDeletedWithName": "User {0} has been deleted"
-}

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

@@ -107,6 +107,5 @@
     "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",
-    "LyricDownloadFailureFromForItem": "Erro ao descarregar letras de {0} para {1}"
+    "Original": "Original"
 }

Emby.Server.Implementations/Localization/Core/sk.json

@@ -106,7 +106,5 @@
     "TaskDownloadMissingLyrics": "Stiahnuť chýbajúce texty piesní",
     "TaskDownloadMissingLyricsDescription": "Stiahne texty pre piesne",
     "CleanupUserDataTask": "Prečistiť používateľské dáta",
-    "CleanupUserDataTaskDescription": "Vyčistí všetky dáta používateľa (stav sledovania, stav obľúbených atď.) z médií, ktoré už neexistujú aspoň 90 dní.",
-    "LyricDownloadFailureFromForItem": "Text piesne sa nepodarilo stiahnuť z {0} pre {1}",
-    "Original": "Originál"
+    "CleanupUserDataTaskDescription": "Vyčistí všetky dáta používateľa (stav sledovania, stav obľúbených atď.) z médií, ktoré už neexistujú aspoň 90 dní."
 }

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

@@ -106,7 +106,5 @@
     "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.",
-    "LyricDownloadFailureFromForItem": "Besedila ni bilo mogoče prenesti iz {0} za {1}",
-    "Original": "Original"
+    "CleanupUserDataTaskDescription": "Izbriše vse uporabniške podatke (stanje ogleda, priljubljene itd.) za vsebine, ki že več kot 90 dni niso na voljo."
 }

Jellyfin.Api/Controllers/TrailersController.cs

@@ -122,7 +122,6 @@ 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,14 +7870,13 @@ namespace MediaBrowser.Controller.MediaEncoding
                 audioTranscodeParams.Add("-ar " + state.BaseRequest.AudioBitRate);
             }
 
-            var sampleRate = state.OutputAudioSampleRate;
-            if (sampleRate.HasValue)
+            if (!string.Equals(outputCodec, "opus", StringComparison.OrdinalIgnoreCase))
             {
-                var sampleRateValue = sampleRate.Value;
-                if (string.Equals(outputCodec, "opus", StringComparison.OrdinalIgnoreCase))
+                // opus only supports specific sampling rates
+                var sampleRate = state.OutputAudioSampleRate;
+                if (sampleRate.HasValue)
                 {
-                    // opus only supports specific sampling rates
-                    sampleRateValue = sampleRate.Value switch
+                    var sampleRateValue = sampleRate.Value switch
                     {
                         <= 8000 => 8000,
                         <= 12000 => 12000,
@@ -7885,9 +7884,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,16 +831,8 @@ namespace MediaBrowser.Providers.Manager
             var isLocalLocked = temp.Item.IsLocked;
             if (!isLocalLocked && (options.ReplaceAllMetadata || options.MetadataRefreshMode > MetadataRefreshMode.ValidationOnly))
             {
-                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);
+                var remoteResult = await ExecuteRemoteProviders(temp, logName, false, id, providers.OfType<IRemoteMetadataProvider<TItemType, TIdType>>(), cancellationToken)
+                    .ConfigureAwait(false);
 
                 refreshResult.UpdateType |= remoteResult.UpdateType;
                 refreshResult.ErrorMessage = remoteResult.ErrorMessage;

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

@@ -11,7 +11,6 @@ using MediaBrowser.Model.Configuration;
 using MediaBrowser.Model.Dlna;
 using MediaBrowser.Model.Dto;
 using MediaBrowser.Model.Entities;
-using MediaBrowser.Model.MediaInfo;
 using Moq;
 using Xunit;
 
@@ -204,50 +203,6 @@ 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,