Fix cancellation of compression & extraction (#14)

Author: gave92

src/Files.App/Files.App.csproj

@@ -83,7 +83,7 @@
         <PackageReference Include="Microsoft.Extensions.Hosting" Version="7.0.1" />
         <PackageReference Include="Microsoft.Extensions.Logging" Version="7.0.0" />
         <PackageReference Include="Microsoft.Windows.SDK.BuildTools" Version="10.0.22621.756" />
-        <PackageReference Include="SevenZipSharp" Version="1.0.1" />
+        <PackageReference Include="SevenZipSharp" Version="1.0.2" />
         <PackageReference Include="SQLitePCLRaw.bundle_green" Version="2.1.6" />
         <PackageReference Include="Microsoft.WindowsAppSDK" Version="1.4.231008000" />
         <PackageReference Include="Microsoft.Graphics.Win2D" Version="1.1.0" />

src/Files.App/Utils/Archives/CompressArchiveModel.cs

@@ -17,6 +17,8 @@ public class CompressArchiveModel : ICompressArchiveModel
 
 		private FileSizeCalculator _sizeCalculator;
 
+		private IThreadingService _threadingService = Ioc.Default.GetRequiredService<IThreadingService>();
+
 		private string ArchiveExtension => FileFormat switch
 		{
 			ArchiveFormats.Zip => ".zip",
@@ -147,7 +149,6 @@ public async Task<bool> RunCreationAsync()
 				IncludeEmptyDirectories = true,
 				EncryptHeaders = true,
 				PreserveDirectoryRoot = sources.Length > 1,
-				EventSynchronization = EventSynchronizationStrategy.AlwaysAsynchronous,
 			};
 
 			compressor.Compressing += Compressor_Compressing;
@@ -207,8 +208,11 @@ private void Compressor_FileCompressionStarted(object? sender, FileNameEventArgs
 				e.Cancel = true;
 			else
 				_sizeCalculator.ForceComputeFileSize(e.FilePath);
-			_fileSystemProgress.FileName = e.FileName;
-			_fileSystemProgress.Report();
+			_threadingService.ExecuteOnUiThreadAsync(() =>
+			{
+				_fileSystemProgress.FileName = e.FileName;
+				_fileSystemProgress.Report();
+			});
 		}
 
 		private void Compressor_FileCompressionFinished(object? sender, EventArgs e)

src/Files.App/Utils/Archives/DecompressHelper.cs

@@ -16,6 +16,8 @@ public static class DecompressHelper
 	{
 		private readonly static StatusCenterViewModel _statusCenterViewModel = Ioc.Default.GetRequiredService<StatusCenterViewModel>();
 
+		private static IThreadingService _threadingService = Ioc.Default.GetRequiredService<IThreadingService>();
+
 		private static async Task<SevenZipExtractor?> GetZipFile(BaseStorageFile archive, string password = "")
 		{
 			return await FilesystemTasks.Wrap(async () =>
@@ -40,57 +42,13 @@ public static async Task ExtractArchiveAsync(BaseStorageFile archive, BaseStorag
 			if (zipFile is null)
 				return;
 
-			var directoryEntries = new List<ArchiveFileInfo>();
-			var fileEntries = new List<ArchiveFileInfo>();
-			foreach (ArchiveFileInfo entry in zipFile.ArchiveFileData)
-			{
-				if (!entry.IsDirectory)
-					fileEntries.Add(entry);
-				else
-					directoryEntries.Add(entry);
-			}
-
-			if (cancellationToken.IsCancellationRequested) // Check if cancelled
-				return;
-
-			var directories = new List<string>();
-			try
-			{
-				directories.AddRange(directoryEntries.Select((entry) => entry.FileName));
-				directories.AddRange(fileEntries.Select((entry) => Path.GetDirectoryName(entry.FileName)));
-			}
-			catch (Exception ex)
-			{
-				App.Logger.LogWarning(ex, $"Error transforming zip names into: {destinationFolder.Path}\n" +
-					$"Directories: {string.Join(", ", directoryEntries.Select(x => x.FileName))}\n" +
-					$"Files: {string.Join(", ", fileEntries.Select(x => x.FileName))}");
-				return;
-			}
-
-			foreach (var dir in directories.Distinct().OrderBy(x => x.Length))
-			{
-				if (!NativeFileOperationsHelper.CreateDirectoryFromApp(dir, IntPtr.Zero))
-				{
-					var dirName = destinationFolder.Path;
-					foreach (var component in dir.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries))
-					{
-						dirName = Path.Combine(dirName, component);
-						NativeFileOperationsHelper.CreateDirectoryFromApp(dirName, IntPtr.Zero);
-					}
-				}
-
-				if (cancellationToken.IsCancellationRequested) // Check if canceled
-					return;
-			}
-
 			if (cancellationToken.IsCancellationRequested) // Check if canceled
 				return;
 
 			// Fill files
 
 			byte[] buffer = new byte[4096];
-			int entriesAmount = fileEntries.Count;
-			var minimumTime = new DateTime(1);
+			int entriesAmount = zipFile.ArchiveFileData.Where(x => !x.IsDirectory).Count();
 
 			StatusCenterItemProgressModel fsProgress = new(
 				progress,
@@ -104,47 +62,38 @@ public static async Task ExtractArchiveAsync(BaseStorageFile archive, BaseStorag
 			zipFile.Extracting += (s, e) =>
 			{
 				if (fsProgress.TotalSize > 0)
-					fsProgress.Report((fsProgress.ProcessedSize + e.PercentDelta / 100.0 * e.BytesCount) / fsProgress.TotalSize * 100);
+					fsProgress.Report(e.BytesProcessed / (double)fsProgress.TotalSize * 100);
 			};
-
-			foreach (var entry in fileEntries)
+			zipFile.FileExtractionStarted += (s, e) =>
 			{
-				if (cancellationToken.IsCancellationRequested) // Check if canceled
-					return;
-
-				var filePath = destinationFolder.Path;
-				foreach (var component in entry.FileName.Split(Path.DirectorySeparatorChar, StringSplitOptions.RemoveEmptyEntries | StringSplitOptions.TrimEntries))
-					filePath = Path.Combine(filePath, component);
-
-				var hFile = NativeFileOperationsHelper.CreateFileForWrite(filePath);
-				if (hFile.IsInvalid)
-					return; // TODO: handle error
-
-				fsProgress.FileName = entry.FileName;
-				fsProgress.Report();
-
-				// We don't close hFile because FileStream.Dispose() already does that
-				using (FileStream destinationStream = new FileStream(hFile, FileAccess.Write))
+				if (cancellationToken.IsCancellationRequested)
+					e.Cancel = true;
+				if (!e.FileInfo.IsDirectory)
 				{
-					try
+					_threadingService.ExecuteOnUiThreadAsync(() =>
 					{
-						await zipFile.ExtractFileAsync(entry.Index, destinationStream);
-					}
-					catch (Exception ex)
-					{
-						App.Logger.LogWarning(ex, $"Error extracting file: {filePath}");
-						return; // TODO: handle error
-					}
+						fsProgress.FileName = e.FileInfo.FileName;
+						fsProgress.Report();
+					});
 				}
-
-				_ = new FileInfo(filePath)
+			};
+			zipFile.FileExtractionFinished += (s, e) =>
+			{
+				if (!e.FileInfo.IsDirectory)
 				{
-					CreationTime = entry.CreationTime > minimumTime && entry.CreationTime < entry.LastWriteTime ? entry.CreationTime : entry.LastWriteTime,
-					LastWriteTime = entry.LastWriteTime,
-				};
+					fsProgress.AddProcessedItemsCount(1);
+					fsProgress.Report();
+				}
+			};
 
-				fsProgress.AddProcessedItemsCount(1);
-				fsProgress.Report();
+			try
+			{
+				await zipFile.ExtractArchiveAsync(destinationFolder.Path);
+			}
+			catch (Exception ex)
+			{
+				App.Logger.LogWarning(ex, $"Error extracting file: {archive.Name}");
+				return; // TODO: handle error
 			}
 		}