Bump version to 10.8.7

Merge pull request #8662 from cvium/this_next_up_fix_wont_work_either
Merge pull request #8667 from daullmer/backport-omdb-fix
2026-01-16 08:08:16 +00:00 · 2022-10-31 23:07:09 -04:00 · 2022-10-31 17:05:38 -04:00 · 2022-10-31 14:33:33 -06:00 · 2022-10-31 12:55:56 -04:00 · 2022-10-31 13:10:00 +01:00
17 changed files with 56 additions and 38 deletions
--- a/Emby.Naming/Emby.Naming.csproj
+++ b/Emby.Naming/Emby.Naming.csproj
@@ -36,7 +36,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Naming</PackageId>
-    <VersionPrefix>10.8.6</VersionPrefix>
+    <VersionPrefix>10.8.7</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/Emby.Server.Implementations/Data/SqliteItemRepository.cs
+++ b/Emby.Server.Implementations/Data/SqliteItemRepository.cs
@@ -3541,10 +3541,11 @@ namespace Emby.Server.Implementations.Data
                statement?.TryBind("@MinIndexNumber", query.MinIndexNumber.Value);
            }

-            if (query.MinParentIndexNumber.HasValue)
+            if (query.MinParentAndIndexNumber.HasValue)
            {
-                whereClauses.Add("ParentIndexNumber>=@MinParentIndexNumber");
-                statement?.TryBind("@MinParentIndexNumber", query.MinParentIndexNumber.Value);
+                whereClauses.Add("((ParentIndexNumber=@MinParentAndIndexNumberParent and IndexNumber>=@MinParentAndIndexNumberIndex) or ParentIndexNumber>@MinParentAndIndexNumberParent)");
+                statement?.TryBind("@MinParentAndIndexNumberParent", query.MinParentAndIndexNumber.Value.ParentIndexNumber);
+                statement?.TryBind("@MinParentAndIndexNumberIndex", query.MinParentAndIndexNumber.Value.IndexNumber);
            }

            if (query.MinDateCreated.HasValue)
--- a/Emby.Server.Implementations/TV/TVSeriesManager.cs
+++ b/Emby.Server.Implementations/TV/TVSeriesManager.cs
@@ -192,7 +192,6 @@ namespace Emby.Server.Implementations.TV
                AncestorWithPresentationUniqueKey = null,
                SeriesPresentationUniqueKey = seriesKey,
                IncludeItemTypes = new[] { BaseItemKind.Episode },
-                OrderBy = new[] { (ItemSortBy.ParentIndexNumber, SortOrder.Descending), (ItemSortBy.IndexNumber, SortOrder.Descending) },
                IsPlayed = true,
                Limit = 1,
                ParentIndexNumberNotEquals = 0,
@@ -203,11 +202,10 @@ namespace Emby.Server.Implementations.TV
                }
            };

-            if (rewatching)
-            {
-                // find last watched by date played, not by newest episode watched
-                lastQuery.OrderBy = new[] { (ItemSortBy.DatePlayed, SortOrder.Descending), (ItemSortBy.ParentIndexNumber, SortOrder.Descending), (ItemSortBy.IndexNumber, SortOrder.Descending) };
-            }
+            // If rewatching is enabled, sort first by date played and then by season and episode numbers
+            lastQuery.OrderBy = rewatching
+                ? new[] { (ItemSortBy.DatePlayed, SortOrder.Descending), (ItemSortBy.ParentIndexNumber, SortOrder.Descending), (ItemSortBy.IndexNumber, SortOrder.Descending) }
+                : new[] { (ItemSortBy.ParentIndexNumber, SortOrder.Descending), (ItemSortBy.IndexNumber, SortOrder.Descending) };

            var lastWatchedEpisode = _libraryManager.GetItemList(lastQuery).Cast<Episode>().FirstOrDefault();

@@ -223,23 +221,19 @@ namespace Emby.Server.Implementations.TV
                    IsPlayed = rewatching,
                    IsVirtualItem = false,
                    ParentIndexNumberNotEquals = 0,
-                    DtoOptions = dtoOptions,
-                    MinIndexNumber = lastWatchedEpisode?.IndexNumberEnd ?? lastWatchedEpisode?.IndexNumber,
-                    MinParentIndexNumber = lastWatchedEpisode?.ParentIndexNumber
+                    DtoOptions = dtoOptions
                };

-                Episode nextEpisode;
-                if (rewatching)
+                // Locate the next up episode based on the last watched episode's season and episode number
+                var lastWatchedParentIndexNumber = lastWatchedEpisode?.ParentIndexNumber;
+                var lastWatchedIndexNumber = lastWatchedEpisode?.IndexNumberEnd ?? lastWatchedEpisode?.IndexNumber;
+                if (lastWatchedParentIndexNumber.HasValue && lastWatchedIndexNumber.HasValue)
                {
-                    nextQuery.Limit = 2;
-                    // get watched episode after most recently watched
-                    nextEpisode = _libraryManager.GetItemList(nextQuery).Cast<Episode>().ElementAtOrDefault(1);
-                }
-                else
-                {
-                    nextEpisode = _libraryManager.GetItemList(nextQuery).Cast<Episode>().FirstOrDefault();
+                    nextQuery.MinParentAndIndexNumber = (lastWatchedParentIndexNumber.Value, lastWatchedIndexNumber.Value + 1);
                }

+                var nextEpisode = _libraryManager.GetItemList(nextQuery).Cast<Episode>().FirstOrDefault();
+
                if (_configurationManager.Configuration.DisplaySpecialsWithinSeasons)
                {
                    var consideredEpisodes = _libraryManager.GetItemList(new InternalItemsQuery(user)
--- a/Jellyfin.Data/Jellyfin.Data.csproj
+++ b/Jellyfin.Data/Jellyfin.Data.csproj
@@ -18,7 +18,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Data</PackageId>
-    <VersionPrefix>10.8.6</VersionPrefix>
+    <VersionPrefix>10.8.7</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Common/MediaBrowser.Common.csproj
+++ b/MediaBrowser.Common/MediaBrowser.Common.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Common</PackageId>
-    <VersionPrefix>10.8.6</VersionPrefix>
+    <VersionPrefix>10.8.7</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
+++ b/MediaBrowser.Controller/Entities/InternalItemsQuery.cs
@@ -205,7 +205,15 @@ namespace MediaBrowser.Controller.Entities

        public int? MinIndexNumber { get; set; }

-        public int? MinParentIndexNumber { get; set; }
+        /// <summary>
+        /// Gets or sets the minimum ParentIndexNumber and IndexNumber.
+        /// </summary>
+        /// <remarks>
+        /// It produces this where clause:
+        /// <para>(ParentIndexNumber = X and IndexNumber >= Y) or ParentIndexNumber > X.
+        /// </para>
+        /// </remarks>
+        public (int ParentIndexNumber, int IndexNumber)? MinParentAndIndexNumber { get; set; }

        public int? AiredDuringSeason { get; set; }

--- a/MediaBrowser.Controller/MediaBrowser.Controller.csproj
+++ b/MediaBrowser.Controller/MediaBrowser.Controller.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Controller</PackageId>
-    <VersionPrefix>10.8.6</VersionPrefix>
+    <VersionPrefix>10.8.7</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
+++ b/MediaBrowser.MediaEncoding/Probing/ProbeResultNormalizer.cs
@@ -863,8 +863,13 @@ namespace MediaBrowser.MediaEncoding.Probing
                    }
                }
            }
+            else if (string.Equals(streamInfo.CodecType, "data", StringComparison.OrdinalIgnoreCase))
+            {
+                stream.Type = MediaStreamType.Data;
+            }
            else
            {
+                _logger.LogError("Codec Type {CodecType} unknown. The stream (index: {Index}) will be ignored. Warning: Subsequential streams will have a wrong stream specifier!", streamInfo.CodecType, streamInfo.Index);
                return null;
            }

--- a/MediaBrowser.Model/Entities/MediaStreamType.cs
+++ b/MediaBrowser.Model/Entities/MediaStreamType.cs
@@ -23,6 +23,11 @@ namespace MediaBrowser.Model.Entities
        /// <summary>
        /// The embedded image.
        /// </summary>
-        EmbeddedImage
+        EmbeddedImage,
+
+        /// <summary>
+        /// The data.
+        /// </summary>
+        Data
    }
 }
--- a/MediaBrowser.Model/MediaBrowser.Model.csproj
+++ b/MediaBrowser.Model/MediaBrowser.Model.csproj
@@ -8,7 +8,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Model</PackageId>
-    <VersionPrefix>10.8.6</VersionPrefix>
+    <VersionPrefix>10.8.7</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
--- a/MediaBrowser.Providers/Plugins/Omdb/OmdbProvider.cs
+++ b/MediaBrowser.Providers/Plugins/Omdb/OmdbProvider.cs
@@ -408,10 +408,7 @@ namespace MediaBrowser.Providers.Plugins.Omdb
                }
            }

-            if (isEnglishRequested)
-            {
-                item.Overview = result.Plot;
-            }
+            item.Overview = result.Plot;

            if (!Plugin.Instance.Configuration.CastAndCrew)
            {
--- a/SharedVersion.cs
+++ b/SharedVersion.cs
@@ -1,4 +1,4 @@
 using System.Reflection;

-[assembly: AssemblyVersion("10.8.6")]
-[assembly: AssemblyFileVersion("10.8.6")]
+[assembly: AssemblyVersion("10.8.7")]
+[assembly: AssemblyFileVersion("10.8.7")]
--- a/build.yaml
+++ b/build.yaml
@@ -1,7 +1,7 @@
 ---
 # We just wrap `build` so this is really it
 name: "jellyfin"
-version: "10.8.6"
+version: "10.8.7"
 packages:
  - debian.amd64
  - debian.arm64
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+jellyfin-server (10.8.7-1) unstable; urgency=medium
+
+  * New upstream version 10.8.7; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.8.7
+
+ -- Jellyfin Packaging Team <packaging@jellyfin.org>  Mon, 31 Oct 2022 23:07:06 -0400
+
 jellyfin-server (10.8.6-1) unstable; urgency=medium

  * New upstream version 10.8.6; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.8.6
--- a/debian/metapackage/jellyfin
+++ b/debian/metapackage/jellyfin
@@ -5,7 +5,7 @@ Homepage: https://jellyfin.org
 Standards-Version: 3.9.2

 Package: jellyfin
-Version: 10.8.6
+Version: 10.8.7
 Maintainer: Jellyfin Packaging Team <packaging@jellyfin.org>
 Depends: jellyfin-server, jellyfin-web
 Description: Provides the Jellyfin Free Software Media System
--- a/fedora/jellyfin.spec
+++ b/fedora/jellyfin.spec
@@ -7,7 +7,7 @@
 %endif

 Name:           jellyfin
-Version:        10.8.6
+Version:        10.8.7
 Release:        1%{?dist}
 Summary:        The Free Software Media System
 License:        GPLv2
@@ -176,6 +176,8 @@ fi
 %systemd_postun_with_restart jellyfin.service

 %changelog
+* Mon Oct 31 2022 Jellyfin Packaging Team <packaging@jellyfin.org>
+- New upstream version 10.8.7; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.8.7
 * Fri Oct 28 2022 Jellyfin Packaging Team <packaging@jellyfin.org>
 - New upstream version 10.8.6; release changelog at https://github.com/jellyfin/jellyfin/releases/tag/v10.8.6
 * Sat Sep 24 2022 Jellyfin Packaging Team <packaging@jellyfin.org>
--- a/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
+++ b/src/Jellyfin.Extensions/Jellyfin.Extensions.csproj
@@ -13,7 +13,7 @@
  <PropertyGroup>
    <Authors>Jellyfin Contributors</Authors>
    <PackageId>Jellyfin.Extensions</PackageId>
-    <VersionPrefix>10.8.6</VersionPrefix>
+    <VersionPrefix>10.8.7</VersionPrefix>
    <RepositoryUrl>https://github.com/jellyfin/jellyfin</RepositoryUrl>
    <PackageLicenseExpression>GPL-3.0-only</PackageLicenseExpression>
  </PropertyGroup>
Author	SHA1	Message	Date
Joshua M. Boniface	ec81dc9be2	Bump version to 10.8.7	2022-10-31 23:07:09 -04:00
Joshua M. Boniface	45f3fb1cfc	Merge pull request #8662 from cvium/this_next_up_fix_wont_work_either	2022-10-31 17:05:38 -04:00
Cody Robibero	f83a24ec43	Merge pull request #8667 from daullmer/backport-omdb-fix	2022-10-31 14:33:33 -06:00
Joshua M. Boniface	84c03a2d93	Merge pull request #8649 from jellyfin/revert-8480-revert-data-streams	2022-10-31 12:55:56 -04:00
David Ullmer	bc8e249080	Enable OMDB plot for non-English languages as fallback	2022-10-31 13:10:00 +01:00
cvium	5ea9a74289	fix: use a combination of ParentIndexNumber and IndexNumber to determine next up episodes	2022-10-30 16:06:47 +01:00
Niels van Velzen	987d31ea16	Revert "Revert "Merge pull request #8298 from lomion0815/fix-data-stream""	2022-10-29 11:38:14 +02:00