Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-07-09 03:04:24 -04:00
Code Issues Packages Projects Releases Wiki Activity

Query media streams by type instead of filtering

Browse Source
This commit is contained in:
Joe Rogers 2021-11-17 22:03:52 +01:00
parent c32a421ea7
commit 7cf5767949
No known key found for this signature in database
GPG Key ID: 0074AD57B8FDBBB4
7 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
MediaBrowser.Controller/Entities/Audio/Audio.cs
View File

@ -126,15 +126,6 @@ namespace MediaBrowser.Controller.Entities.Audio
return base.GetBlockUnratedType(); return base.GetBlockUnratedType();
} }
public List<MediaStream> GetMediaStreams(MediaStreamType type)
{
return MediaSourceManager.GetMediaStreams(new MediaStreamQuery
{
ItemId = Id,
Type = type
});
}
public SongInfo GetLookupInfo() public SongInfo GetLookupInfo()
{ {
var info = GetItemLookupInfo<SongInfo>(); var info = GetItemLookupInfo<SongInfo>();

8
MediaBrowser.Controller/Entities/BaseItem.cs
View File

@ -1107,10 +1107,16 @@ namespace MediaBrowser.Controller.Entities
} }
public virtual List<MediaStream> GetMediaStreams() public virtual List<MediaStream> GetMediaStreams()
{
return GetMediaStreams(null);
}
public virtual List<MediaStream> GetMediaStreams(MediaStreamType? type)
{ {
return MediaSourceManager.GetMediaStreams(new MediaStreamQuery return MediaSourceManager.GetMediaStreams(new MediaStreamQuery
{ {
ItemId = Id ItemId = Id,
Type = type
}); });
} }

5
MediaBrowser.Providers/MediaInfo/AudioImageProvider.cs
View File

@ -49,10 +49,7 @@ namespace MediaBrowser.Providers.MediaInfo
{ {
var audio = (Audio)item; var audio = (Audio)item;
var imageStreams = var imageStreams = audio.GetMediaStreams(MediaStreamType.EmbeddedImage);
audio.GetMediaStreams(MediaStreamType.EmbeddedImage)
.Where(i => i.Type == MediaStreamType.EmbeddedImage)
.ToList();
// Can't extract if we didn't find a video stream in the file // Can't extract if we didn't find a video stream in the file
if (imageStreams.Count == 0) if (imageStreams.Count == 0)

2
MediaBrowser.Providers/MediaInfo/EmbeddedImageProvider.cs
View File

@ -139,7 +139,7 @@ namespace MediaBrowser.Providers.MediaInfo
} }
// Fall back to EmbeddedImage streams // Fall back to EmbeddedImage streams
var imageStreams = item.GetMediaStreams().FindAll(i => i.Type == MediaStreamType.EmbeddedImage); var imageStreams = item.GetMediaStreams(MediaStreamType.EmbeddedImage);
if (imageStreams.Count == 0) if (imageStreams.Count == 0)
{ {

2
MediaBrowser.Providers/MediaInfo/VideoImageProvider.cs
View File

@ -83,7 +83,7 @@ namespace MediaBrowser.Providers.MediaInfo
? TimeSpan.FromTicks(item.RunTimeTicks.Value / 10) ? TimeSpan.FromTicks(item.RunTimeTicks.Value / 10)
: TimeSpan.FromSeconds(10); : TimeSpan.FromSeconds(10);
var videoStream = item.GetDefaultVideoStream() ?? item.GetMediaStreams().FirstOrDefault(i => i.Type == MediaStreamType.Video); var videoStream = item.GetDefaultVideoStream() ?? item.GetMediaStreams(MediaStreamType.Video).FirstOrDefault();
if (videoStream == null) if (videoStream == null)
{ {

2
tests/Jellyfin.Providers.Tests/MediaInfo/EmbeddedImageProviderTests.cs
View File

@ -147,7 +147,7 @@ namespace Jellyfin.Providers.Tests.MediaInfo
movie.Setup(item => item.GetMediaSources(It.IsAny<bool>())) movie.Setup(item => item.GetMediaSources(It.IsAny<bool>()))
.Returns(new List<MediaSourceInfo> { new () { MediaAttachments = mediaAttachments } } ); .Returns(new List<MediaSourceInfo> { new () { MediaAttachments = mediaAttachments } } );
movie.Setup(item => item.GetMediaStreams()) movie.Setup(item => item.GetMediaStreams(MediaStreamType.EmbeddedImage))
.Returns(mediaStreams); .Returns(mediaStreams);
return movie.Object; return movie.Object;

2
tests/Jellyfin.Providers.Tests/MediaInfo/VideoImageProviderTests.cs
View File

@ -167,7 +167,7 @@ namespace Jellyfin.Providers.Tests.MediaInfo
movie.Setup(item => item.GetDefaultVideoStream()) movie.Setup(item => item.GetDefaultVideoStream())
.Returns(defaultStream!); .Returns(defaultStream!);
movie.Setup(item => item.GetMediaStreams()) movie.Setup(item => item.GetMediaStreams(MediaStreamType.Video))
.Returns(mediaStreams); .Returns(mediaStreams);
return movie.Object; return movie.Object;