michael.heier/jellyfin
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments

Browse Source
This commit is contained in:
Andrew Mahone 2019-11-07 11:58:13 -05:00
commit 380d023351
3 changed files with 4 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Emby.Server.Implementations/Library/MediaSourceManager.cs
View File

@ -143,6 +143,7 @@ namespace Emby.Server.Implementations.Library
});
}
/// <inheritdoc />
public List<MediaAttachment> GetMediaAttachments(Guid itemId)
{
return GetMediaAttachments(new MediaAttachmentQuery

2
MediaBrowser.Controller/Library/IMediaSourceManager.cs
View File

@ -44,11 +44,13 @@ namespace MediaBrowser.Controller.Library
/// <param name="">The item identifier.</param>
/// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
List<MediaAttachment> GetMediaAttachments(Guid itemId);
/// <summary>
/// Gets the media attachments.
/// </summary>
/// <param name="">The The media source identifier.</param>
/// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
List<MediaAttachment> GetMediaAttachments(string mediaSourceId);
/// <summary>
/// Gets the media attachments.

2
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
View File

@ -89,7 +89,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
MediaAttachment mediaAttachment,
CancellationToken cancellationToken)
{
var inputFiles = new[] {mediaSource.Path};
var inputFiles = new[] { mediaSource.Path };
var attachmentPath = await GetReadableFile(mediaSource.Path, inputFiles, mediaSource.Protocol, mediaAttachment, cancellationToken).ConfigureAwait(false);
var stream = await GetAttachmentStream(attachmentPath, cancellationToken).ConfigureAwait(false);
return stream;