From f1b1c7355c5b93dbbbc4141dff66e3a0429c17b6 Mon Sep 17 00:00:00 2001 From: Shadowghost Date: Sat, 2 Mar 2024 11:29:42 +0100 Subject: [PATCH] Cleanup --- Jellyfin.Api/Controllers/AudioController.cs | 3 +- .../Controllers/DynamicHlsController.cs | 30 +++++++++---------- .../Controllers/VideoAttachmentsController.cs | 2 ++ 3 files changed, 17 insertions(+), 18 deletions(-) diff --git a/Jellyfin.Api/Controllers/AudioController.cs b/Jellyfin.Api/Controllers/AudioController.cs index 25941ebbb3..0caa75c98e 100644 --- a/Jellyfin.Api/Controllers/AudioController.cs +++ b/Jellyfin.Api/Controllers/AudioController.cs @@ -17,6 +17,7 @@ namespace Jellyfin.Api.Controllers; /// /// The audio controller. /// +[Authorize(Policy = Policies.Playback)] public class AudioController : BaseJellyfinApiController { private readonly AudioHelper _audioHelper; @@ -88,7 +89,6 @@ public class AudioController : BaseJellyfinApiController /// A containing the audio file. [HttpGet("{itemId}/stream", Name = "GetAudioStream")] [HttpHead("{itemId}/stream", Name = "HeadAudioStream")] - [Authorize(Policy = Policies.Playback)] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesAudioFile] public async Task GetAudioStream( @@ -253,7 +253,6 @@ public class AudioController : BaseJellyfinApiController /// A containing the audio file. [HttpGet("{itemId}/stream.{container}", Name = "GetAudioStreamByContainer")] [HttpHead("{itemId}/stream.{container}", Name = "HeadAudioStreamByContainer")] - [Authorize(Policy = Policies.Playback)] [ProducesResponseType(StatusCodes.Status200OK)] [ProducesAudioFile] public async Task GetAudioStreamByContainer( diff --git a/Jellyfin.Api/Controllers/DynamicHlsController.cs b/Jellyfin.Api/Controllers/DynamicHlsController.cs index 8b895da9ec..af7d745a6c 100644 --- a/Jellyfin.Api/Controllers/DynamicHlsController.cs +++ b/Jellyfin.Api/Controllers/DynamicHlsController.cs @@ -37,16 +37,14 @@ namespace Jellyfin.Api.Controllers; /// /// Dynamic hls controller. /// -[Route("")] [Authorize(Policy = Policies.Playback)] public class DynamicHlsController : BaseJellyfinApiController { private const string DefaultVodEncoderPreset = "veryfast"; private const string DefaultEventEncoderPreset = "superfast"; - private const TranscodingJobType TranscodingJobType = MediaBrowser.Controller.MediaEncoding.TranscodingJobType.Hls; + private const TranscodingJobType DefaultTranscodingJobType = TranscodingJobType.Hls; private readonly Version _minFFmpegFlacInMp4 = new Version(6, 0); - private readonly ILibraryManager _libraryManager; private readonly IUserManager _userManager; private readonly IMediaSourceManager _mediaSourceManager; @@ -286,7 +284,7 @@ public class DynamicHlsController : BaseJellyfinApiController _mediaEncoder, _encodingHelper, _transcodeManager, - TranscodingJobType, + DefaultTranscodingJobType, cancellationToken) .ConfigureAwait(false); @@ -307,7 +305,7 @@ public class DynamicHlsController : BaseJellyfinApiController playlistPath, GetCommandLineArguments(playlistPath, state, true, 0), Request.HttpContext.User.GetUserId(), - TranscodingJobType, + DefaultTranscodingJobType, cancellationTokenSource) .ConfigureAwait(false); job.IsLiveOutput = true; @@ -327,7 +325,7 @@ public class DynamicHlsController : BaseJellyfinApiController } } - job ??= _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType); + job ??= _transcodeManager.OnTranscodeBeginRequest(playlistPath, DefaultTranscodingJobType); if (job is not null) { @@ -509,7 +507,7 @@ public class DynamicHlsController : BaseJellyfinApiController EnableTrickplay = enableTrickplay }; - return await _dynamicHlsHelper.GetMasterHlsPlaylist(TranscodingJobType, streamingRequest, enableAdaptiveBitrateStreaming).ConfigureAwait(false); + return await _dynamicHlsHelper.GetMasterHlsPlaylist(DefaultTranscodingJobType, streamingRequest, enableAdaptiveBitrateStreaming).ConfigureAwait(false); } /// @@ -675,7 +673,7 @@ public class DynamicHlsController : BaseJellyfinApiController EnableAdaptiveBitrateStreaming = enableAdaptiveBitrateStreaming }; - return await _dynamicHlsHelper.GetMasterHlsPlaylist(TranscodingJobType, streamingRequest, enableAdaptiveBitrateStreaming).ConfigureAwait(false); + return await _dynamicHlsHelper.GetMasterHlsPlaylist(DefaultTranscodingJobType, streamingRequest, enableAdaptiveBitrateStreaming).ConfigureAwait(false); } /// @@ -1380,7 +1378,7 @@ public class DynamicHlsController : BaseJellyfinApiController _mediaEncoder, _encodingHelper, _transcodeManager, - TranscodingJobType, + DefaultTranscodingJobType, cancellationTokenSource.Token) .ConfigureAwait(false); @@ -1418,7 +1416,7 @@ public class DynamicHlsController : BaseJellyfinApiController _mediaEncoder, _encodingHelper, _transcodeManager, - TranscodingJobType, + DefaultTranscodingJobType, cancellationToken) .ConfigureAwait(false); @@ -1432,7 +1430,7 @@ public class DynamicHlsController : BaseJellyfinApiController if (System.IO.File.Exists(segmentPath)) { - job = _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType); + job = _transcodeManager.OnTranscodeBeginRequest(playlistPath, DefaultTranscodingJobType); _logger.LogDebug("returning {0} [it exists, try 1]", segmentPath); return await GetSegmentResult(state, playlistPath, segmentPath, segmentExtension, segmentId, job, cancellationToken).ConfigureAwait(false); } @@ -1442,7 +1440,7 @@ public class DynamicHlsController : BaseJellyfinApiController var startTranscoding = false; if (System.IO.File.Exists(segmentPath)) { - job = _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType); + job = _transcodeManager.OnTranscodeBeginRequest(playlistPath, DefaultTranscodingJobType); _logger.LogDebug("returning {0} [it exists, try 2]", segmentPath); return await GetSegmentResult(state, playlistPath, segmentPath, segmentExtension, segmentId, job, cancellationToken).ConfigureAwait(false); } @@ -1493,7 +1491,7 @@ public class DynamicHlsController : BaseJellyfinApiController playlistPath, GetCommandLineArguments(playlistPath, state, false, segmentId), Request.HttpContext.User.GetUserId(), - TranscodingJobType, + DefaultTranscodingJobType, cancellationTokenSource).ConfigureAwait(false); } catch @@ -1506,7 +1504,7 @@ public class DynamicHlsController : BaseJellyfinApiController } else { - job = _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType); + job = _transcodeManager.OnTranscodeBeginRequest(playlistPath, DefaultTranscodingJobType); if (job?.TranscodingThrottler is not null) { await job.TranscodingThrottler.UnpauseTranscoding().ConfigureAwait(false); @@ -1515,7 +1513,7 @@ public class DynamicHlsController : BaseJellyfinApiController } _logger.LogDebug("returning {0} [general case]", segmentPath); - job ??= _transcodeManager.OnTranscodeBeginRequest(playlistPath, TranscodingJobType); + job ??= _transcodeManager.OnTranscodeBeginRequest(playlistPath, DefaultTranscodingJobType); return await GetSegmentResult(state, playlistPath, segmentPath, segmentExtension, segmentId, job, cancellationToken).ConfigureAwait(false); } @@ -1993,7 +1991,7 @@ public class DynamicHlsController : BaseJellyfinApiController private int? GetCurrentTranscodingIndex(string playlist, string segmentExtension) { - var job = _transcodeManager.GetTranscodingJob(playlist, TranscodingJobType); + var job = _transcodeManager.GetTranscodingJob(playlist, DefaultTranscodingJobType); if (job is null || job.HasExited) { diff --git a/Jellyfin.Api/Controllers/VideoAttachmentsController.cs b/Jellyfin.Api/Controllers/VideoAttachmentsController.cs index 23b9ba46f6..3b3e12824c 100644 --- a/Jellyfin.Api/Controllers/VideoAttachmentsController.cs +++ b/Jellyfin.Api/Controllers/VideoAttachmentsController.cs @@ -7,6 +7,7 @@ using Jellyfin.Api.Attributes; using MediaBrowser.Common.Extensions; using MediaBrowser.Controller.Library; using MediaBrowser.Controller.MediaEncoding; +using Microsoft.AspNetCore.Authorization; using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; @@ -16,6 +17,7 @@ namespace Jellyfin.Api.Controllers; /// Attachments controller. /// [Route("Videos")] +[Authorize] public class VideoAttachmentsController : BaseJellyfinApiController { private readonly ILibraryManager _libraryManager;