From 6f268736f013475ffc36368cab426e8625923d91 Mon Sep 17 00:00:00 2001 From: David Carroll Date: Tue, 22 Oct 2024 23:20:59 -0500 Subject: [PATCH 01/21] Move TV-PG ratings to be in line with PG rating. --- .../Localization/Ratings/us.csv | 32 +++++++++---------- 1 file changed, 16 insertions(+), 16 deletions(-) diff --git a/Emby.Server.Implementations/Localization/Ratings/us.csv b/Emby.Server.Implementations/Localization/Ratings/us.csv index d103ddf42d..fc91edecd5 100644 --- a/Emby.Server.Implementations/Localization/Ratings/us.csv +++ b/Emby.Server.Implementations/Localization/Ratings/us.csv @@ -5,23 +5,23 @@ TV-Y,0 TV-Y7,7 TV-Y7-FV,7 PG,10 +TV-PG,10 +TV-PG-D,10 +TV-PG-L,10 +TV-PG-S,10 +TV-PG-V,10 +TV-PG-DL,10 +TV-PG-DS,10 +TV-PG-DV,10 +TV-PG-LS,10 +TV-PG-LV,10 +TV-PG-SV,10 +TV-PG-DLS,10 +TV-PG-DLV,10 +TV-PG-DSV,10 +TV-PG-LSV,10 +TV-PG-DLSV,10 PG-13,13 -TV-PG,13 -TV-PG-D,13 -TV-PG-L,13 -TV-PG-S,13 -TV-PG-V,13 -TV-PG-DL,13 -TV-PG-DS,13 -TV-PG-DV,13 -TV-PG-LS,13 -TV-PG-LV,13 -TV-PG-SV,13 -TV-PG-DLS,13 -TV-PG-DLV,13 -TV-PG-DSV,13 -TV-PG-LSV,13 -TV-PG-DLSV,13 TV-14,14 TV-14-D,14 TV-14-L,14 From d6d6ebe3fbba4f663ab1ce79960add66d6222301 Mon Sep 17 00:00:00 2001 From: David Carroll Date: Wed, 23 Oct 2024 09:21:53 -0500 Subject: [PATCH 02/21] Update UUID for Rating Level migration --- Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs b/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs index 247e1d8450..9c2184029c 100644 --- a/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs +++ b/Jellyfin.Server/Migrations/Routines/MigrateRatingLevels.cs @@ -30,7 +30,7 @@ namespace Jellyfin.Server.Migrations.Routines } /// - public Guid Id => Guid.Parse("{67445D54-B895-4B24-9F4C-35CE0690EA07}"); + public Guid Id => Guid.Parse("{73DAB92A-178B-48CD-B05B-FE18733ACDC8}"); /// public string Name => "MigrateRatingLevels"; From 2a8ebccd166fa1e18b738884287a277e1146d385 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 19 Nov 2024 17:10:28 +0000 Subject: [PATCH 03/21] Update dependency Microsoft.NET.Test.Sdk to 17.12.0 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1f614148a6..c980abd65d 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -47,7 +47,7 @@ - + From f932c4efa742c9f82d6d3cb2757ad3b9e7148f24 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Wed, 20 Nov 2024 14:40:19 +0000 Subject: [PATCH 04/21] Update CI dependencies --- .github/workflows/ci-codeql-analysis.yml | 6 +++--- .github/workflows/ci-openapi.yml | 4 ++-- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/.github/workflows/ci-codeql-analysis.yml b/.github/workflows/ci-codeql-analysis.yml index e6993d39df..81be3882a1 100644 --- a/.github/workflows/ci-codeql-analysis.yml +++ b/.github/workflows/ci-codeql-analysis.yml @@ -27,11 +27,11 @@ jobs: dotnet-version: '9.0.x' - name: Initialize CodeQL - uses: github/codeql-action/init@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 with: languages: ${{ matrix.language }} queries: +security-extended - name: Autobuild - uses: github/codeql-action/autobuild@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@ea9e4e37992a54ee68a9622e985e60c8e8f12d9f # v3.27.4 + uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 diff --git a/.github/workflows/ci-openapi.yml b/.github/workflows/ci-openapi.yml index 353c47c54e..25b4b9f814 100644 --- a/.github/workflows/ci-openapi.yml +++ b/.github/workflows/ci-openapi.yml @@ -172,7 +172,7 @@ jobs: strip_components: 1 target: "/srv/incoming/openapi/unstable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}" - name: Move openapi.json (unstable) into place - uses: appleboy/ssh-action@25ce8cbbcb08177468c7ff7ec5cbfa236f9341e1 # v1.1.0 + uses: appleboy/ssh-action@7eaf76671a0d7eec5d98ee897acda4f968735a17 # v1.2.0 with: host: "${{ secrets.REPO_HOST }}" username: "${{ secrets.REPO_USER }}" @@ -234,7 +234,7 @@ jobs: strip_components: 1 target: "/srv/incoming/openapi/stable/jellyfin-openapi-${{ env.JELLYFIN_VERSION }}" - name: Move openapi.json (stable) into place - uses: appleboy/ssh-action@25ce8cbbcb08177468c7ff7ec5cbfa236f9341e1 # v1.1.0 + uses: appleboy/ssh-action@7eaf76671a0d7eec5d98ee897acda4f968735a17 # v1.2.0 with: host: "${{ secrets.REPO_HOST }}" username: "${{ secrets.REPO_USER }}" From edb30ee543cc747de428f86817abd31da862e997 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Fri, 22 Nov 2024 11:21:27 +0000 Subject: [PATCH 05/21] Update dependency AsyncKeyedLock to 7.1.4 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 1f614148a6..04d9dc65be 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -4,7 +4,7 @@ - + From 1c77e9606e32edf61e24100475112699c0e0f8bf Mon Sep 17 00:00:00 2001 From: Niels van Velzen Date: Sun, 24 Nov 2024 14:53:08 +0100 Subject: [PATCH 06/21] Fix typo in LibraryOptions --- .../MediaSegments/MediaSegmentManager.cs | 2 +- MediaBrowser.Model/Configuration/LibraryOptions.cs | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs index a044fec0d9..2d3a25357d 100644 --- a/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs +++ b/Jellyfin.Server.Implementations/MediaSegments/MediaSegmentManager.cs @@ -61,7 +61,7 @@ public class MediaSegmentManager : IMediaSegmentManager .Where(e => !libraryOptions.DisabledMediaSegmentProviders.Contains(GetProviderId(e.Name))) .OrderBy(i => { - var index = libraryOptions.MediaSegmentProvideOrder.IndexOf(i.Name); + var index = libraryOptions.MediaSegmentProviderOrder.IndexOf(i.Name); return index == -1 ? int.MaxValue : index; }) .ToList(); diff --git a/MediaBrowser.Model/Configuration/LibraryOptions.cs b/MediaBrowser.Model/Configuration/LibraryOptions.cs index 6054ba34e5..590b74304d 100644 --- a/MediaBrowser.Model/Configuration/LibraryOptions.cs +++ b/MediaBrowser.Model/Configuration/LibraryOptions.cs @@ -15,7 +15,7 @@ namespace MediaBrowser.Model.Configuration TypeOptions = Array.Empty(); DisabledSubtitleFetchers = Array.Empty(); DisabledMediaSegmentProviders = Array.Empty(); - MediaSegmentProvideOrder = Array.Empty(); + MediaSegmentProviderOrder = Array.Empty(); SubtitleFetcherOrder = Array.Empty(); DisabledLocalMetadataReaders = Array.Empty(); DisabledLyricFetchers = Array.Empty(); @@ -99,7 +99,7 @@ namespace MediaBrowser.Model.Configuration public string[] DisabledMediaSegmentProviders { get; set; } - public string[] MediaSegmentProvideOrder { get; set; } + public string[] MediaSegmentProviderOrder { get; set; } public bool SkipSubtitlesIfEmbeddedSubtitlesPresent { get; set; } From 1399e6be3849166bbd735747611a1dfbc48f72ca Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 14:27:29 +0000 Subject: [PATCH 07/21] Update dependency MimeTypes to 2.5.2 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 8917d47969..7027f68c57 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -48,7 +48,7 @@ - + From a0746c9a46bde57c44b104859ffcdfa7594af440 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 24 Nov 2024 18:17:11 +0000 Subject: [PATCH 08/21] Update dependency Svg.Skia to 2.0.0.4 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index 8917d47969..7234fdfadb 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -71,7 +71,7 @@ - + From 1272bb9a8420a92329cdd36898b4b0240018327f Mon Sep 17 00:00:00 2001 From: DragoPrime Date: Mon, 25 Nov 2024 19:33:47 +0000 Subject: [PATCH 09/21] Translated using Weblate (Romanian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/ro/ --- Emby.Server.Implementations/Localization/Core/ro.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Localization/Core/ro.json b/Emby.Server.Implementations/Localization/Core/ro.json index bf59e15837..a873c157e6 100644 --- a/Emby.Server.Implementations/Localization/Core/ro.json +++ b/Emby.Server.Implementations/Localization/Core/ro.json @@ -77,7 +77,7 @@ "HeaderAlbumArtists": "Artiști album", "Genres": "Genuri", "Folders": "Dosare", - "Favorites": "Favorite", + "Favorites": "Preferate", "FailedLoginAttemptWithUserName": "Încercare de conectare eșuată pentru {0}", "DeviceOnlineWithName": "{0} este conectat", "DeviceOfflineWithName": "{0} s-a deconectat", From b03f478867d4d581d45322f3048874226acf9aba Mon Sep 17 00:00:00 2001 From: 1hitsong <3330318+1hitsong@users.noreply.github.com> Date: Fri, 29 Nov 2024 12:32:00 -0500 Subject: [PATCH 10/21] Fix typo in guide info endpoint comment (#13117) --- Jellyfin.Api/Controllers/LiveTvController.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/Jellyfin.Api/Controllers/LiveTvController.cs b/Jellyfin.Api/Controllers/LiveTvController.cs index 0ae8baa671..421f23fa1e 100644 --- a/Jellyfin.Api/Controllers/LiveTvController.cs +++ b/Jellyfin.Api/Controllers/LiveTvController.cs @@ -962,9 +962,9 @@ public class LiveTvController : BaseJellyfinApiController } /// - /// Get guid info. + /// Get guide info. /// - /// Guid info returned. + /// Guide info returned. /// An containing the guide info. [HttpGet("GuideInfo")] [Authorize(Policy = Policies.LiveTvAccess)] From 556f4c4bfbf915eec3b1b9983f1c132916281b67 Mon Sep 17 00:00:00 2001 From: JPVenson Date: Sat, 30 Nov 2024 12:07:48 +0100 Subject: [PATCH 11/21] Updated DevContainer to Bookworm Debian (#13037) * Updated DevContainer to Bookworm Debian Removed dual container and made FFmpeg install default * Update .devcontainer/devcontainer.json Co-authored-by: Bond-009 * Fixed Tabs --------- Co-authored-by: Bond-009 --- .../Dev - Server Ffmpeg/devcontainer.json | 28 ------------------- .devcontainer/devcontainer.json | 4 +-- .../install-ffmpeg.sh | 2 +- .vscode/extensions.json | 11 ++++---- 4 files changed, 9 insertions(+), 36 deletions(-) delete mode 100644 .devcontainer/Dev - Server Ffmpeg/devcontainer.json rename .devcontainer/{Dev - Server Ffmpeg => }/install-ffmpeg.sh (96%) diff --git a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json b/.devcontainer/Dev - Server Ffmpeg/devcontainer.json deleted file mode 100644 index a934512f49..0000000000 --- a/.devcontainer/Dev - Server Ffmpeg/devcontainer.json +++ /dev/null @@ -1,28 +0,0 @@ -{ - "name": "Development Jellyfin Server - FFmpeg", - "image":"mcr.microsoft.com/devcontainers/dotnet:9.0-jammy", - // restores nuget packages, installs the dotnet workloads and installs the dev https certificate - "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust; sudo bash \"./.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh\"", - // reads the extensions list and installs them - "postAttachCommand": "cat .vscode/extensions.json | jq -r .recommendations[] | xargs -n 1 code --install-extension", - "features": { - "ghcr.io/devcontainers/features/dotnet:2": { - "version": "none", - "dotnetRuntimeVersions": "9.0", - "aspNetCoreRuntimeVersions": "9.0" - }, - "ghcr.io/devcontainers-contrib/features/apt-packages:1": { - "preserve_apt_list": false, - "packages": ["libfontconfig1"] - }, - "ghcr.io/devcontainers/features/docker-in-docker:2": { - "dockerDashComposeVersion": "v2" - }, - "ghcr.io/devcontainers/features/github-cli:1": {}, - "ghcr.io/eitsupi/devcontainer-features/jq-likes:2": {} - }, - "hostRequirements": { - "memory": "8gb", - "cpus": 4 - } -} diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json index 0cf768f1ff..228d4a17c8 100644 --- a/.devcontainer/devcontainer.json +++ b/.devcontainer/devcontainer.json @@ -1,8 +1,8 @@ { "name": "Development Jellyfin Server", - "image":"mcr.microsoft.com/devcontainers/dotnet:9.0-jammy", + "image":"mcr.microsoft.com/devcontainers/dotnet:9.0-bookworm", // restores nuget packages, installs the dotnet workloads and installs the dev https certificate - "postStartCommand": "dotnet restore; dotnet workload update; dotnet dev-certs https --trust", + "postStartCommand": "sudo dotnet restore; sudo dotnet workload update; sudo dotnet dev-certs https --trust; sudo bash \"./.devcontainer/install-ffmpeg.sh\"", // reads the extensions list and installs them "postAttachCommand": "cat .vscode/extensions.json | jq -r .recommendations[] | xargs -n 1 code --install-extension", "features": { diff --git a/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh b/.devcontainer/install-ffmpeg.sh similarity index 96% rename from .devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh rename to .devcontainer/install-ffmpeg.sh index c867ef538c..842a532554 100644 --- a/.devcontainer/Dev - Server Ffmpeg/install-ffmpeg.sh +++ b/.devcontainer/install-ffmpeg.sh @@ -29,4 +29,4 @@ Signed-By: /etc/apt/keyrings/jellyfin.gpg EOF sudo apt update -y -sudo apt install jellyfin-ffmpeg6 -y +sudo apt install jellyfin-ffmpeg7 -y diff --git a/.vscode/extensions.json b/.vscode/extensions.json index 3be946e446..e4205ce0b1 100644 --- a/.vscode/extensions.json +++ b/.vscode/extensions.json @@ -1,12 +1,13 @@ { - "recommendations": [ + "recommendations": [ "ms-dotnettools.csharp", "editorconfig.editorconfig", "github.vscode-github-actions", "ms-dotnettools.vscode-dotnet-runtime", - "ms-dotnettools.csdevkit" - ], - "unwantedRecommendations": [ + "ms-dotnettools.csdevkit", + "alexcvzz.vscode-sqlite" + ], + "unwantedRecommendations": [ - ] + ] } From e922fe8582fca1b0204d5bdc35adeed55844d648 Mon Sep 17 00:00:00 2001 From: Kenneth Cochran Date: Sat, 30 Nov 2024 06:08:19 -0500 Subject: [PATCH 12/21] Added test for ListsingsManager.DeleteListingsProvider(). (#12793) * Added test for DeleteListingsProvider(). * Added myself to CONTRIBUTORS.md * Removed unintentionally committed test SaveListingProvider_SavesProviderAndReturnsInfo() * Cleaned up test in response to PR feedback. --- CONTRIBUTORS.md | 1 + .../Listings/ListingsManagerTests.cs | 50 +++++++++++++++++++ 2 files changed, 51 insertions(+) create mode 100644 tests/Jellyfin.LiveTv.Tests/Listings/ListingsManagerTests.cs diff --git a/CONTRIBUTORS.md b/CONTRIBUTORS.md index e44608135c..eccc3b0ceb 100644 --- a/CONTRIBUTORS.md +++ b/CONTRIBUTORS.md @@ -192,6 +192,7 @@ - [jaina heartles](https://github.com/heartles) - [oxixes](https://github.com/oxixes) - [elfalem](https://github.com/elfalem) + - [Kenneth Cochran](https://github.com/kennethcochran) - [benedikt257](https://github.com/benedikt257) - [revam](https://github.com/revam) diff --git a/tests/Jellyfin.LiveTv.Tests/Listings/ListingsManagerTests.cs b/tests/Jellyfin.LiveTv.Tests/Listings/ListingsManagerTests.cs new file mode 100644 index 0000000000..40934d9c6b --- /dev/null +++ b/tests/Jellyfin.LiveTv.Tests/Listings/ListingsManagerTests.cs @@ -0,0 +1,50 @@ +using System; +using Jellyfin.LiveTv.Configuration; +using Jellyfin.LiveTv.Listings; +using MediaBrowser.Common.Configuration; +using MediaBrowser.Controller.LiveTv; +using MediaBrowser.Model.LiveTv; +using MediaBrowser.Model.Tasks; +using Microsoft.Extensions.Logging; +using Moq; +using Xunit; + +namespace Jellyfin.LiveTv.Tests.Listings; + +public class ListingsManagerTests +{ + private readonly IConfigurationManager _config; + private readonly IListingsProvider[] _listingsProviders; + private readonly ILogger _logger; + private readonly ITaskManager _taskManager; + private readonly ITunerHostManager _tunerHostManager; + + public ListingsManagerTests() + { + _logger = Mock.Of>(); + _config = Mock.Of(); + _taskManager = Mock.Of(); + _tunerHostManager = Mock.Of(); + _listingsProviders = new[] { Mock.Of() }; + } + + [Fact] + public void DeleteListingsProvider_DeletesProvider() + { + // Arrange + var id = "MockId"; + var manager = new ListingsManager(_logger, _config, _taskManager, _tunerHostManager, _listingsProviders); + + Mock.Get(_config) + .Setup(x => x.GetConfiguration(It.IsAny())) + .Returns(new LiveTvOptions { ListingProviders = [new ListingsProviderInfo { Id = id }] }); + + // Act + manager.DeleteListingsProvider(id); + + // Assert + Assert.DoesNotContain( + _config.GetLiveTvConfiguration().ListingProviders, + p => p.Id.Equals(id, StringComparison.Ordinal)); + } +} From ea4580421370242093a26b13a004b64ef2ee6eb6 Mon Sep 17 00:00:00 2001 From: Andrijan Jovanovski Date: Sat, 30 Nov 2024 10:27:41 +0000 Subject: [PATCH 13/21] Translated using Weblate (Macedonian) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/mk/ --- Emby.Server.Implementations/Localization/Core/mk.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Localization/Core/mk.json b/Emby.Server.Implementations/Localization/Core/mk.json index e149f8adfd..6da31227d7 100644 --- a/Emby.Server.Implementations/Localization/Core/mk.json +++ b/Emby.Server.Implementations/Localization/Core/mk.json @@ -131,5 +131,6 @@ "TaskRefreshTrickplayImages": "Генерирај слики за прегледување (Trickplay)", "TaskAudioNormalization": "Нормализација на звукот", "TaskRefreshTrickplayImagesDescription": "Креира трикплеј прегледи за видеа во овозможените библиотеки.", - "TaskCleanCollectionsAndPlaylistsDescription": "Отстранува ставки од колекциите и плејлистите што веќе не постојат." + "TaskCleanCollectionsAndPlaylistsDescription": "Отстранува ставки од колекциите и плејлистите што веќе не постојат.", + "TaskExtractMediaSegments": "Скенирање на сегменти на содржина" } From 5cbe71a1b21a848639d66e62c93c7597e064f7cd Mon Sep 17 00:00:00 2001 From: Bond_009 Date: Sat, 30 Nov 2024 23:40:18 +0100 Subject: [PATCH 14/21] Resolve audio/x-aac to .aac --- MediaBrowser.Model/Net/MimeTypes.cs | 1 + 1 file changed, 1 insertion(+) diff --git a/MediaBrowser.Model/Net/MimeTypes.cs b/MediaBrowser.Model/Net/MimeTypes.cs index 5d65b0f9ba..e4c0239b85 100644 --- a/MediaBrowser.Model/Net/MimeTypes.cs +++ b/MediaBrowser.Model/Net/MimeTypes.cs @@ -125,6 +125,7 @@ namespace MediaBrowser.Model.Net new("audio/vorbis", ".vorbis"), new("audio/x-ape", ".ape"), new("audio/xsp", ".xsp"), + new("audio/x-aac", ".aac"), new("audio/x-wavpack", ".wv"), // Type image From b7f6ccc306404c6d825ea80b0e084e5c482247dc Mon Sep 17 00:00:00 2001 From: gnattu Date: Sat, 30 Nov 2024 17:59:39 -0500 Subject: [PATCH 15/21] Backport pull request #13113 from jellyfin/release-10.10.z Only do DoVi remux when the client supports profiles without fallbacks Original-merge: 9464f9e62266266bcec2a97f88fcc988aa4976a6 Merged-by: Bond-009 Backported-by: Bond_009 --- Jellyfin.Api/Controllers/DynamicHlsController.cs | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs index 54e0527c90..a641ec2091 100644 --- a/Jellyfin.Api/Controllers/DynamicHlsController.cs +++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs @@ -1819,16 +1819,13 @@ public class DynamicHlsController : BaseJellyfinApiController if (isActualOutputVideoCodecHevc || isActualOutputVideoCodecAv1) { var requestedRange = state.GetRequestedRangeTypes(state.ActualOutputVideoCodec); - var requestHasDOVI = requestedRange.Contains(VideoRangeType.DOVI.ToString(), StringComparison.OrdinalIgnoreCase); - var requestHasDOVIWithHDR10 = requestedRange.Contains(VideoRangeType.DOVIWithHDR10.ToString(), StringComparison.OrdinalIgnoreCase); - var requestHasDOVIWithHLG = requestedRange.Contains(VideoRangeType.DOVIWithHLG.ToString(), StringComparison.OrdinalIgnoreCase); - var requestHasDOVIWithSDR = requestedRange.Contains(VideoRangeType.DOVIWithSDR.ToString(), StringComparison.OrdinalIgnoreCase); + // Clients reporting Dolby Vision capabilities with fallbacks may only support the fallback layer. + // Only enable Dolby Vision remuxing if the client explicitly declares support for profiles without fallbacks. + var clientSupportsDoVi = requestedRange.Contains(VideoRangeType.DOVI.ToString(), StringComparison.OrdinalIgnoreCase); + var videoIsDoVi = state.VideoStream.VideoRangeType is VideoRangeType.DOVI or VideoRangeType.DOVIWithHDR10 or VideoRangeType.DOVIWithHLG or VideoRangeType.DOVIWithSDR; if (EncodingHelper.IsCopyCodec(codec) - && ((state.VideoStream.VideoRangeType == VideoRangeType.DOVI && requestHasDOVI) - || (state.VideoStream.VideoRangeType == VideoRangeType.DOVIWithHDR10 && requestHasDOVIWithHDR10) - || (state.VideoStream.VideoRangeType == VideoRangeType.DOVIWithHLG && requestHasDOVIWithHLG) - || (state.VideoStream.VideoRangeType == VideoRangeType.DOVIWithSDR && requestHasDOVIWithSDR))) + && (videoIsDoVi && clientSupportsDoVi)) { if (isActualOutputVideoCodecHevc) { From b8c7cd5aa74911fc60fd646e6498ced963bb5235 Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 15:48:40 +0000 Subject: [PATCH 16/21] Update dependency z440.atl.core to 6.9.0 --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ae25df7b9f..a6b0f2fdb2 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -80,7 +80,7 @@ - + From 06923cbf2be23ee276641bd6d461e6f1790b8bf0 Mon Sep 17 00:00:00 2001 From: Ethan Pippin Date: Sun, 1 Dec 2024 17:08:37 -0700 Subject: [PATCH 17/21] Implement TaskTriggerInfoType enum (#12783) --- .../ScheduledTasks/ScheduledTaskWorker.cs | 10 +++---- .../Tasks/AudioNormalizationTask.cs | 2 +- .../ScheduledTasks/Tasks/ChapterImagesTask.cs | 2 +- .../CleanupCollectionAndPlaylistPathsTask.cs | 2 +- .../Tasks/DeleteCacheFileTask.cs | 2 +- .../ScheduledTasks/Tasks/DeleteLogFileTask.cs | 2 +- .../Tasks/DeleteTranscodeFileTask.cs | 4 +-- .../Tasks/MediaSegmentExtractionTask.cs | 2 +- .../Tasks/OptimizeDatabaseTask.cs | 2 +- .../Tasks/PeopleValidationTask.cs | 2 +- .../ScheduledTasks/Tasks/PluginUpdateTask.cs | 4 +-- .../Tasks/RefreshMediaLibraryTask.cs | 2 +- MediaBrowser.Model/Tasks/TaskTriggerInfo.cs | 22 +-------------- .../Tasks/TaskTriggerInfoType.cs | 28 +++++++++++++++++++ .../Lyric/LyricScheduledTask.cs | 2 +- .../MediaInfo/SubtitleScheduledTask.cs | 2 +- .../Trickplay/TrickplayImagesTask.cs | 2 +- .../Channels/RefreshChannelsScheduledTask.cs | 2 +- .../Guide/RefreshGuideScheduledTask.cs | 2 +- 19 files changed, 52 insertions(+), 44 deletions(-) create mode 100644 MediaBrowser.Model/Tasks/TaskTriggerInfoType.cs diff --git a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs index 9b342cfbe1..fe769baf92 100644 --- a/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs +++ b/Emby.Server.Implementations/ScheduledTasks/ScheduledTaskWorker.cs @@ -471,7 +471,7 @@ namespace Emby.Server.Implementations.ScheduledTasks new() { IntervalTicks = TimeSpan.FromDays(1).Ticks, - Type = TaskTriggerInfo.TriggerInterval + Type = TaskTriggerInfoType.IntervalTrigger } ]; } @@ -616,7 +616,7 @@ namespace Emby.Server.Implementations.ScheduledTasks MaxRuntimeTicks = info.MaxRuntimeTicks }; - if (info.Type.Equals(nameof(DailyTrigger), StringComparison.OrdinalIgnoreCase)) + if (info.Type == TaskTriggerInfoType.DailyTrigger) { if (!info.TimeOfDayTicks.HasValue) { @@ -626,7 +626,7 @@ namespace Emby.Server.Implementations.ScheduledTasks return new DailyTrigger(TimeSpan.FromTicks(info.TimeOfDayTicks.Value), options); } - if (info.Type.Equals(nameof(WeeklyTrigger), StringComparison.OrdinalIgnoreCase)) + if (info.Type == TaskTriggerInfoType.WeeklyTrigger) { if (!info.TimeOfDayTicks.HasValue) { @@ -641,7 +641,7 @@ namespace Emby.Server.Implementations.ScheduledTasks return new WeeklyTrigger(TimeSpan.FromTicks(info.TimeOfDayTicks.Value), info.DayOfWeek.Value, options); } - if (info.Type.Equals(nameof(IntervalTrigger), StringComparison.OrdinalIgnoreCase)) + if (info.Type == TaskTriggerInfoType.IntervalTrigger) { if (!info.IntervalTicks.HasValue) { @@ -651,7 +651,7 @@ namespace Emby.Server.Implementations.ScheduledTasks return new IntervalTrigger(TimeSpan.FromTicks(info.IntervalTicks.Value), options); } - if (info.Type.Equals(nameof(StartupTrigger), StringComparison.OrdinalIgnoreCase)) + if (info.Type == TaskTriggerInfoType.StartupTrigger) { return new StartupTrigger(options); } diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/AudioNormalizationTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/AudioNormalizationTask.cs index eb6afe05d0..031d147765 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/AudioNormalizationTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/AudioNormalizationTask.cs @@ -156,7 +156,7 @@ public partial class AudioNormalizationTask : IScheduledTask [ new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerInterval, + Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } ]; diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs index cb3f5b8363..2c7d06ed4d 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs @@ -80,7 +80,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks [ new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerDaily, + Type = TaskTriggerInfoType.DailyTrigger, TimeOfDayTicks = TimeSpan.FromHours(2).Ticks, MaxRuntimeTicks = TimeSpan.FromHours(4).Ticks } diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs index 25e7ebe799..316e4a8f0a 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs @@ -135,6 +135,6 @@ public class CleanupCollectionAndPlaylistPathsTask : IScheduledTask /// public IEnumerable GetDefaultTriggers() { - return [new TaskTriggerInfo() { Type = TaskTriggerInfo.TriggerStartup }]; + return [new TaskTriggerInfo() { Type = TaskTriggerInfoType.StartupTrigger }]; } } diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs index 0325cb9af8..ff295d9b7e 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteCacheFileTask.cs @@ -73,7 +73,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks return [ // Every so often - new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks } + new TaskTriggerInfo { Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } ]; } diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs index 9babe8cf9f..a091c2bd90 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteLogFileTask.cs @@ -62,7 +62,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks { return [ - new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks } + new TaskTriggerInfo { Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } ]; } diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs index 315c245cc5..d0896cc812 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/DeleteTranscodeFileTask.cs @@ -69,11 +69,11 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks [ new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerStartup + Type = TaskTriggerInfoType.StartupTrigger }, new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerInterval, + Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } ]; diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs index d6fad7526b..de1e60d307 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs @@ -111,7 +111,7 @@ public class MediaSegmentExtractionTask : IScheduledTask { yield return new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerInterval, + Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(12).Ticks }; } diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs index 3e4925f74d..7d4e2377dc 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/OptimizeDatabaseTask.cs @@ -62,7 +62,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks return [ // Every so often - new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks } + new TaskTriggerInfo { Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } ]; } diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs index c63bad4748..2907f18b55 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PeopleValidationTask.cs @@ -58,7 +58,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks { new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerInterval, + Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromDays(7).Ticks } }; diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs index ad72a4c87e..c597103dd4 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/PluginUpdateTask.cs @@ -60,10 +60,10 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks public IEnumerable GetDefaultTriggers() { // At startup - yield return new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerStartup }; + yield return new TaskTriggerInfo { Type = TaskTriggerInfoType.StartupTrigger }; // Every so often - yield return new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks }; + yield return new TaskTriggerInfo { Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks }; } /// diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs index a59f0f3669..172448ddec 100644 --- a/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs +++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/RefreshMediaLibraryTask.cs @@ -48,7 +48,7 @@ namespace Emby.Server.Implementations.ScheduledTasks.Tasks { yield return new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerInterval, + Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(12).Ticks }; } diff --git a/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs b/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs index 63709557db..186c0aed35 100644 --- a/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs +++ b/MediaBrowser.Model/Tasks/TaskTriggerInfo.cs @@ -8,31 +8,11 @@ namespace MediaBrowser.Model.Tasks /// public class TaskTriggerInfo { - /// - /// The daily trigger. - /// - public const string TriggerDaily = "DailyTrigger"; - - /// - /// The weekly trigger. - /// - public const string TriggerWeekly = "WeeklyTrigger"; - - /// - /// The interval trigger. - /// - public const string TriggerInterval = "IntervalTrigger"; - - /// - /// The startup trigger. - /// - public const string TriggerStartup = "StartupTrigger"; - /// /// Gets or sets the type. /// /// The type. - public string Type { get; set; } + public TaskTriggerInfoType Type { get; set; } /// /// Gets or sets the time of day. diff --git a/MediaBrowser.Model/Tasks/TaskTriggerInfoType.cs b/MediaBrowser.Model/Tasks/TaskTriggerInfoType.cs new file mode 100644 index 0000000000..b596cf5803 --- /dev/null +++ b/MediaBrowser.Model/Tasks/TaskTriggerInfoType.cs @@ -0,0 +1,28 @@ +namespace MediaBrowser.Model.Tasks +{ + /// + /// Enum TaskTriggerInfoType. + /// + public enum TaskTriggerInfoType + { + /// + /// The daily trigger. + /// + DailyTrigger, + + /// + /// The weekly trigger. + /// + WeeklyTrigger, + + /// + /// The interval trigger. + /// + IntervalTrigger, + + /// + /// The startup trigger. + /// + StartupTrigger + } +} diff --git a/MediaBrowser.Providers/Lyric/LyricScheduledTask.cs b/MediaBrowser.Providers/Lyric/LyricScheduledTask.cs index 89d71e1722..73912b5796 100644 --- a/MediaBrowser.Providers/Lyric/LyricScheduledTask.cs +++ b/MediaBrowser.Providers/Lyric/LyricScheduledTask.cs @@ -162,7 +162,7 @@ public class LyricScheduledTask : IScheduledTask [ new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerInterval, + Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } ]; diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs index 6eb75891aa..938f3cb327 100644 --- a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs +++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs @@ -217,7 +217,7 @@ namespace MediaBrowser.Providers.MediaInfo return new[] { // Every so often - new TaskTriggerInfo { Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks } + new TaskTriggerInfo { Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } }; } } diff --git a/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs b/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs index 31c0eeb31e..4310f93d4b 100644 --- a/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs +++ b/MediaBrowser.Providers/Trickplay/TrickplayImagesTask.cs @@ -63,7 +63,7 @@ public class TrickplayImagesTask : IScheduledTask { new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerDaily, + Type = TaskTriggerInfoType.DailyTrigger, TimeOfDayTicks = TimeSpan.FromHours(3).Ticks } }; diff --git a/src/Jellyfin.LiveTv/Channels/RefreshChannelsScheduledTask.cs b/src/Jellyfin.LiveTv/Channels/RefreshChannelsScheduledTask.cs index 79c5873d51..71e46764ad 100644 --- a/src/Jellyfin.LiveTv/Channels/RefreshChannelsScheduledTask.cs +++ b/src/Jellyfin.LiveTv/Channels/RefreshChannelsScheduledTask.cs @@ -79,7 +79,7 @@ namespace Jellyfin.LiveTv.Channels // Every so often new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerInterval, IntervalTicks = TimeSpan.FromHours(24).Ticks + Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } }; } diff --git a/src/Jellyfin.LiveTv/Guide/RefreshGuideScheduledTask.cs b/src/Jellyfin.LiveTv/Guide/RefreshGuideScheduledTask.cs index a9fde08501..5164d695f8 100644 --- a/src/Jellyfin.LiveTv/Guide/RefreshGuideScheduledTask.cs +++ b/src/Jellyfin.LiveTv/Guide/RefreshGuideScheduledTask.cs @@ -66,7 +66,7 @@ public class RefreshGuideScheduledTask : IScheduledTask, IConfigurableScheduledT { new TaskTriggerInfo { - Type = TaskTriggerInfo.TriggerInterval, + Type = TaskTriggerInfoType.IntervalTrigger, IntervalTicks = TimeSpan.FromHours(24).Ticks } }; From f1e020c0b061dce8af1a0483eaccd6eed22f9399 Mon Sep 17 00:00:00 2001 From: RealGreenDragon <14246920+RealGreenDragon@users.noreply.github.com> Date: Mon, 2 Dec 2024 01:09:30 +0100 Subject: [PATCH 18/21] Removed RemoveOldPlugins configuration flag (#13102) --- .../Plugins/PluginManager.cs | 37 +++++++++---------- .../Configuration/ServerConfiguration.cs | 5 --- 2 files changed, 17 insertions(+), 25 deletions(-) diff --git a/Emby.Server.Implementations/Plugins/PluginManager.cs b/Emby.Server.Implementations/Plugins/PluginManager.cs index e7323d9d05..4c32d57179 100644 --- a/Emby.Server.Implementations/Plugins/PluginManager.cs +++ b/Emby.Server.Implementations/Plugins/PluginManager.cs @@ -785,30 +785,27 @@ namespace Emby.Server.Implementations.Plugins var cleaned = false; var path = entry.Path; - if (_config.RemoveOldPlugins) + // Attempt a cleanup of old folders. + try { - // Attempt a cleanup of old folders. - try - { - _logger.LogDebug("Deleting {Path}", path); - Directory.Delete(path, true); - cleaned = true; - } + _logger.LogDebug("Deleting {Path}", path); + Directory.Delete(path, true); + cleaned = true; + } #pragma warning disable CA1031 // Do not catch general exception types - catch (Exception e) + catch (Exception e) #pragma warning restore CA1031 // Do not catch general exception types - { - _logger.LogWarning(e, "Unable to delete {Path}", path); - } + { + _logger.LogWarning(e, "Unable to delete {Path}", path); + } - if (cleaned) - { - versions.RemoveAt(x); - } - else - { - ChangePluginState(entry, PluginStatus.Deleted); - } + if (cleaned) + { + versions.RemoveAt(x); + } + else + { + ChangePluginState(entry, PluginStatus.Deleted); } } diff --git a/MediaBrowser.Model/Configuration/ServerConfiguration.cs b/MediaBrowser.Model/Configuration/ServerConfiguration.cs index 5ad588200b..bc4e6ef735 100644 --- a/MediaBrowser.Model/Configuration/ServerConfiguration.cs +++ b/MediaBrowser.Model/Configuration/ServerConfiguration.cs @@ -243,11 +243,6 @@ public class ServerConfiguration : BaseApplicationConfiguration /// public int LibraryMetadataRefreshConcurrency { get; set; } - /// - /// Gets or sets a value indicating whether older plugins should automatically be deleted from the plugin folder. - /// - public bool RemoveOldPlugins { get; set; } - /// /// Gets or sets a value indicating whether clients should be allowed to upload logs. /// From a7e5f43a8a2a2201260c1e44ece67d1cf6b02cae Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Sun, 1 Dec 2024 17:10:29 -0700 Subject: [PATCH 19/21] Update dependency Xunit.SkippableFact to 1.5.23 (#13134) Co-authored-by: renovate[bot] <29139614+renovate[bot]@users.noreply.github.com> --- Directory.Packages.props | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Directory.Packages.props b/Directory.Packages.props index ae25df7b9f..dbc256cad3 100644 --- a/Directory.Packages.props +++ b/Directory.Packages.props @@ -85,7 +85,7 @@ - + \ No newline at end of file From 3d819b74bd3c00458b9475ab27989372d2d51ed6 Mon Sep 17 00:00:00 2001 From: VC Date: Mon, 2 Dec 2024 07:32:54 +0000 Subject: [PATCH 20/21] Translated using Weblate (Chinese (Traditional Han script, Hong Kong)) Translation: Jellyfin/Jellyfin Translate-URL: https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/zh_Hant_HK/ --- Emby.Server.Implementations/Localization/Core/zh-HK.json | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/Emby.Server.Implementations/Localization/Core/zh-HK.json b/Emby.Server.Implementations/Localization/Core/zh-HK.json index e2f768f1fc..bc1fd8cb29 100644 --- a/Emby.Server.Implementations/Localization/Core/zh-HK.json +++ b/Emby.Server.Implementations/Localization/Core/zh-HK.json @@ -133,5 +133,6 @@ "TaskDownloadMissingLyricsDescription": "下載歌詞", "TaskCleanCollectionsAndPlaylists": "整理媒體與播放清單", "TaskAudioNormalization": "音訊同等化", - "TaskAudioNormalizationDescription": "掃描檔案裏的音訊同等化資料。" + "TaskAudioNormalizationDescription": "掃描檔案裏的音訊同等化資料。", + "TaskCleanCollectionsAndPlaylistsDescription": "從資料庫及播放清單中移除已不存在的項目。" } From 37f7bda3cc45393ea5bb5ca1af4846eeee25c9ee Mon Sep 17 00:00:00 2001 From: "renovate[bot]" <29139614+renovate[bot]@users.noreply.github.com> Date: Tue, 3 Dec 2024 14:47:46 +0000 Subject: [PATCH 21/21] Update github/codeql-action action to v3.27.6 --- .github/workflows/ci-codeql-analysis.yml | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/.github/workflows/ci-codeql-analysis.yml b/.github/workflows/ci-codeql-analysis.yml index 81be3882a1..2c88330cb8 100644 --- a/.github/workflows/ci-codeql-analysis.yml +++ b/.github/workflows/ci-codeql-analysis.yml @@ -27,11 +27,11 @@ jobs: dotnet-version: '9.0.x' - name: Initialize CodeQL - uses: github/codeql-action/init@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 + uses: github/codeql-action/init@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6 with: languages: ${{ matrix.language }} queries: +security-extended - name: Autobuild - uses: github/codeql-action/autobuild@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 + uses: github/codeql-action/autobuild@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6 - name: Perform CodeQL Analysis - uses: github/codeql-action/analyze@f09c1c0a94de965c15400f5634aa42fac8fb8f88 # v3.27.5 + uses: github/codeql-action/analyze@aa578102511db1f4524ed59b8cc2bae4f6e88195 # v3.27.6