Browse Source

Update CleanupCollectionPathsTask.cs

Removed code smell and switched to non creation for non existing collection folder
JPVenson 2 years ago
parent
commit
341658b552

+ 4 - 5
Emby.Server.Implementations/ScheduledTasks/Tasks/CleanupCollectionPathsTask.cs

@@ -65,16 +65,16 @@ public class CleanupCollectionPathsTask : IScheduledTask
     /// <inheritdoc />
     /// <inheritdoc />
     public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
     public async Task ExecuteAsync(IProgress<double> progress, CancellationToken cancellationToken)
     {
     {
-        var collectionsFolder = await _collectionManager.GetCollectionsFolder(true).ConfigureAwait(false);
+        var collectionsFolder = await _collectionManager.GetCollectionsFolder(false).ConfigureAwait(false);
         if (collectionsFolder is null)
         if (collectionsFolder is null)
         {
         {
             _logger.LogInformation("There is no collection folder to be found.");
             _logger.LogInformation("There is no collection folder to be found.");
             return;
             return;
         }
         }
 
 
-        var collections = collectionsFolder.Children.OfType<BoxSet>()
-            .ToArray();
+        var collections = collectionsFolder.Children.OfType<BoxSet>().ToArray();
         _logger.LogTrace("Found {CollectionLength} Boxsets.", collections.Length);
         _logger.LogTrace("Found {CollectionLength} Boxsets.", collections.Length);
+        
         for (var index = 0; index < collections.Length; index++)
         for (var index = 0; index < collections.Length; index++)
         {
         {
             var collection = collections[index];
             var collection = collections[index];
@@ -84,7 +84,7 @@ public class CleanupCollectionPathsTask : IScheduledTask
             {
             {
                 if (!File.Exists(collectionLinkedChild.Path))
                 if (!File.Exists(collectionLinkedChild.Path))
                 {
                 {
-                    _logger.LogInformation("Item in boxset {0} cannot be found at {1}.", collection.Name, collectionLinkedChild.Path);
+                    _logger.LogInformation("Item in boxset {CollectionName} cannot be found at {ItemPath}.", collection.Name, collectionLinkedChild.Path);
                     itemsToRemove.Add(collectionLinkedChild);
                     itemsToRemove.Add(collectionLinkedChild);
                 }
                 }
             }
             }
@@ -113,6 +113,5 @@ public class CleanupCollectionPathsTask : IScheduledTask
     public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
     public IEnumerable<TaskTriggerInfo> GetDefaultTriggers()
     {
     {
         return new[] { new TaskTriggerInfo() { Type = TaskTriggerInfo.TriggerStartup } };
         return new[] { new TaskTriggerInfo() { Type = TaskTriggerInfo.TriggerStartup } };
-        // return Enumerable.Empty<TaskTriggerInfo>();
     }
     }
 }
 }