From 766d2ee413a15c682c0d687619064caf98f9031c Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Mon, 20 Apr 2020 14:21:06 -0600
Subject: Move RemoteImageService to Jellyfin.API

---
 .../Controllers/Images/RemoteImageController.cs    | 290 +++++++++++++++++++++
 1 file changed, 290 insertions(+)
 create mode 100644 Jellyfin.Api/Controllers/Images/RemoteImageController.cs

(limited to 'Jellyfin.Api/Controllers/Images/RemoteImageController.cs')

diff --git a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
new file mode 100644
index 000000000..66479582d
--- /dev/null
+++ b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
@@ -0,0 +1,290 @@
+#nullable enable
+
+using System;
+using System.IO;
+using System.Linq;
+using System.Threading;
+using System.Threading.Tasks;
+using MediaBrowser.Common.Extensions;
+using MediaBrowser.Common.Net;
+using MediaBrowser.Controller;
+using MediaBrowser.Controller.Library;
+using MediaBrowser.Controller.Net;
+using MediaBrowser.Controller.Providers;
+using MediaBrowser.Model.Entities;
+using MediaBrowser.Model.IO;
+using MediaBrowser.Model.Net;
+using MediaBrowser.Model.Providers;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Mvc.ModelBinding;
+
+namespace Jellyfin.Api.Controllers.Images
+{
+    /// <summary>
+    /// Remote Images Controller.
+    /// </summary>
+    [Route("Images")]
+    [Authenticated]
+    public class RemoteImageController : BaseJellyfinApiController
+    {
+        private readonly IProviderManager _providerManager;
+        private readonly IServerApplicationPaths _applicationPaths;
+        private readonly IHttpClient _httpClient;
+        private readonly ILibraryManager _libraryManager;
+
+        /// <summary>
+        /// Initializes a new instance of the <see cref="RemoteImageController"/> class.
+        /// </summary>
+        /// <param name="providerManager">Instance of the <see cref="IProviderManager"/> interface.</param>
+        /// <param name="applicationPaths">Instance of the <see cref="IServerApplicationPaths"/> interface.</param>
+        /// <param name="httpClient">Instance of the <see cref="IHttpClient"/> interface.</param>
+        /// <param name="libraryManager">Instance of the <see cref="ILibraryManager"/> interface.</param>
+        public RemoteImageController(
+            IProviderManager providerManager,
+            IServerApplicationPaths applicationPaths,
+            IHttpClient httpClient,
+            ILibraryManager libraryManager)
+        {
+            _providerManager = providerManager;
+            _applicationPaths = applicationPaths;
+            _httpClient = httpClient;
+            _libraryManager = libraryManager;
+        }
+
+        /// <summary>
+        /// Gets available remote images for an item.
+        /// </summary>
+        /// <param name="id">Item Id.</param>
+        /// <param name="type">The image type.</param>
+        /// <param name="startIndex">Optional. The record index to start at. All items with a lower index will be dropped from the results.</param>
+        /// <param name="limit">Optional. The maximum number of records to return.</param>
+        /// <param name="providerName">Optional. The image provider to use.</param>
+        /// <param name="includeAllLanguages">Optinal. Include all languages.</param>
+        /// <returns>Remote Image Result.</returns>
+        [HttpGet("{Id}/RemoteImages")]
+        [ProducesResponseType(typeof(RemoteImageResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(typeof(string), StatusCodes.Status404NotFound)]
+        public async Task<IActionResult> GetRemoteImages(
+            [FromRoute] string id,
+            [FromQuery] ImageType? type,
+            [FromQuery] int? startIndex,
+            [FromQuery] int? limit,
+            [FromQuery] string providerName,
+            [FromQuery] bool includeAllLanguages)
+        {
+            try
+            {
+                var item = _libraryManager.GetItemById(id);
+                if (item == null)
+                {
+                    return NotFound();
+                }
+
+                var images = await _providerManager.GetAvailableRemoteImages(
+                        item,
+                        new RemoteImageQuery
+                        {
+                            ProviderName = providerName,
+                            IncludeAllLanguages = includeAllLanguages,
+                            IncludeDisabledProviders = true,
+                            ImageType = type
+                        }, CancellationToken.None)
+                    .ConfigureAwait(false);
+
+                var imageArray = images.ToArray();
+                var allProviders = _providerManager.GetRemoteImageProviderInfo(item);
+                if (type.HasValue)
+                {
+                    allProviders = allProviders.Where(o => o.SupportedImages.Contains(type.Value));
+                }
+
+                var result = new RemoteImageResult
+                {
+                    TotalRecordCount = imageArray.Length,
+                    Providers = allProviders.Select(o => o.Name)
+                        .Distinct(StringComparer.OrdinalIgnoreCase)
+                        .ToArray()
+                };
+
+                if (startIndex.HasValue)
+                {
+                    imageArray = imageArray.Skip(startIndex.Value).ToArray();
+                }
+
+                if (limit.HasValue)
+                {
+                    imageArray = imageArray.Take(limit.Value).ToArray();
+                }
+
+                result.Images = imageArray;
+                return Ok(result);
+            }
+            catch (Exception e)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
+            }
+        }
+
+        /// <summary>
+        /// Gets available remote image providers for an item.
+        /// </summary>
+        /// <param name="id">Item Id.</param>
+        /// <returns>List of providers.</returns>
+        [HttpGet("{Id}/RemoteImages/Providers")]
+        [ProducesResponseType(typeof(ImageProviderInfo[]), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
+        public IActionResult GetRemoteImageProviders([FromRoute] string id)
+        {
+            try
+            {
+                var item = _libraryManager.GetItemById(id);
+                if (item == null)
+                {
+                    return NotFound();
+                }
+
+                var providers = _providerManager.GetRemoteImageProviderInfo(item);
+                return Ok(providers);
+            }
+            catch (Exception e)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
+            }
+        }
+
+        /// <summary>
+        /// Gets a remote image.
+        /// </summary>
+        /// <param name="imageUrl">The image url.</param>
+        /// <returns>Image Stream.</returns>
+        [HttpGet("Remote")]
+        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
+        public async Task<IActionResult> GetRemoteImage([FromQuery, BindRequired] string imageUrl)
+        {
+            try
+            {
+                var urlHash = imageUrl.GetMD5();
+                var pointerCachePath = GetFullCachePath(urlHash.ToString());
+
+                string? contentPath = null;
+                bool hasFile = false;
+
+                try
+                {
+                    contentPath = await System.IO.File.ReadAllTextAsync(pointerCachePath).ConfigureAwait(false);
+                    if (System.IO.File.Exists(contentPath))
+                    {
+                        hasFile = true;
+                    }
+                }
+                catch (FileNotFoundException)
+                {
+                    // Means the file isn't cached yet
+                }
+                catch (IOException)
+                {
+                    // Means the file isn't cached yet
+                }
+
+                if (!hasFile)
+                {
+                    await DownloadImage(imageUrl, urlHash, pointerCachePath).ConfigureAwait(false);
+                    contentPath = await System.IO.File.ReadAllTextAsync(pointerCachePath).ConfigureAwait(false);
+                }
+
+                if (string.IsNullOrEmpty(contentPath))
+                {
+                    return NotFound();
+                }
+
+                var contentType = MimeTypes.GetMimeType(contentPath);
+                return new FileStreamResult(System.IO.File.OpenRead(contentPath), contentType);
+            }
+            catch (Exception e)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
+            }
+        }
+
+        /// <summary>
+        /// Downloads a remote image for an item.
+        /// </summary>
+        /// <param name="id">Item Id.</param>
+        /// <param name="type">The image type.</param>
+        /// <param name="imageUrl">The image url.</param>
+        /// <returns>Status.</returns>
+        [HttpPost("{Id}/RemoteImages/Download")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status404NotFound)]
+        [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
+        public async Task<IActionResult> DownloadRemoteImage(
+            [FromRoute] string id,
+            [FromQuery, BindRequired] ImageType type,
+            [FromQuery] string imageUrl)
+        {
+            try
+            {
+                var item = _libraryManager.GetItemById(id);
+                if (item == null)
+                {
+                    return NotFound();
+                }
+
+                await _providerManager.SaveImage(item, imageUrl, type, null, CancellationToken.None)
+                    .ConfigureAwait(false);
+
+                item.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
+                return Ok();
+            }
+            catch (Exception e)
+            {
+                return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
+            }
+        }
+
+        /// <summary>
+        /// Gets the full cache path.
+        /// </summary>
+        /// <param name="filename">The filename.</param>
+        /// <returns>System.String.</returns>
+        private string GetFullCachePath(string filename)
+        {
+            return Path.Combine(_applicationPaths.CachePath, "remote-images", filename.Substring(0, 1), filename);
+        }
+
+        /// <summary>
+        /// Downloads the image.
+        /// </summary>
+        /// <param name="url">The URL.</param>
+        /// <param name="urlHash">The URL hash.</param>
+        /// <param name="pointerCachePath">The pointer cache path.</param>
+        /// <returns>Task.</returns>
+        private async Task DownloadImage(string url, Guid urlHash, string pointerCachePath)
+        {
+            using var result = await _httpClient.GetResponse(new HttpRequestOptions
+            {
+                Url = url,
+                BufferContent = false
+            }).ConfigureAwait(false);
+            var ext = result.ContentType.Split('/').Last();
+
+            var fullCachePath = GetFullCachePath(urlHash + "." + ext);
+
+            Directory.CreateDirectory(Path.GetDirectoryName(fullCachePath));
+            using (var stream = result.Content)
+            {
+                using var filestream = new FileStream(fullCachePath, FileMode.Create, FileAccess.Write, FileShare.Read, IODefaults.FileStreamBufferSize, true);
+                await stream.CopyToAsync(filestream).ConfigureAwait(false);
+            }
+
+            Directory.CreateDirectory(Path.GetDirectoryName(pointerCachePath));
+            await System.IO.File.WriteAllTextAsync(pointerCachePath, fullCachePath, CancellationToken.None)
+                .ConfigureAwait(false);
+        }
+    }
+}
-- 
cgit v1.2.3


From a6cd8526758386045a6895b0037f2199bdcb9003 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Tue, 21 Apr 2020 07:58:54 -0600
Subject: Remove exception handler

---
 .../Controllers/Images/RemoteImageController.cs    | 184 +++++++++------------
 1 file changed, 78 insertions(+), 106 deletions(-)

(limited to 'Jellyfin.Api/Controllers/Images/RemoteImageController.cs')

diff --git a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
index 66479582d..8c7d21cd5 100644
--- a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
+++ b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
@@ -74,57 +74,50 @@ namespace Jellyfin.Api.Controllers.Images
             [FromQuery] string providerName,
             [FromQuery] bool includeAllLanguages)
         {
-            try
+            var item = _libraryManager.GetItemById(id);
+            if (item == null)
             {
-                var item = _libraryManager.GetItemById(id);
-                if (item == null)
-                {
-                    return NotFound();
-                }
-
-                var images = await _providerManager.GetAvailableRemoteImages(
-                        item,
-                        new RemoteImageQuery
-                        {
-                            ProviderName = providerName,
-                            IncludeAllLanguages = includeAllLanguages,
-                            IncludeDisabledProviders = true,
-                            ImageType = type
-                        }, CancellationToken.None)
-                    .ConfigureAwait(false);
-
-                var imageArray = images.ToArray();
-                var allProviders = _providerManager.GetRemoteImageProviderInfo(item);
-                if (type.HasValue)
-                {
-                    allProviders = allProviders.Where(o => o.SupportedImages.Contains(type.Value));
-                }
+                return NotFound();
+            }
 
-                var result = new RemoteImageResult
-                {
-                    TotalRecordCount = imageArray.Length,
-                    Providers = allProviders.Select(o => o.Name)
-                        .Distinct(StringComparer.OrdinalIgnoreCase)
-                        .ToArray()
-                };
+            var images = await _providerManager.GetAvailableRemoteImages(
+                    item,
+                    new RemoteImageQuery
+                    {
+                        ProviderName = providerName,
+                        IncludeAllLanguages = includeAllLanguages,
+                        IncludeDisabledProviders = true,
+                        ImageType = type
+                    }, CancellationToken.None)
+                .ConfigureAwait(false);
 
-                if (startIndex.HasValue)
-                {
-                    imageArray = imageArray.Skip(startIndex.Value).ToArray();
-                }
+            var imageArray = images.ToArray();
+            var allProviders = _providerManager.GetRemoteImageProviderInfo(item);
+            if (type.HasValue)
+            {
+                allProviders = allProviders.Where(o => o.SupportedImages.Contains(type.Value));
+            }
 
-                if (limit.HasValue)
-                {
-                    imageArray = imageArray.Take(limit.Value).ToArray();
-                }
+            var result = new RemoteImageResult
+            {
+                TotalRecordCount = imageArray.Length,
+                Providers = allProviders.Select(o => o.Name)
+                    .Distinct(StringComparer.OrdinalIgnoreCase)
+                    .ToArray()
+            };
 
-                result.Images = imageArray;
-                return Ok(result);
+            if (startIndex.HasValue)
+            {
+                imageArray = imageArray.Skip(startIndex.Value).ToArray();
             }
-            catch (Exception e)
+
+            if (limit.HasValue)
             {
-                return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
+                imageArray = imageArray.Take(limit.Value).ToArray();
             }
+
+            result.Images = imageArray;
+            return Ok(result);
         }
 
         /// <summary>
@@ -138,21 +131,14 @@ namespace Jellyfin.Api.Controllers.Images
         [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
         public IActionResult GetRemoteImageProviders([FromRoute] string id)
         {
-            try
+            var item = _libraryManager.GetItemById(id);
+            if (item == null)
             {
-                var item = _libraryManager.GetItemById(id);
-                if (item == null)
-                {
-                    return NotFound();
-                }
-
-                var providers = _providerManager.GetRemoteImageProviderInfo(item);
-                return Ok(providers);
-            }
-            catch (Exception e)
-            {
-                return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
+                return NotFound();
             }
+
+            var providers = _providerManager.GetRemoteImageProviderInfo(item);
+            return Ok(providers);
         }
 
         /// <summary>
@@ -166,49 +152,42 @@ namespace Jellyfin.Api.Controllers.Images
         [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
         public async Task<IActionResult> GetRemoteImage([FromQuery, BindRequired] string imageUrl)
         {
-            try
-            {
-                var urlHash = imageUrl.GetMD5();
-                var pointerCachePath = GetFullCachePath(urlHash.ToString());
+            var urlHash = imageUrl.GetMD5();
+            var pointerCachePath = GetFullCachePath(urlHash.ToString());
 
-                string? contentPath = null;
-                bool hasFile = false;
+            string? contentPath = null;
+            bool hasFile = false;
 
-                try
-                {
-                    contentPath = await System.IO.File.ReadAllTextAsync(pointerCachePath).ConfigureAwait(false);
-                    if (System.IO.File.Exists(contentPath))
-                    {
-                        hasFile = true;
-                    }
-                }
-                catch (FileNotFoundException)
-                {
-                    // Means the file isn't cached yet
-                }
-                catch (IOException)
-                {
-                    // Means the file isn't cached yet
-                }
-
-                if (!hasFile)
-                {
-                    await DownloadImage(imageUrl, urlHash, pointerCachePath).ConfigureAwait(false);
-                    contentPath = await System.IO.File.ReadAllTextAsync(pointerCachePath).ConfigureAwait(false);
-                }
-
-                if (string.IsNullOrEmpty(contentPath))
+            try
+            {
+                contentPath = await System.IO.File.ReadAllTextAsync(pointerCachePath).ConfigureAwait(false);
+                if (System.IO.File.Exists(contentPath))
                 {
-                    return NotFound();
+                    hasFile = true;
                 }
+            }
+            catch (FileNotFoundException)
+            {
+                // Means the file isn't cached yet
+            }
+            catch (IOException)
+            {
+                // Means the file isn't cached yet
+            }
 
-                var contentType = MimeTypes.GetMimeType(contentPath);
-                return new FileStreamResult(System.IO.File.OpenRead(contentPath), contentType);
+            if (!hasFile)
+            {
+                await DownloadImage(imageUrl, urlHash, pointerCachePath).ConfigureAwait(false);
+                contentPath = await System.IO.File.ReadAllTextAsync(pointerCachePath).ConfigureAwait(false);
             }
-            catch (Exception e)
+
+            if (string.IsNullOrEmpty(contentPath))
             {
-                return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
+                return NotFound();
             }
+
+            var contentType = MimeTypes.GetMimeType(contentPath);
+            return new FileStreamResult(System.IO.File.OpenRead(contentPath), contentType);
         }
 
         /// <summary>
@@ -227,24 +206,17 @@ namespace Jellyfin.Api.Controllers.Images
             [FromQuery, BindRequired] ImageType type,
             [FromQuery] string imageUrl)
         {
-            try
+            var item = _libraryManager.GetItemById(id);
+            if (item == null)
             {
-                var item = _libraryManager.GetItemById(id);
-                if (item == null)
-                {
-                    return NotFound();
-                }
+                return NotFound();
+            }
 
-                await _providerManager.SaveImage(item, imageUrl, type, null, CancellationToken.None)
-                    .ConfigureAwait(false);
+            await _providerManager.SaveImage(item, imageUrl, type, null, CancellationToken.None)
+                .ConfigureAwait(false);
 
-                item.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
-                return Ok();
-            }
-            catch (Exception e)
-            {
-                return StatusCode(StatusCodes.Status500InternalServerError, e.Message);
-            }
+            item.UpdateToRepository(ItemUpdateType.ImageUpdate, CancellationToken.None);
+            return Ok();
         }
 
         /// <summary>
-- 
cgit v1.2.3


From 9ae895ba213a508f676d21e5425b25bb518ed89a Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Tue, 21 Apr 2020 14:09:06 -0600
Subject: move to ActionResult<T>

---
 .../Controllers/Images/RemoteImageController.cs       | 19 ++++++++-----------
 1 file changed, 8 insertions(+), 11 deletions(-)

(limited to 'Jellyfin.Api/Controllers/Images/RemoteImageController.cs')

diff --git a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
index 8c7d21cd5..a0754ed4e 100644
--- a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
+++ b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
@@ -63,10 +63,9 @@ namespace Jellyfin.Api.Controllers.Images
         /// <param name="includeAllLanguages">Optinal. Include all languages.</param>
         /// <returns>Remote Image Result.</returns>
         [HttpGet("{Id}/RemoteImages")]
-        [ProducesResponseType(typeof(RemoteImageResult), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ProducesResponseType(typeof(string), StatusCodes.Status404NotFound)]
-        public async Task<IActionResult> GetRemoteImages(
+        public async Task<ActionResult<RemoteImageResult>> GetRemoteImages(
             [FromRoute] string id,
             [FromQuery] ImageType? type,
             [FromQuery] int? startIndex,
@@ -126,10 +125,9 @@ namespace Jellyfin.Api.Controllers.Images
         /// <param name="id">Item Id.</param>
         /// <returns>List of providers.</returns>
         [HttpGet("{Id}/RemoteImages/Providers")]
-        [ProducesResponseType(typeof(ImageProviderInfo[]), StatusCodes.Status200OK)]
+        [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
-        public IActionResult GetRemoteImageProviders([FromRoute] string id)
+        public ActionResult<ImageProviderInfo[]> GetRemoteImageProviders([FromRoute] string id)
         {
             var item = _libraryManager.GetItemById(id);
             if (item == null)
@@ -147,10 +145,10 @@ namespace Jellyfin.Api.Controllers.Images
         /// <param name="imageUrl">The image url.</param>
         /// <returns>Image Stream.</returns>
         [HttpGet("Remote")]
-        [ProducesResponseType(typeof(FileStreamResult), StatusCodes.Status200OK)]
+        [Produces("application/octet-stream")]
+        [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> GetRemoteImage([FromQuery, BindRequired] string imageUrl)
+        public async Task<ActionResult<FileStreamResult>> GetRemoteImage([FromQuery, BindRequired] string imageUrl)
         {
             var urlHash = imageUrl.GetMD5();
             var pointerCachePath = GetFullCachePath(urlHash.ToString());
@@ -200,8 +198,7 @@ namespace Jellyfin.Api.Controllers.Images
         [HttpPost("{Id}/RemoteImages/Download")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        [ProducesResponseType(typeof(string), StatusCodes.Status500InternalServerError)]
-        public async Task<IActionResult> DownloadRemoteImage(
+        public async Task<ActionResult> DownloadRemoteImage(
             [FromRoute] string id,
             [FromQuery, BindRequired] ImageType type,
             [FromQuery] string imageUrl)
-- 
cgit v1.2.3


From 2923013c6ed0c5c4e7325893be0822d8fcd9de47 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Tue, 19 May 2020 09:23:28 -0600
Subject: Clean Remote Image Controller.

---
 .../Controllers/Images/RemoteImageController.cs    | 38 +++++++++++++---------
 1 file changed, 23 insertions(+), 15 deletions(-)

(limited to 'Jellyfin.Api/Controllers/Images/RemoteImageController.cs')

diff --git a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
index a0754ed4e..665db561b 100644
--- a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
+++ b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
@@ -1,6 +1,7 @@
 #nullable enable
 
 using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
 using System.Threading;
@@ -9,12 +10,12 @@ using MediaBrowser.Common.Extensions;
 using MediaBrowser.Common.Net;
 using MediaBrowser.Controller;
 using MediaBrowser.Controller.Library;
-using MediaBrowser.Controller.Net;
 using MediaBrowser.Controller.Providers;
 using MediaBrowser.Model.Entities;
 using MediaBrowser.Model.IO;
 using MediaBrowser.Model.Net;
 using MediaBrowser.Model.Providers;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.AspNetCore.Mvc.ModelBinding;
@@ -25,7 +26,7 @@ namespace Jellyfin.Api.Controllers.Images
     /// Remote Images Controller.
     /// </summary>
     [Route("Images")]
-    [Authenticated]
+    [Authorize]
     public class RemoteImageController : BaseJellyfinApiController
     {
         private readonly IProviderManager _providerManager;
@@ -60,7 +61,9 @@ namespace Jellyfin.Api.Controllers.Images
         /// <param name="startIndex">Optional. The record index to start at. All items with a lower index will be dropped from the results.</param>
         /// <param name="limit">Optional. The maximum number of records to return.</param>
         /// <param name="providerName">Optional. The image provider to use.</param>
-        /// <param name="includeAllLanguages">Optinal. Include all languages.</param>
+        /// <param name="includeAllLanguages">Optional. Include all languages.</param>
+        /// <response code="200">Remote Images returned.</response>
+        /// <response code="404">Item not found.</response>
         /// <returns>Remote Image Result.</returns>
         [HttpGet("{Id}/RemoteImages")]
         [ProducesResponseType(StatusCodes.Status200OK)]
@@ -116,18 +119,20 @@ namespace Jellyfin.Api.Controllers.Images
             }
 
             result.Images = imageArray;
-            return Ok(result);
+            return result;
         }
 
         /// <summary>
         /// Gets available remote image providers for an item.
         /// </summary>
         /// <param name="id">Item Id.</param>
-        /// <returns>List of providers.</returns>
+        /// <response code="200">Returned remote image providers.</response>
+        /// <response code="404">Item not found.</response>
+        /// <returns>List of remote image providers.</returns>
         [HttpGet("{Id}/RemoteImages/Providers")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
-        public ActionResult<ImageProviderInfo[]> GetRemoteImageProviders([FromRoute] string id)
+        public ActionResult<IEnumerable<ImageProviderInfo>> GetRemoteImageProviders([FromRoute] string id)
         {
             var item = _libraryManager.GetItemById(id);
             if (item == null)
@@ -135,14 +140,15 @@ namespace Jellyfin.Api.Controllers.Images
                 return NotFound();
             }
 
-            var providers = _providerManager.GetRemoteImageProviderInfo(item);
-            return Ok(providers);
+            return Ok(_providerManager.GetRemoteImageProviderInfo(item));
         }
 
         /// <summary>
         /// Gets a remote image.
         /// </summary>
         /// <param name="imageUrl">The image url.</param>
+        /// <response code="200">Remote image returned.</response>
+        /// <response code="404">Remote image not found.</response>
         /// <returns>Image Stream.</returns>
         [HttpGet("Remote")]
         [Produces("application/octet-stream")]
@@ -154,7 +160,7 @@ namespace Jellyfin.Api.Controllers.Images
             var pointerCachePath = GetFullCachePath(urlHash.ToString());
 
             string? contentPath = null;
-            bool hasFile = false;
+            var hasFile = false;
 
             try
             {
@@ -166,11 +172,11 @@ namespace Jellyfin.Api.Controllers.Images
             }
             catch (FileNotFoundException)
             {
-                // Means the file isn't cached yet
+                // The file isn't cached yet
             }
             catch (IOException)
             {
-                // Means the file isn't cached yet
+                // The file isn't cached yet
             }
 
             if (!hasFile)
@@ -194,7 +200,9 @@ namespace Jellyfin.Api.Controllers.Images
         /// <param name="id">Item Id.</param>
         /// <param name="type">The image type.</param>
         /// <param name="imageUrl">The image url.</param>
-        /// <returns>Status.</returns>
+        /// <response code="200">Remote image downloaded.</response>
+        /// <response code="404">Remote image not found.</response>
+        /// <returns>Download status.</returns>
         [HttpPost("{Id}/RemoteImages/Download")]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
@@ -245,10 +253,10 @@ namespace Jellyfin.Api.Controllers.Images
             var fullCachePath = GetFullCachePath(urlHash + "." + ext);
 
             Directory.CreateDirectory(Path.GetDirectoryName(fullCachePath));
-            using (var stream = result.Content)
+            await using (var stream = result.Content)
             {
-                using var filestream = new FileStream(fullCachePath, FileMode.Create, FileAccess.Write, FileShare.Read, IODefaults.FileStreamBufferSize, true);
-                await stream.CopyToAsync(filestream).ConfigureAwait(false);
+                await using var fileStream = new FileStream(fullCachePath, FileMode.Create, FileAccess.Write, FileShare.Read, IODefaults.FileStreamBufferSize, true);
+                await stream.CopyToAsync(fileStream).ConfigureAwait(false);
             }
 
             Directory.CreateDirectory(Path.GetDirectoryName(pointerCachePath));
-- 
cgit v1.2.3


From fb068b76a12bf9de5de75a0b8079effcd0336ecf Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Wed, 20 May 2020 07:18:51 -0600
Subject: Use correct MediaTypeName

---
 Jellyfin.Api/Controllers/Images/RemoteImageController.cs | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'Jellyfin.Api/Controllers/Images/RemoteImageController.cs')

diff --git a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
index 665db561b..1155cc653 100644
--- a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
+++ b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
@@ -4,6 +4,7 @@ using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
+using System.Net.Mime;
 using System.Threading;
 using System.Threading.Tasks;
 using MediaBrowser.Common.Extensions;
@@ -151,7 +152,7 @@ namespace Jellyfin.Api.Controllers.Images
         /// <response code="404">Remote image not found.</response>
         /// <returns>Image Stream.</returns>
         [HttpGet("Remote")]
-        [Produces("application/octet-stream")]
+        [Produces(MediaTypeNames.Application.Octet)]
         [ProducesResponseType(StatusCodes.Status200OK)]
         [ProducesResponseType(StatusCodes.Status404NotFound)]
         public async Task<ActionResult<FileStreamResult>> GetRemoteImage([FromQuery, BindRequired] string imageUrl)
-- 
cgit v1.2.3


From 552a74eb6e874976116447754785b6c1ca355718 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Sat, 13 Jun 2020 15:13:57 -0600
Subject: Fix build

---
 Jellyfin.Api/Controllers/Images/RemoteImageController.cs | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

(limited to 'Jellyfin.Api/Controllers/Images/RemoteImageController.cs')

diff --git a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
index 1155cc653..f521dfdf2 100644
--- a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
+++ b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
@@ -85,9 +85,8 @@ namespace Jellyfin.Api.Controllers.Images
 
             var images = await _providerManager.GetAvailableRemoteImages(
                     item,
-                    new RemoteImageQuery
+                    new RemoteImageQuery(providerName)
                     {
-                        ProviderName = providerName,
                         IncludeAllLanguages = includeAllLanguages,
                         IncludeDisabledProviders = true,
                         ImageType = type
-- 
cgit v1.2.3


From 9b45ee440cd2d167aee63a05bcbb6137765b4da8 Mon Sep 17 00:00:00 2001
From: crobibero <cody@robibe.ro>
Date: Wed, 17 Jun 2020 10:51:50 -0600
Subject: User proper File constructor

---
 Jellyfin.Api/Controllers/Images/RemoteImageController.cs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'Jellyfin.Api/Controllers/Images/RemoteImageController.cs')

diff --git a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
index f521dfdf2..7c5f17e9e 100644
--- a/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
+++ b/Jellyfin.Api/Controllers/Images/RemoteImageController.cs
@@ -191,7 +191,7 @@ namespace Jellyfin.Api.Controllers.Images
             }
 
             var contentType = MimeTypes.GetMimeType(contentPath);
-            return new FileStreamResult(System.IO.File.OpenRead(contentPath), contentType);
+            return File(System.IO.File.OpenRead(contentPath), contentType);
         }
 
         /// <summary>
-- 
cgit v1.2.3