diff options
| author | Andrew Mahone <andrew.mahone@gmail.com> | 2019-11-07 11:58:13 -0500 |
|---|---|---|
| committer | Andrew Mahone <andrew.mahone@gmail.com> | 2019-11-07 11:58:13 -0500 |
| commit | 380d02335151b5d84b537110c47915613e24dd3b (patch) | |
| tree | 869f28d6380c6a062545776ac9b619275811e8df | |
| parent | 2338a53229431070b1c128436e990a486011205b (diff) | |
| parent | 2f728fd2a1be2e0abde3b8d7f8269b849e1555c6 (diff) | |
Merge branch 'media-attachments' of github.com:Unhelpful/jellyfin into media-attachments
3 files changed, 4 insertions, 1 deletions
diff --git a/Emby.Server.Implementations/Library/MediaSourceManager.cs b/Emby.Server.Implementations/Library/MediaSourceManager.cs index df6f0e77f..9574a28e9 100644 --- a/Emby.Server.Implementations/Library/MediaSourceManager.cs +++ b/Emby.Server.Implementations/Library/MediaSourceManager.cs @@ -143,6 +143,7 @@ namespace Emby.Server.Implementations.Library }); } + /// <inheritdoc /> public List<MediaAttachment> GetMediaAttachments(Guid itemId) { return GetMediaAttachments(new MediaAttachmentQuery diff --git a/MediaBrowser.Controller/Library/IMediaSourceManager.cs b/MediaBrowser.Controller/Library/IMediaSourceManager.cs index 961028b04..dda8d397a 100644 --- a/MediaBrowser.Controller/Library/IMediaSourceManager.cs +++ b/MediaBrowser.Controller/Library/IMediaSourceManager.cs @@ -44,11 +44,13 @@ namespace MediaBrowser.Controller.Library /// <param name="">The item identifier.</param> /// <returns>IEnumerable<MediaAttachment>.</returns> List<MediaAttachment> GetMediaAttachments(Guid itemId); + /// <summary> /// Gets the media attachments. /// </summary> /// <param name="">The The media source identifier.</param> /// <returns>IEnumerable<MediaAttachment>.</returns> + List<MediaAttachment> GetMediaAttachments(string mediaSourceId); /// <summary> /// Gets the media attachments. diff --git a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs index d18463cb5..f5f5d213f 100644 --- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs +++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs @@ -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; |
