From d39f481a5c723dcbd97a578dc8f390e7d0b4e984 Mon Sep 17 00:00:00 2001
From: David <daullmer@gmail.com>
Date: Thu, 23 Jul 2020 12:46:54 +0200
Subject: Apply suggestions from review

---
 Jellyfin.Api/Controllers/AudioController.cs | 16 +++++++---------
 1 file changed, 7 insertions(+), 9 deletions(-)

(limited to 'Jellyfin.Api/Controllers/AudioController.cs')

diff --git a/Jellyfin.Api/Controllers/AudioController.cs b/Jellyfin.Api/Controllers/AudioController.cs
index 81492ed4a..d8c67cc24 100644
--- a/Jellyfin.Api/Controllers/AudioController.cs
+++ b/Jellyfin.Api/Controllers/AudioController.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Net.Http;
 using System.Threading;
 using System.Threading.Tasks;
 using Jellyfin.Api.Helpers;
@@ -40,6 +41,7 @@ namespace Jellyfin.Api.Controllers
         private readonly IConfiguration _configuration;
         private readonly IDeviceManager _deviceManager;
         private readonly TranscodingJobHelper _transcodingJobHelper;
+        private readonly HttpClient _httpClient;
 
         private readonly TranscodingJobType _transcodingJobType = TranscodingJobType.Progressive;
 
@@ -59,6 +61,7 @@ namespace Jellyfin.Api.Controllers
         /// <param name="configuration">Instance of the <see cref="IConfiguration"/> interface.</param>
         /// <param name="deviceManager">Instance of the <see cref="IDeviceManager"/> interface.</param>
         /// <param name="transcodingJobHelper">The <see cref="TranscodingJobHelper"/> singleton.</param>
+        /// <param name="httpClient">Instance of the <see cref="HttpClient"/>.</param>
         public AudioController(
             IDlnaManager dlnaManager,
             IUserManager userManger,
@@ -72,7 +75,8 @@ namespace Jellyfin.Api.Controllers
             ISubtitleEncoder subtitleEncoder,
             IConfiguration configuration,
             IDeviceManager deviceManager,
-            TranscodingJobHelper transcodingJobHelper)
+            TranscodingJobHelper transcodingJobHelper,
+            HttpClient httpClient)
         {
             _dlnaManager = dlnaManager;
             _authContext = authorizationContext;
@@ -87,6 +91,7 @@ namespace Jellyfin.Api.Controllers
             _configuration = configuration;
             _deviceManager = deviceManager;
             _transcodingJobHelper = transcodingJobHelper;
+            _httpClient = httpClient;
         }
 
         /// <summary>
@@ -295,7 +300,7 @@ namespace Jellyfin.Api.Controllers
 
                 using (state)
                 {
-                    return await FileStreamResponseHelpers.GetStaticRemoteStreamResult(state, isHeadRequest, this).ConfigureAwait(false);
+                    return await FileStreamResponseHelpers.GetStaticRemoteStreamResult(state, isHeadRequest, this, _httpClient).ConfigureAwait(false);
                 }
             }
 
@@ -327,13 +332,6 @@ namespace Jellyfin.Api.Controllers
                         return File(Response.Body, contentType);
                     }
 
-                    TimeSpan? cacheDuration = null;
-
-                    if (!string.IsNullOrEmpty(tag))
-                    {
-                        cacheDuration = TimeSpan.FromDays(365);
-                    }
-
                     return FileStreamResponseHelpers.GetStaticFileResult(
                         state.MediaPath,
                         contentType,
-- 
cgit v1.2.3