Browse Source

Apply review suggestions

Erwin de Haan 4 năm trước cách đây
mục cha
commit
1f3aa3fe6f

+ 0 - 3
Jellyfin.Api/Controllers/HlsSegmentController.cs

@@ -61,7 +61,6 @@ namespace Jellyfin.Api.Controllers
         {
         {
             // TODO: Deprecate with new iOS app
             // TODO: Deprecate with new iOS app
             var file = segmentId + Path.GetExtension(Request.Path);
             var file = segmentId + Path.GetExtension(Request.Path);
-            file = Path.Combine(_serverConfigurationManager.GetTranscodePath(), file);
             var transcodePath = _serverConfigurationManager.GetTranscodePath();
             var transcodePath = _serverConfigurationManager.GetTranscodePath();
             file = Path.GetFullPath(Path.Combine(transcodePath, file));
             file = Path.GetFullPath(Path.Combine(transcodePath, file));
             var fileDir = Path.GetDirectoryName(file);
             var fileDir = Path.GetDirectoryName(file);
@@ -88,7 +87,6 @@ namespace Jellyfin.Api.Controllers
         public ActionResult GetHlsPlaylistLegacy([FromRoute, Required] string itemId, [FromRoute, Required] string playlistId)
         public ActionResult GetHlsPlaylistLegacy([FromRoute, Required] string itemId, [FromRoute, Required] string playlistId)
         {
         {
             var file = playlistId + Path.GetExtension(Request.Path);
             var file = playlistId + Path.GetExtension(Request.Path);
-            file = Path.Combine(_serverConfigurationManager.GetTranscodePath(), file);
             var transcodePath = _serverConfigurationManager.GetTranscodePath();
             var transcodePath = _serverConfigurationManager.GetTranscodePath();
             file = Path.GetFullPath(Path.Combine(transcodePath, file));
             file = Path.GetFullPath(Path.Combine(transcodePath, file));
             var fileDir = Path.GetDirectoryName(file);
             var fileDir = Path.GetDirectoryName(file);
@@ -144,7 +142,6 @@ namespace Jellyfin.Api.Controllers
             var file = segmentId + Path.GetExtension(Request.Path);
             var file = segmentId + Path.GetExtension(Request.Path);
             var transcodeFolderPath = _serverConfigurationManager.GetTranscodePath();
             var transcodeFolderPath = _serverConfigurationManager.GetTranscodePath();
 
 
-            file = Path.Combine(transcodeFolderPath, file);
             file = Path.GetFullPath(Path.Combine(transcodeFolderPath, file));
             file = Path.GetFullPath(Path.Combine(transcodeFolderPath, file));
             var fileDir = Path.GetDirectoryName(file);
             var fileDir = Path.GetDirectoryName(file);
             if (string.IsNullOrEmpty(fileDir) || !fileDir.StartsWith(transcodeFolderPath))
             if (string.IsNullOrEmpty(fileDir) || !fileDir.StartsWith(transcodeFolderPath))