Backupppert/jellyfin
0
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2024-07-05 21:33:02 +02:00
Code Issues 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
parent 2338a53229 2f728fd2a1
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) public List<MediaAttachment> GetMediaAttachments(Guid itemId)
{ {
return GetMediaAttachments(new MediaAttachmentQuery 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> /// <param name="">The item identifier.</param>
/// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns> /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
List<MediaAttachment> GetMediaAttachments(Guid itemId); List<MediaAttachment> GetMediaAttachments(Guid itemId);
/// <summary> /// <summary>
/// Gets the media attachments. /// Gets the media attachments.
/// </summary> /// </summary>
/// <param name="">The The media source identifier.</param> /// <param name="">The The media source identifier.</param>
/// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns> /// <returns>IEnumerable&lt;MediaAttachment&gt;.</returns>
List<MediaAttachment> GetMediaAttachments(string mediaSourceId); List<MediaAttachment> GetMediaAttachments(string mediaSourceId);
/// <summary> /// <summary>
/// Gets the media attachments. /// Gets the media attachments.

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

@ -89,7 +89,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
MediaAttachment mediaAttachment, MediaAttachment mediaAttachment,
CancellationToken cancellationToken) 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 attachmentPath = await GetReadableFile(mediaSource.Path, inputFiles, mediaSource.Protocol, mediaAttachment, cancellationToken).ConfigureAwait(false);
var stream = await GetAttachmentStream(attachmentPath, cancellationToken).ConfigureAwait(false); var stream = await GetAttachmentStream(attachmentPath, cancellationToken).ConfigureAwait(false);
return stream; return stream;