From 28a6718d8e77527c3949118676dc6e165e3608f5 Mon Sep 17 00:00:00 2001
From: Andrew Mahone <andrew.mahone@gmail.com>
Date: Mon, 4 Nov 2019 14:48:28 -0500
Subject: [PATCH] Return path of extracted attachment, which is always a file,
 instead of AttachmentInfo with path and protocol.

---
 .../Attachments/AttachmentExtractor.cs        | 20 ++++---------------
 1 file changed, 4 insertions(+), 16 deletions(-)

diff --git a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
index be5908ccef..6bef1cd5a9 100644
--- a/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
+++ b/MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
@@ -97,20 +97,19 @@ namespace MediaBrowser.MediaEncoding.Attachments
             CancellationToken cancellationToken)
         {
             var inputFiles = new[] {mediaSource.Path};
-            var fileInfo = await GetReadableFile(mediaSource.Path, inputFiles, mediaSource.Protocol, mediaAttachment, cancellationToken).ConfigureAwait(false);
-            var stream = await GetAttachmentStream(fileInfo.Path, fileInfo.Protocol, cancellationToken).ConfigureAwait(false);
+            var attachmentPath = await GetReadableFile(mediaSource.Path, inputFiles, mediaSource.Protocol, mediaAttachment, cancellationToken).ConfigureAwait(false);
+            var stream = await GetAttachmentStream(attachmentPath, cancellationToken).ConfigureAwait(false);
             return stream;
         }
 
         private async Task<Stream> GetAttachmentStream(
             string path,
-            MediaProtocol protocol,
             CancellationToken cancellationToken)
         {
             return File.OpenRead(path);
         }
 
-        private async Task<AttachmentInfo> GetReadableFile(
+        private async Task<String> GetReadableFile(
             string mediaPath,
             string[] inputFiles,
             MediaProtocol protocol,
@@ -121,18 +120,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
             await ExtractAttachment(inputFiles, protocol, mediaAttachment.Index, outputPath, cancellationToken)
                 .ConfigureAwait(false);
 
-            return new AttachmentInfo(outputPath, MediaProtocol.File);
-        }
-
-        private struct AttachmentInfo
-        {
-            public AttachmentInfo(string path, MediaProtocol protocol)
-            {
-                Path = path;
-                Protocol = protocol;
-            }
-            public string Path { get; set; }
-            public MediaProtocol Protocol { get; set; }
+            return outputPath;
         }
 
         private readonly ConcurrentDictionary<string, SemaphoreSlim> _semaphoreLocks =