From 4e23b84999ffbdcf48fb8e8487023ea9929962c9 Mon Sep 17 00:00:00 2001
From: James Hood <james_hood@leco.com>
Date: Fri, 21 Jul 2023 13:17:42 -0400
Subject: [PATCH] Remove Task aspect

---
 .../Archives/IArchiveExtensions.cs            | 71 +++++++++----------
 1 file changed, 35 insertions(+), 36 deletions(-)

diff --git a/src/SharpCompress/Archives/IArchiveExtensions.cs b/src/SharpCompress/Archives/IArchiveExtensions.cs
index 51e07693..2a504b39 100644
--- a/src/SharpCompress/Archives/IArchiveExtensions.cs
+++ b/src/SharpCompress/Archives/IArchiveExtensions.cs
@@ -26,54 +26,53 @@ public static class IArchiveExtensions
     }
 
     /// <summary>
-    /// Extracts the archive to the destination directory in the thread pool. Directories will be created as needed.
+    /// Extracts the archive to the destination directory. Directories will be created as needed.
     /// </summary>
     /// <param name="archive">The archive to extract.</param>
     /// <param name="destination">The folder to extract into.</param>
     /// <param name="progressReport">Optional progress report callback.</param>
-    /// <param name="cancellationToken">Optional cancellation token</param>
-    public static Task ExtractToDirectoryAsync(
+    /// <param name="cancellationToken">Optional cancellation token.</param>
+    public static void ExtractToDirectory(
         this IArchive archive,
         string destination,
         Action<double>? progressReport = null,
         CancellationToken cancellationToken = default
-    ) => Task.Run(() =>
-                  {
-                      // Prepare for progress reporting
-                      var totalBytes = archive.TotalUncompressSize;
-                      var bytesRead = 0L;
+    )
+    {
+        // Prepare for progress reporting
+        var totalBytes = archive.TotalUncompressSize;
+        var bytesRead = 0L;
 
-                      // Tracking for created directories.
-                      var seenDirectories = new HashSet<string>();
+        // Tracking for created directories.
+        var seenDirectories = new HashSet<string>();
 
-                      // Extract
-                      var entries = archive.ExtractAllEntries();
-                      while (entries.MoveToNextEntry())
-                      {
-                          cancellationToken.ThrowIfCancellationRequested();
+        // Extract
+        var entries = archive.ExtractAllEntries();
+        while (entries.MoveToNextEntry())
+        {
+            cancellationToken.ThrowIfCancellationRequested();
 
-                          var entry = entries.Entry;
-                          if (entry.IsDirectory)
-                          {
-                              continue;
-                          }
+            var entry = entries.Entry;
+            if (entry.IsDirectory)
+            {
+                continue;
+            }
 
-                          // Create each directory
-                          var path = Path.Combine(destination, entry.Key);
-                          if (Path.GetDirectoryName(path) is { } directory
-                              && seenDirectories.Add(path))
-                          {
-                              Directory.CreateDirectory(directory);
-                          }
+            // Create each directory
+            var path = Path.Combine(destination, entry.Key);
+            if (Path.GetDirectoryName(path) is { } directory
+                && seenDirectories.Add(path))
+            {
+                Directory.CreateDirectory(directory);
+            }
 
-                          // Write file
-                          using var fs = File.OpenWrite(path);
-                          entries.WriteEntryTo(fs); // TODO: Some day, this may be async.
+            // Write file
+            using var fs = File.OpenWrite(path);
+            entries.WriteEntryTo(fs);
 
-                          // Update progress
-                          bytesRead += entry.Size;
-                          progressReport?.Invoke(bytesRead / (double)totalBytes);
-                      }
-                  },
-                  cancellationToken);
+            // Update progress
+            bytesRead += entry.Size;
+            progressReport?.Invoke(bytesRead / (double)totalBytes);
+        }
+    }
 }