Browse Source

Simplify HLS file deletion

Co-authored-by: Claus Vium <cvium@users.noreply.github.com>
Dominik 2 years ago
parent
commit
abcf9c4819
1 changed files with 3 additions and 10 deletions
  1. 3 10
      Jellyfin.Api/Controllers/DynamicHlsController.cs

+ 3 - 10
Jellyfin.Api/Controllers/DynamicHlsController.cs

@@ -1503,17 +1503,10 @@ namespace Jellyfin.Api.Controllers
                         // If the playlist doesn't already exist, startup ffmpeg
                         try
                         {
-                            if (_encodingOptions.EnableThrottling && _encodingOptions.EnableSegmentDeletion)
-                            {
-                                // Delete old HLS files when segment deletion is active since ffmpeg doesn't clean them up by itself
-                                await _transcodingJobHelper.KillTranscodingJobs(streamingRequest.DeviceId, streamingRequest.PlaySessionId, p => true)
+                            // Delete old HLS files when segment deletion is active since ffmpeg doesn't clean them up by itself
+                            var deleteFiles = _encodingOptions.EnableThrottling && _encodingOptions.EnableSegmentDeletion;
+                            await _transcodingJobHelper.KillTranscodingJobs(streamingRequest.DeviceId, streamingRequest.PlaySessionId, _ => deleteFiles)
                                 .ConfigureAwait(false);
-                            }
-                            else
-                            {
-                                await _transcodingJobHelper.KillTranscodingJobs(streamingRequest.DeviceId, streamingRequest.PlaySessionId, p => false)
-                                    .ConfigureAwait(false);
-                            }
 
                             if (currentTranscodingIndex.HasValue)
                             {