Sfoglia il codice sorgente

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

Andrew Mahone 5 anni fa
parent
commit
380d023351

+ 1 - 0
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

+ 2 - 0
MediaBrowser.Controller/Library/IMediaSourceManager.cs

@@ -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.

+ 1 - 1
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;