From 8f16554955a9903ea159587ac572396fdf318124 Mon Sep 17 00:00:00 2001 From: Mikal Stordal Date: Fri, 5 Jul 2024 00:10:12 +0200 Subject: [PATCH 1/6] fix: sort specials season first - Sort the Specials season first, because otherwise the auto-play order will be messed up for specials placed in-between normal episodes. --- Shokofin/Providers/CustomSeasonProvider.cs | 4 ++-- Shokofin/Providers/SeasonProvider.cs | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/Shokofin/Providers/CustomSeasonProvider.cs b/Shokofin/Providers/CustomSeasonProvider.cs index ba5e0338..1b5b55d8 100644 --- a/Shokofin/Providers/CustomSeasonProvider.cs +++ b/Shokofin/Providers/CustomSeasonProvider.cs @@ -238,8 +238,8 @@ private static bool SeasonExists(ILibraryManager libraryManager, ILogger logger, var season = new Season { Name = seasonName, IndexNumber = 0, - SortName = seasonName, - ForcedSortName = seasonName, + SortName = $"AA - {seasonName}", + ForcedSortName = $"AA - {seasonName}", Id = libraryManager.GetNewItemId(series.Id + "Season 0", typeof(Season)), IsVirtualItem = true, SeriesId = series.Id, diff --git a/Shokofin/Providers/SeasonProvider.cs b/Shokofin/Providers/SeasonProvider.cs index 797d3638..09c59993 100644 --- a/Shokofin/Providers/SeasonProvider.cs +++ b/Shokofin/Providers/SeasonProvider.cs @@ -43,14 +43,14 @@ public async Task> GetMetadata(SeasonInfo info, Cancellat // Special handling of the "Specials" season (pun intended). if (info.IndexNumber.Value == 0) { - // We're forcing the sort names to start with "ZZ" to make it - // always appear last in the UI. + // We're forcing the sort names to start with "AA" to make it + // always appear first in the UI. var seasonName = info.Name; result.Item = new Season { Name = seasonName, IndexNumber = info.IndexNumber, - SortName = $"ZZ - {seasonName}", - ForcedSortName = $"ZZ - {seasonName}", + SortName = $"AA - {seasonName}", + ForcedSortName = $"AA - {seasonName}", }; result.HasMetadata = true; From e97ad2bebcb56763553748ddc9a5161ac627a3f9 Mon Sep 17 00:00:00 2001 From: Mikal Stordal Date: Fri, 5 Jul 2024 00:15:14 +0200 Subject: [PATCH 2/6] misc: update release-daily.yml --- .github/workflows/release-daily.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/release-daily.yml b/.github/workflows/release-daily.yml index ea7ff26d..a5b4ded1 100644 --- a/.github/workflows/release-daily.yml +++ b/.github/workflows/release-daily.yml @@ -98,7 +98,7 @@ jobs: - name: Setup .Net uses: actions/setup-dotnet@v1 with: - dotnet-version: 6.0.x + dotnet-version: 8.0.x - name: Restore Nuget Packages run: dotnet restore Shokofin/Shokofin.csproj From 7b4edeed53d64b6a2a68c2dbf83af4cdd16fced9 Mon Sep 17 00:00:00 2001 From: Mikal S <7761729+revam@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:18:48 +0200 Subject: [PATCH 3/6] misc: update version matrix [skip ci] --- README.md | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index d04bc9fa..080fbb40 100644 --- a/README.md +++ b/README.md @@ -37,7 +37,8 @@ compatible with what. | `1.x.x` | `10.7` | `4.1.0-4.1.2` | | `2.x.x` | `10.8` | `4.1.2` | | `3.x.x` | `10.8` | `4.2.0` | -| `unstable` | `10.9` | `4.2.2` | +| `4.x.x` | `10.9` | `4.2.2` | +| `unstable` | `10.9` | `dev` | ### Official Repository From 82560199156998f79928a728e52e069779622cfc Mon Sep 17 00:00:00 2001 From: Mikal S <7761729+revam@users.noreply.github.com> Date: Fri, 5 Jul 2024 00:49:33 +0200 Subject: [PATCH 4/6] misc: update readme (again) [skip ci] --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 080fbb40..b277f1b2 100644 --- a/README.md +++ b/README.md @@ -38,7 +38,7 @@ compatible with what. | `2.x.x` | `10.8` | `4.1.2` | | `3.x.x` | `10.8` | `4.2.0` | | `4.x.x` | `10.9` | `4.2.2` | -| `unstable` | `10.9` | `dev` | +| `dev` | `10.9` | `4.2.2` | ### Official Repository From 80a689206ae9d6378bc7b98fd47ca26fdc599679 Mon Sep 17 00:00:00 2001 From: Mikal S <7761729+revam@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:01:41 +0200 Subject: [PATCH 5/6] misc: update bug report templace [skip ci] --- .github/ISSUE_TEMPLATE/bug.yml | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/bug.yml b/.github/ISSUE_TEMPLATE/bug.yml index e79a9391..d6dee8a2 100644 --- a/.github/ISSUE_TEMPLATE/bug.yml +++ b/.github/ISSUE_TEMPLATE/bug.yml @@ -2,8 +2,7 @@ name: Shokofin Bug Report 101 description: Report any bugs here! labels: [] projects: [] -assignees: - - revam +assignees: [] body: - type: markdown attributes: From a3709b5a3493d70313e5d1ae14acc9f9d03b03c7 Mon Sep 17 00:00:00 2001 From: Mikal S <7761729+revam@users.noreply.github.com> Date: Fri, 5 Jul 2024 21:02:09 +0200 Subject: [PATCH 6/6] misc: update feature request template [skip ci] --- .github/ISSUE_TEMPLATE/features.yml | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/features.yml b/.github/ISSUE_TEMPLATE/features.yml index 912a9657..39e4b46e 100644 --- a/.github/ISSUE_TEMPLATE/features.yml +++ b/.github/ISSUE_TEMPLATE/features.yml @@ -2,8 +2,7 @@ name: Shokofin Feature Request 101 description: Request your features here! labels: [] projects: [] -assignees: - - revam +assignees: [] body: - type: markdown attributes: @@ -31,4 +30,4 @@ body: attributes: label: Additional Information description: Any additional information you would like to provide? - placeholder: Provide any additional information here. \ No newline at end of file + placeholder: Provide any additional information here.