starred/jellyfin-jellyfin-1
1
0
Fork 0
mirror of https://github.com/jellyfin/jellyfin.git synced 2025-12-17 06:23:03 +03:00
Code Issues Packages Projects Releases Wiki Activity

Remove nullable, add async task

Browse Source
This commit is contained in:
crobibero
2020-06-18 07:11:46 -06:00
parent 116284fe99
commit 9a51f484af
21 changed files with 19 additions and 60 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
Jellyfin.Api/Controllers/LibraryStructureController.cs
View File

@@ -1,4 +1,3 @@
#nullable enable
#pragma warning disable CA1801
using System;
@@ -175,20 +174,18 @@ namespace Jellyfin.Api.Controllers
{
CollectionFolder.OnCollectionFolderChange();
Task.Run(() =>
Task.Run(async () =>
{
// No need to start if scanning the library because it will handle it
if (refreshLibrary)
{
_libraryManager.ValidateMediaLibrary(new SimpleProgress<double>(), CancellationToken.None);
await _libraryManager.ValidateMediaLibrary(new SimpleProgress<double>(), CancellationToken.None).ConfigureAwait(false);
}
else
{
// Need to add a delay here or directory watchers may still pick up the changes
var task = Task.Delay(1000);
// Have to block here to allow exceptions to bubble
Task.WaitAll(task);
await Task.Delay(1000).ConfigureAwait(false);
_libraryMonitor.Start();
}
});
@@ -230,20 +227,18 @@ namespace Jellyfin.Api.Controllers
}
finally
{
Task.Run(() =>
Task.Run(async () =>
{
// No need to start if scanning the library because it will handle it
if (refreshLibrary)
{
_libraryManager.ValidateMediaLibrary(new SimpleProgress<double>(), CancellationToken.None);
await _libraryManager.ValidateMediaLibrary(new SimpleProgress<double>(), CancellationToken.None).ConfigureAwait(false);
}
else
{
// Need to add a delay here or directory watchers may still pick up the changes
var task = Task.Delay(1000);
// Have to block here to allow exceptions to bubble
Task.WaitAll(task);
await Task.Delay(1000).ConfigureAwait(false);
_libraryMonitor.Start();
}
});
@@ -304,20 +299,18 @@ namespace Jellyfin.Api.Controllers
}
finally
{
Task.Run(() =>
Task.Run(async () =>
{
// No need to start if scanning the library because it will handle it
if (refreshLibrary)
{
_libraryManager.ValidateMediaLibrary(new SimpleProgress<double>(), CancellationToken.None);
await _libraryManager.ValidateMediaLibrary(new SimpleProgress<double>(), CancellationToken.None).ConfigureAwait(false);
}
else
{
// Need to add a delay here or directory watchers may still pick up the changes
var task = Task.Delay(1000);
// Have to block here to allow exceptions to bubble
Task.WaitAll(task);
await Task.Delay(1000).ConfigureAwait(false);
_libraryMonitor.Start();
}
});