Cutlery/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-05-31 20:24:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Clean up synchronization (#11458)

Browse Source
This commit is contained in:
Mark Cilia Vincenti 2024-05-06 03:21:54 +02:00 committed by GitHub
parent 688a734895
commit af74aa35d7
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 10 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
MediaBrowser.MediaEncoding/Attachments/AttachmentExtractor.cs
View File

@ -247,7 +247,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
MediaSourceInfo mediaSource, MediaSourceInfo mediaSource,
CancellationToken cancellationToken) CancellationToken cancellationToken)
{ {
var outputFileLocks = new List<AsyncKeyedLockReleaser<string>>(); var outputFileLocks = new List<IDisposable>();
var extractableAttachmentIds = new List<int>(); var extractableAttachmentIds = new List<int>();
try try
@ -256,16 +256,15 @@ namespace MediaBrowser.MediaEncoding.Attachments
{ {
var outputPath = GetAttachmentCachePath(mediaPath, mediaSource, attachment.Index); var outputPath = GetAttachmentCachePath(mediaPath, mediaSource, attachment.Index);
var @outputFileLock = _semaphoreLocks.GetOrAdd(outputPath); var releaser = await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false);
await @outputFileLock.SemaphoreSlim.WaitAsync(cancellationToken).ConfigureAwait(false);
if (File.Exists(outputPath)) if (File.Exists(outputPath))
{ {
@outputFileLock.Dispose(); releaser.Dispose();
continue; continue;
} }
outputFileLocks.Add(@outputFileLock); outputFileLocks.Add(releaser);
extractableAttachmentIds.Add(attachment.Index); extractableAttachmentIds.Add(attachment.Index);
} }
@ -280,10 +279,7 @@ namespace MediaBrowser.MediaEncoding.Attachments
} }
finally finally
{ {
foreach (var @outputFileLock in outputFileLocks) outputFileLocks.ForEach(x => x.Dispose());
{
@outputFileLock.Dispose();
}
} }
} }

14
MediaBrowser.MediaEncoding/Subtitles/SubtitleEncoder.cs
View File

@ -457,7 +457,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
/// <returns>Task.</returns> /// <returns>Task.</returns>
private async Task ExtractAllTextSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken) private async Task ExtractAllTextSubtitles(MediaSourceInfo mediaSource, CancellationToken cancellationToken)
{ {
var locks = new List<AsyncKeyedLockReleaser<string>>(); var locks = new List<IDisposable>();
var extractableStreams = new List<MediaStream>(); var extractableStreams = new List<MediaStream>();
try try
@ -469,16 +469,15 @@ namespace MediaBrowser.MediaEncoding.Subtitles
{ {
var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + GetTextSubtitleFormat(subtitleStream)); var outputPath = GetSubtitleCachePath(mediaSource, subtitleStream.Index, "." + GetTextSubtitleFormat(subtitleStream));
var @lock = _semaphoreLocks.GetOrAdd(outputPath); var releaser = await _semaphoreLocks.LockAsync(outputPath, cancellationToken).ConfigureAwait(false);
await @lock.SemaphoreSlim.WaitAsync(cancellationToken).ConfigureAwait(false);
if (File.Exists(outputPath)) if (File.Exists(outputPath))
{ {
@lock.Dispose(); releaser.Dispose();
continue; continue;
} }
locks.Add(@lock); locks.Add(releaser);
extractableStreams.Add(subtitleStream); extractableStreams.Add(subtitleStream);
} }
@ -493,10 +492,7 @@ namespace MediaBrowser.MediaEncoding.Subtitles
} }
finally finally
{ {
foreach (var @lock in locks) locks.ForEach(x => x.Dispose());
{
@lock.Dispose();
}
} }
} }