alteropen/jellyfin
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2026-01-19 09:38:05 +00:00
Code Issues Actions 8 Packages Projects Releases Wiki Activity

Merge pull request #13769 from JPVenson/Bugfix/FixCleanupTaskNotAwaiting
Some checks failed
CodeQL / Analyze (csharp) (push) Has been cancelled
Details
OpenAPI / OpenAPI - HEAD (push) Has been cancelled
Details
OpenAPI / OpenAPI - BASE (push) Has been cancelled
Details
Tests / run-tests (macos-latest) (push) Has been cancelled
Details
Tests / run-tests (ubuntu-latest) (push) Has been cancelled
Details
Tests / run-tests (windows-latest) (push) Has been cancelled
Details
Project Automation / Project board (push) Has been cancelled
Details
Merge Conflict Labeler / Labeling (push) Has been cancelled
Details
OpenAPI / OpenAPI - Difference (push) Has been cancelled
Details
OpenAPI / OpenAPI - Publish Unstable Spec (push) Has been cancelled
Details
OpenAPI / OpenAPI - Publish Stable Spec (push) Has been cancelled
Details

Browse Source 
Fix Cleanup task not awaiting async methods
This commit is contained in:
Niels van Velzen
2025-03-24 19:15:10 +01:00
committed by GitHub
parent 2c0ecd6775 cd5f18a084
commit 035ecbdde3
1 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionAndPlaylistPathsTask.cs
View File

@@ -84,7 +84,7 @@ public class CleanupCollectionAndPlaylistPathsTask : IScheduledTask
var collection = collections[index];
_logger.LogDebug("Checking boxset {CollectionName}", collection.Name);
CleanupLinkedChildren(collection, cancellationToken);
await CleanupLinkedChildrenAsync(collection, cancellationToken).ConfigureAwait(false);
progress.Report(50D / collections.Length * (index + 1));
}
}
@@ -104,12 +104,12 @@ public class CleanupCollectionAndPlaylistPathsTask : IScheduledTask
var playlist = playlists[index];
_logger.LogDebug("Checking playlist {PlaylistName}", playlist.Name);
CleanupLinkedChildren(playlist, cancellationToken);
await CleanupLinkedChildrenAsync(playlist, cancellationToken).ConfigureAwait(false);
progress.Report(50D / playlists.Length * (index + 1));
}
}
private void CleanupLinkedChildren<T>(T folder, CancellationToken cancellationToken)
private async Task CleanupLinkedChildrenAsync<T>(T folder, CancellationToken cancellationToken)
where T : Folder
{
List<LinkedChild>? itemsToRemove = null;
@@ -127,8 +127,8 @@ public class CleanupCollectionAndPlaylistPathsTask : IScheduledTask
{
_logger.LogDebug("Updating {FolderName}", folder.Name);
folder.LinkedChildren = folder.LinkedChildren.Except(itemsToRemove).ToArray();
_providerManager.SaveMetadataAsync(folder, ItemUpdateType.MetadataEdit);
folder.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken);
await _providerManager.SaveMetadataAsync(folder, ItemUpdateType.MetadataEdit).ConfigureAwait(false);
await folder.UpdateToRepositoryAsync(ItemUpdateType.MetadataEdit, cancellationToken).ConfigureAwait(false);
}
}