Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-06-23 15:30:56 -04:00
Code Issues Packages Projects Releases Wiki Activity

Apply suggestions from code review

Browse Source 
Add excludeFilePaths to skip segment files in which IOException occurred.

Signed-off-by: nyanmisaka <nst799610810@gmail.com>
This commit is contained in:
nyanmisaka 2024-03-16 22:09:31 +08:00
parent 39b953e41c
commit 50541aea91
1 changed files with 10 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
MediaBrowser.Controller/MediaEncoding/TranscodingSegmentCleaner.cs
View File

@ -23,6 +23,7 @@ public class TranscodingSegmentCleaner : IDisposable
private readonly IMediaEncoder _mediaEncoder; private readonly IMediaEncoder _mediaEncoder;
private Timer? _timer; private Timer? _timer;
private int _segmentLength; private int _segmentLength;
private List<string>? _excludeFilePaths;
/// <summary> /// <summary>
/// Initializes a new instance of the <see cref="TranscodingSegmentCleaner"/> class. /// Initializes a new instance of the <see cref="TranscodingSegmentCleaner"/> class.
@ -41,6 +42,7 @@ public class TranscodingSegmentCleaner : IDisposable
_fileSystem = fileSystem; _fileSystem = fileSystem;
_mediaEncoder = mediaEncoder; _mediaEncoder = mediaEncoder;
_segmentLength = segmentLength; _segmentLength = segmentLength;
_excludeFilePaths = null;
} }
/// <summary> /// <summary>
@ -104,23 +106,18 @@ public class TranscodingSegmentCleaner : IDisposable
if (downloadPositionSeconds > 0 && segmentKeepSeconds > 0 && downloadPositionSeconds > segmentKeepSeconds) if (downloadPositionSeconds > 0 && segmentKeepSeconds > 0 && downloadPositionSeconds > segmentKeepSeconds)
{ {
var idxMaxToRemove = (downloadPositionSeconds - segmentKeepSeconds) / _segmentLength; var idxMaxToDelete = (downloadPositionSeconds - segmentKeepSeconds) / _segmentLength;
if (idxMaxToRemove > 0) if (idxMaxToDelete > 0)
{ {
await DeleteSegmentFiles(_job, 0, idxMaxToRemove, 0, 1500).ConfigureAwait(false); await DeleteSegmentFiles(_job, 0, idxMaxToDelete, 1500).ConfigureAwait(false);
} }
} }
} }
} }
private async Task DeleteSegmentFiles(TranscodingJob job, long idxMin, long idxMax, int retryCount, int delayMs) private async Task DeleteSegmentFiles(TranscodingJob job, long idxMin, long idxMax, int delayMs)
{ {
if (retryCount >= 10)
{
return;
}
var path = job.Path ?? throw new ArgumentException("Path can't be null."); var path = job.Path ?? throw new ArgumentException("Path can't be null.");
_logger.LogDebug("Deleting segment file(s) index {Min} to {Max} from {Path}", idxMin, idxMax, path); _logger.LogDebug("Deleting segment file(s) index {Min} to {Max} from {Path}", idxMin, idxMax, path);
@ -134,12 +131,6 @@ public class TranscodingSegmentCleaner : IDisposable
DeleteHlsSegmentFiles(path, idxMin, idxMax); DeleteHlsSegmentFiles(path, idxMin, idxMax);
} }
} }
catch (IOException ex)
{
_logger.LogError(ex, "Error deleting segment file(s) {Path}", path);
await DeleteSegmentFiles(job, idxMin, idxMax, retryCount + 1, 500).ConfigureAwait(false);
}
catch (Exception ex) catch (Exception ex)
{ {
_logger.LogError(ex, "Error deleting segment file(s) {Path}", path); _logger.LogError(ex, "Error deleting segment file(s) {Path}", path);
@ -154,7 +145,9 @@ public class TranscodingSegmentCleaner : IDisposable
var name = Path.GetFileNameWithoutExtension(outputFilePath); var name = Path.GetFileNameWithoutExtension(outputFilePath);
var filesToDelete = _fileSystem.GetFilePaths(directory) var filesToDelete = _fileSystem.GetFilePaths(directory)
.Where(f => long.TryParse(Path.GetFileNameWithoutExtension(f).Replace(name, string.Empty, StringComparison.Ordinal), out var idx) && idx >= idxMin && idx <= idxMax); .Where(f => (!_excludeFilePaths?.Contains(f) ?? true)
&& long.TryParse(Path.GetFileNameWithoutExtension(f).Replace(name, string.Empty, StringComparison.Ordinal), out var idx)
&& (idx >= idxMin && idx <= idxMax));
List<Exception>? exs = null; List<Exception>? exs = null;
foreach (var file in filesToDelete) foreach (var file in filesToDelete)
@ -167,6 +160,7 @@ public class TranscodingSegmentCleaner : IDisposable
catch (IOException ex) catch (IOException ex)
{ {
(exs ??= new List<Exception>(4)).Add(ex); (exs ??= new List<Exception>(4)).Add(ex);
(_excludeFilePaths ??= new List<string>()).Add(file);
_logger.LogError(ex, "Error deleting HLS segment file {Path}", file); _logger.LogError(ex, "Error deleting HLS segment file {Path}", file);
} }
} }