The Free Software Media System - Server Backend & API
Keep the queried item's media source as the playback default in MediaSourceManager
Shadowghoste71914e99331
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.csindex 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.Librarylist.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)