From 3d8bcf1ffd1c56efaffe9ff004c2ec44afbb9818 Mon Sep 17 00:00:00 2001
From: Bond_009 <bond.009@outlook.com>
Date: Fri, 15 Mar 2024 14:30:55 +0100
Subject: Alternate solution to #7843 without extra prop

---
 Emby.Server.Implementations/Library/LibraryManager.cs | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Library/LibraryManager.cs b/Emby.Server.Implementations/Library/LibraryManager.cs
index 30ff1bd333..1745d711b4 100644
--- a/Emby.Server.Implementations/Library/LibraryManager.cs
+++ b/Emby.Server.Implementations/Library/LibraryManager.cs
@@ -2432,8 +2432,14 @@ namespace Emby.Server.Implementations.Library
             var outdated = forceUpdate
                 ? item.ImageInfos.Where(i => i.Path is not null).ToArray()
                 : item.ImageInfos.Where(ImageNeedsRefresh).ToArray();
-            // Skip image processing if current or live tv source
-            if (outdated.Length == 0 || item.SourceType != SourceType.Library)
+
+            var parentItem = item.GetParent();
+            var isLiveTvShow = item.SourceType != SourceType.Library &&
+                               parentItem is not null &&
+                               parentItem.SourceType != SourceType.Library; // not a channel
+
+            // Skip image processing if current or live tv show
+            if (outdated.Length == 0 || isLiveTvShow)
             {
                 RegisterItem(item);
                 return;
-- 
cgit v1.2.3


From 2392e32779f7e5bced3294de3ea8a24e206a7084 Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Thu, 4 Jun 2026 02:58:14 +0200
Subject: Filter inaccessible alternative versions

---
 Emby.Server.Implementations/Library/MediaSourceManager.cs | 6 ++++++
 1 file changed, 6 insertions(+)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index 9ccfefa86e..f0c7bd1d20 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -386,6 +386,12 @@ namespace Emby.Server.Implementations.Library
 
             if (user is not null)
             {
+                sources = sources
+                    .Where(source => !Guid.TryParse(source.Id, out var sourceId)
+                        || sourceId.Equals(item.Id)
+                        || _libraryManager.GetItemById<BaseItem>(sourceId, user) is not null)
+                    .ToArray();
+
                 foreach (var source in sources)
                 {
                     SetDefaultAudioAndSubtitleStreamIndices(item, source, user);
-- 
cgit v1.2.3


From dee63ef3f1c93541201c97712b0e08a0e9c02a82 Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Thu, 4 Jun 2026 02:57:54 +0200
Subject: Fix data extraction for alternative versions

---
 Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs  | 3 ++-
 MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs              | 3 ++-
 .../ScheduledTasks/KeyframeExtractionScheduledTask.cs                  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
index f81309560e..f1e1579a1d 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/ChapterImagesTask.cs
@@ -92,7 +92,8 @@ public class ChapterImagesTask : IScheduledTask
                 EnableImages = false
             },
             SourceTypes = [SourceType.Library],
-            IsVirtualItem = false
+            IsVirtualItem = false,
+            IncludeOwnedItems = true
         })
         .OfType<Video>()
         .ToList();
diff --git a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
index f1582febf2..1d3a273354 100644
--- a/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
+++ b/MediaBrowser.Providers/MediaInfo/SubtitleScheduledTask.cs
@@ -102,7 +102,8 @@ namespace MediaBrowser.Providers.MediaInfo
                         DtoOptions = new DtoOptions(true),
                         SourceTypes = new[] { SourceType.Library },
                         Parent = library,
-                        Recursive = true
+                        Recursive = true,
+                        IncludeOwnedItems = true
                     };
 
                     if (skipIfAudioTrackMatches)
diff --git a/src/Jellyfin.MediaEncoding.Hls/ScheduledTasks/KeyframeExtractionScheduledTask.cs b/src/Jellyfin.MediaEncoding.Hls/ScheduledTasks/KeyframeExtractionScheduledTask.cs
index fcf37f35d7..6d3ae56f56 100644
--- a/src/Jellyfin.MediaEncoding.Hls/ScheduledTasks/KeyframeExtractionScheduledTask.cs
+++ b/src/Jellyfin.MediaEncoding.Hls/ScheduledTasks/KeyframeExtractionScheduledTask.cs
@@ -60,6 +60,7 @@ public class KeyframeExtractionScheduledTask : IScheduledTask
             DtoOptions = new DtoOptions(true),
             SourceTypes = [SourceType.Library],
             Recursive = true,
+            IncludeOwnedItems = true,
             Limit = Pagesize
         };
 
-- 
cgit v1.2.3


From 59974490cc21396cbb17a7ef05802bc921edc1c5 Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Wed, 3 Jun 2026 16:55:20 +0200
Subject: Fix MediaSegments for multi versions

---
 .../ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs                   | 1 +
 1 file changed, 1 insertion(+)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs b/Emby.Server.Implementations/ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs
index 5e92808f78..9cc6eb265a 100644
--- a/Emby.Server.Implementations/ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs
+++ b/Emby.Server.Implementations/ScheduledTasks/Tasks/MediaSegmentExtractionTask.cs
@@ -68,6 +68,7 @@ public class MediaSegmentExtractionTask : IScheduledTask
             DtoOptions = new DtoOptions(true),
             SourceTypes = [SourceType.Library],
             Recursive = true,
+            IncludeOwnedItems = true,
             Limit = pagesize
         };
 
-- 
cgit v1.2.3


From e71914e99331c35ff1f44ddf3d69cd81d0121ec5 Mon Sep 17 00:00:00 2001
From: Shadowghost <Ghost_of_Stone@web.de>
Date: Sun, 7 Jun 2026 21:27:48 +0200
Subject: Keep the queried item's media source as the playback default in
 MediaSourceManager

---
 .../Library/MediaSourceManager.cs                  | 38 +++++++++++++---------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs
index f0c7bd1d20..c369fb0957 100644
--- a/Emby.Server.Implementations/Library/MediaSourceManager.cs
+++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs
@@ -229,7 +229,7 @@ namespace Emby.Server.Implementations.Library
                 list.Add(source);
             }
 
-            return SortMediaSources(list).ToArray();
+            return SortMediaSources(list, item.Id).ToArray();
         }
 
         /// <inheritdoc />>
@@ -546,24 +546,32 @@ namespace Emby.Server.Implementations.Library
             }
         }
 
-        private static IEnumerable<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources)
+        private static IEnumerable<MediaSourceInfo> SortMediaSources(IEnumerable<MediaSourceInfo> sources, Guid preferredItemId = default)
         {
-            return sources.OrderBy(i =>
-            {
-                if (i.VideoType.HasValue && i.VideoType.Value == VideoType.VideoFile)
+            // The source belonging to the queried item sorts first so it stays the default that gets played.
+            var preferredId = preferredItemId.IsEmpty()
+                ? null
+                : preferredItemId.ToString("N", CultureInfo.InvariantCulture);
+
+            return sources
+                .OrderByDescending(i => preferredId is not null && string.Equals(i.Id, preferredId, StringComparison.OrdinalIgnoreCase))
+                .ThenBy(i =>
                 {
-                    return 0;
-                }
+                    if (i.VideoType.HasValue && i.VideoType.Value == VideoType.VideoFile)
+                    {
+                        return 0;
+                    }
 
-                return 1;
-            }).ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
-            .ThenByDescending(i =>
-            {
-                var stream = i.VideoStream;
+                    return 1;
+                })
+                .ThenBy(i => i.Video3DFormat.HasValue ? 1 : 0)
+                .ThenByDescending(i =>
+                {
+                    var stream = i.VideoStream;
 
-                return stream?.Width ?? 0;
-            })
-            .Where(i => i.Type != MediaSourceType.Placeholder);
+                    return stream?.Width ?? 0;
+                })
+                .Where(i => i.Type != MediaSourceType.Placeholder);
         }
 
         public async Task<Tuple<LiveStreamResponse, IDirectStreamProvider>> OpenLiveStreamInternal(LiveStreamRequest request, CancellationToken cancellationToken)
-- 
cgit v1.2.3


From f6ce2cedd9554a8cb3d52c5b75a0ff52fa6a1371 Mon Sep 17 00:00:00 2001
From: skzeus <skzeus6467@gmail.com>
Date: Sun, 7 Jun 2026 07:46:52 -0400
Subject: Translated using Weblate (Greek) Translation: Jellyfin/Jellyfin
 Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/el/

---
 Emby.Server.Implementations/Localization/Core/el.json | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Localization/Core/el.json b/Emby.Server.Implementations/Localization/Core/el.json
index d163a929a4..9e22d33225 100644
--- a/Emby.Server.Implementations/Localization/Core/el.json
+++ b/Emby.Server.Implementations/Localization/Core/el.json
@@ -107,5 +107,6 @@
     "TaskExtractMediaSegmentsDescription": "Εξάγει ή βρίσκει τμήματα πολυμέσων από επεκτάσεις που χρησιμοποιούν το MediaSegment.",
     "CleanupUserDataTaskDescription": "Καθαρίζει όλα τα δεδομένα χρήστη (κατάσταση παρακολούθησης, κατάσταση αγαπημένων κ.λπ.) από πολυμέσα που δεν υπάρχουν πλέον για τουλάχιστον 90 ημέρες.",
     "CleanupUserDataTask": "Εργασία εκκαθάρισης δεδομένων χρήστη",
-    "LyricDownloadFailureFromForItem": "Αποτυχία λήψης στίχων από {0} για {1}"
+    "LyricDownloadFailureFromForItem": "Αποτυχία λήψης στίχων από {0} για {1}",
+    "Original": "Πρωτότυπο/η"
 }
-- 
cgit v1.2.3


From f5cf68e979664f24807c9d2ef8d2f43d07b47b36 Mon Sep 17 00:00:00 2001
From: Thunderstrike116 <thunderstrike116@gmail.com>
Date: Mon, 8 Jun 2026 03:47:18 -0400
Subject: Translated using Weblate (Greek) Translation: Jellyfin/Jellyfin
 Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/el/

---
 Emby.Server.Implementations/Localization/Core/el.json | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Localization/Core/el.json b/Emby.Server.Implementations/Localization/Core/el.json
index 9e22d33225..c0ad2c165a 100644
--- a/Emby.Server.Implementations/Localization/Core/el.json
+++ b/Emby.Server.Implementations/Localization/Core/el.json
@@ -108,5 +108,5 @@
     "CleanupUserDataTaskDescription": "Καθαρίζει όλα τα δεδομένα χρήστη (κατάσταση παρακολούθησης, κατάσταση αγαπημένων κ.λπ.) από πολυμέσα που δεν υπάρχουν πλέον για τουλάχιστον 90 ημέρες.",
     "CleanupUserDataTask": "Εργασία εκκαθάρισης δεδομένων χρήστη",
     "LyricDownloadFailureFromForItem": "Αποτυχία λήψης στίχων από {0} για {1}",
-    "Original": "Πρωτότυπο/η"
+    "Original": "Πρωτότυπο"
 }
-- 
cgit v1.2.3


From 8b002e3fca98a9ccb368022678e76026f4c2f10d Mon Sep 17 00:00:00 2001
From: nenadsuperzmaj <nenadsuperzmaj@gmail.com>
Date: Mon, 8 Jun 2026 04:39:53 -0400
Subject: Translated using Weblate (Serbian) Translation: Jellyfin/Jellyfin
 Translate-URL:
 https://translate.jellyfin.org/projects/jellyfin/jellyfin-core/sr/

---
 Emby.Server.Implementations/Localization/Core/sr.json | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

(limited to 'Emby.Server.Implementations')

diff --git a/Emby.Server.Implementations/Localization/Core/sr.json b/Emby.Server.Implementations/Localization/Core/sr.json
index 56806e25c1..92f309c80c 100644
--- a/Emby.Server.Implementations/Localization/Core/sr.json
+++ b/Emby.Server.Implementations/Localization/Core/sr.json
@@ -106,5 +106,7 @@
     "CleanupUserDataTask": "Задатак чишћења корисничких података",
     "CleanupUserDataTaskDescription": "Чисти све корисничке податке (напредак гледања, ознаке за омиљено...) медија који нису доступни 90 дана или дуже.",
     "TaskMoveTrickplayImages": "Промени локацију сличица за визуелно премотавање",
-    "TaskDownloadMissingLyricsDescription": "Преузми стихове песама"
+    "TaskDownloadMissingLyricsDescription": "Преузми стихове песама",
+    "LyricDownloadFailureFromForItem": "Није успело преузимање стихова са {0} за {1}",
+    "Original": "Изворно"
 }
-- 
cgit v1.2.3