Test DoFindFiles as Task, maybe faster... (reverted from commit 091cb83)

punker76 · Sep 27, 2016 · d136935 · d136935
1 parent 091cb83
commit d136935
Showing 1 changed file with 14 additions and 17 deletions.
diff --git a/SimpleMusicPlayer/SimpleMusicPlayer/Core/FileSearchWorker.cs b/SimpleMusicPlayer/SimpleMusicPlayer/Core/FileSearchWorker.cs
@@ -92,7 +92,7 @@ public async Task<IEnumerable<IMediaFile>> StartSearchAsync(IList filesOrDirsCol
 
                   foreach (var rawDir in orderedDirs.TakeWhile(rawDir => !token.IsCancellationRequested))
                   {
-                      this.DoFindFiles(token, rawDir, results).ConfigureAwait(false);
+                      this.DoFindFiles(token, rawDir, results);
                   }
 
                   return results;
@@ -124,28 +124,25 @@ private IEnumerable<string> GetSubFolders(CancellationToken token, string source
             return directories;
         }
 
-        private async Task DoFindFiles(CancellationToken token, string dir, ConcurrentQueue<IMediaFile> results)
+        private void DoFindFiles(CancellationToken token, string dir, ConcurrentQueue<IMediaFile> results)
         {
-            await Task.Run(() =>
+            try
             {
-                try
+                var allFiles = QuickIODirectory.EnumerateFiles(dir, "*", SearchOption.TopDirectoryOnly)
+                                               .Where(f => this.IsAudioFile(f.Name));
+                foreach (var file in allFiles.TakeWhile(rawDir => !token.IsCancellationRequested))
                 {
-                    var allFiles = QuickIODirectory.EnumerateFiles(dir, "*", SearchOption.TopDirectoryOnly)
-                        .Where(f => this.IsAudioFile(f.Name));
-                    foreach (var file in allFiles.TakeWhile(rawDir => !token.IsCancellationRequested))
+                    var mf = this.GetMediaFile(file.FullName);
+                    if (mf != null)
                     {
-                        var mf = this.GetMediaFile(file.FullName);
-                        if (mf != null)
-                        {
-                            results.Enqueue(mf);
-                        }
+                        results.Enqueue(mf);
                     }
                 }
-                catch (Exception exception)
-                {
-                    this.Log().ErrorException("EnumerateFiles", exception);
-                }
-            }, token);
+            }
+            catch (Exception exception)
+            {
+                this.Log().ErrorException("EnumerateFiles", exception);
+            }
         }
 
         private IMediaFile GetMediaFile(string fileName)