Fix: Improved the speed graph (#13629)

Author: 0x5bfa

src/Files.App/UserControls/StatusCenter.xaml

@@ -140,7 +140,7 @@
 									Text="{x:Bind Header, Mode=OneWay}"
 									TextTrimming="CharacterEllipsis"
 									TextWrapping="NoWrap"
-									ToolTipService.ToolTip="{x:Bind Header, Mode=OneWay}" />
+									ToolTipService.ToolTip="{x:Bind HeaderTooltip, Mode=OneWay}" />
 
 							</StackPanel>
 
@@ -235,17 +235,30 @@
 								CornerRadius="4"
 								Visibility="{x:Bind IsExpanded, Converter={StaticResource BoolToVisibilityConverter}, Mode=OneWay}">
 
-								<!--  NOTE: The Graph Control Somehow Includes Slight Padding, Which Is Removed By Setting Negative Margin  -->
-								<Grid Margin="-2,0,0,-2">
+								<Grid Padding="-2,-2,-2,-2">
+
+									<!--  Background Fill  -->
 									<livecharts2:CartesianChart
-										x:Name="MainCartesianChart"
+										x:Name="BackgroundCartesianChart"
 										Height="72"
 										VerticalAlignment="Bottom"
 										AnimationsSpeed="00:00:00.001"
+										Series="{x:Bind SpeedGraphBackgroundSeries, Mode=OneWay}"
+										TooltipPosition="Hidden"
+										XAxes="{x:Bind SpeedGraphBackgroundXAxes, Mode=OneWay}"
+										YAxes="{x:Bind SpeedGraphBackgroundYAxes, Mode=OneWay}" />
+
+									<!--  Main Graph  -->
+									<livecharts2:CartesianChart
+										x:Name="MainCartesianChart"
+										Height="48"
+										VerticalAlignment="Bottom"
+										AnimationsSpeed="00:00:00.001"
 										Series="{x:Bind SpeedGraphSeries, Mode=OneWay}"
 										TooltipPosition="Hidden"
 										XAxes="{x:Bind SpeedGraphXAxes, Mode=OneWay}"
 										YAxes="{x:Bind SpeedGraphYAxes, Mode=OneWay}" />
+
 								</Grid>
 
 								<!--  Speed Text  -->

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

@@ -97,7 +97,9 @@ public static async Task CompressArchiveAsync(ICompressArchiveModel creator)
 				StatusCenterHelper.AddCard_Compress(
 					creator.Sources,
 					archivePath.CreateEnumerable(),
-					ReturnResult.Failed,
+					creator.CancellationToken.IsCancellationRequested
+						? ReturnResult.Cancelled
+						: ReturnResult.Failed,
 					creator.Sources.Count());
 			}
 		}

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

@@ -18,32 +18,15 @@ public static class DecompressHelper
 
 		private static IThreadingService _threadingService = Ioc.Default.GetRequiredService<IThreadingService>();
 
-		private static async Task<SevenZipExtractor?> GetZipFile(BaseStorageFile archive, string password = "")
-		{
-			return await FilesystemTasks.Wrap(async () =>
-			{
-				var arch = new SevenZipExtractor(await archive.OpenStreamForReadAsync(), password);
-				return arch?.ArchiveFileData is null ? null : arch; // Force load archive (1665013614u)
-			});
-		}
-
-		public static async Task<bool> IsArchiveEncrypted(BaseStorageFile archive)
-		{
-			using SevenZipExtractor? zipFile = await GetZipFile(archive);
-			if (zipFile is null)
-				return true;
-
-			return zipFile.ArchiveFileData.Any(file => file.Encrypted || file.Method.Contains("Crypto") || file.Method.Contains("AES"));
-		}
-
-		public static async Task ExtractArchiveAsync(BaseStorageFile archive, BaseStorageFolder destinationFolder, string password, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
+		public static async Task<bool> DecompressArchiveAsync(BaseStorageFile archive, BaseStorageFolder destinationFolder, string password, IProgress<StatusCenterItemProgressModel> progress, CancellationToken cancellationToken)
 		{
 			using SevenZipExtractor? zipFile = await GetZipFile(archive, password);
 			if (zipFile is null)
-				return;
+				return false;
 
-			if (cancellationToken.IsCancellationRequested) // Check if canceled
-				return;
+			// Check if the decompress operation canceled
+			if (cancellationToken.IsCancellationRequested)
+				return false;
 
 			// Fill files
 
@@ -88,34 +71,55 @@ public static async Task ExtractArchiveAsync(BaseStorageFile archive, BaseStorag
 
 			try
 			{
+				// TODO: Get this method return result
 				await zipFile.ExtractArchiveAsync(destinationFolder.Path);
 			}
 			catch (Exception ex)
 			{
 				App.Logger.LogWarning(ex, $"Error extracting file: {archive.Name}");
-				return; // TODO: handle error
+
+				return false;
 			}
+
+			return true;
 		}
 
-		private static async Task ExtractArchiveAsync(BaseStorageFile archive, BaseStorageFolder? destinationFolder, string password)
+		private static async Task DecompressArchiveAsync(BaseStorageFile archive, BaseStorageFolder? destinationFolder, string password)
 		{
 			if (archive is null || destinationFolder is null)
 				return;
 
-			var banner = StatusCenterHelper.AddCard_Decompress(
+			// Initialize a new in-progress status card
+			var statusCard = StatusCenterHelper.AddCard_Decompress(
 				archive.Path.CreateEnumerable(),
 				destinationFolder.Path.CreateEnumerable(),
 				ReturnResult.InProgress);
 
-			await FilesystemTasks.Wrap(() =>
-				ExtractArchiveAsync(archive, destinationFolder, password, banner.ProgressEventSource, banner.CancellationToken));
+			// Operate decompress
+			var result = await FilesystemTasks.Wrap(() =>
+				DecompressArchiveAsync(archive, destinationFolder, password, statusCard.ProgressEventSource, statusCard.CancellationToken));
 
-			_statusCenterViewModel.RemoveItem(banner);
+			// Remove the in-progress status card
+			_statusCenterViewModel.RemoveItem(statusCard);
 
-			StatusCenterHelper.AddCard_Decompress(
-				archive.Path.CreateEnumerable(),
-				destinationFolder.Path.CreateEnumerable(),
-				ReturnResult.Success);
+			if (result.Result)
+			{
+				// Successful
+				StatusCenterHelper.AddCard_Decompress(
+					archive.Path.CreateEnumerable(),
+					destinationFolder.Path.CreateEnumerable(),
+					ReturnResult.Success);
+			}
+			else
+			{
+				// Error
+				StatusCenterHelper.AddCard_Decompress(
+					archive.Path.CreateEnumerable(),
+					destinationFolder.Path.CreateEnumerable(),
+					statusCard.CancellationToken.IsCancellationRequested
+						? ReturnResult.Cancelled
+						: ReturnResult.Failed);
+			}
 		}
 
 		public static async Task DecompressArchiveAsync(IShellPage associatedInstance)
@@ -161,7 +165,7 @@ public static async Task DecompressArchiveAsync(IShellPage associatedInstance)
 				destinationFolder = await FilesystemTasks.Wrap(() => parentFolder.CreateFolderAsync(Path.GetFileName(destinationFolderPath), CreationCollisionOption.GenerateUniqueName).AsTask());
 			}
 
-			await ExtractArchiveAsync(archive, destinationFolder, password);
+			await DecompressArchiveAsync(archive, destinationFolder, password);
 
 			if (decompressArchiveViewModel.OpenDestinationFolderOnCompletion)
 				await NavigationHelpers.OpenPath(destinationFolderPath, associatedInstance, FilesystemItemType.Directory);
@@ -199,7 +203,7 @@ public static async Task DecompressArchiveHereAsync(IShellPage associatedInstanc
 					password = Encoding.UTF8.GetString(decompressArchiveViewModel.Password);
 				}
 
-				await ExtractArchiveAsync(archive, currentFolder, password);
+				await DecompressArchiveAsync(archive, currentFolder, password);
 			}
 		}
 
@@ -239,8 +243,26 @@ public static async Task DecompressArchiveToChildFolderAsync(IShellPage associat
 				if (currentFolder is not null)
 					destinationFolder = await FilesystemTasks.Wrap(() => currentFolder.CreateFolderAsync(Path.GetFileNameWithoutExtension(archive.Path), CreationCollisionOption.GenerateUniqueName).AsTask());
 
-				await ExtractArchiveAsync(archive, destinationFolder, password);
+				await DecompressArchiveAsync(archive, destinationFolder, password);
 			}
 		}
+
+		private static async Task<SevenZipExtractor?> GetZipFile(BaseStorageFile archive, string password = "")
+		{
+			return await FilesystemTasks.Wrap(async () =>
+			{
+				var arch = new SevenZipExtractor(await archive.OpenStreamForReadAsync(), password);
+				return arch?.ArchiveFileData is null ? null : arch; // Force load archive (1665013614u)
+			});
+		}
+
+		private static async Task<bool> IsArchiveEncrypted(BaseStorageFile archive)
+		{
+			using SevenZipExtractor? zipFile = await GetZipFile(archive);
+			if (zipFile is null)
+				return true;
+
+			return zipFile.ArchiveFileData.Any(file => file.Encrypted || file.Method.Contains("Crypto") || file.Method.Contains("AES"));
+		}
 	}
 }

src/Files.App/Utils/StatusCenter/StatusCenterHelper.cs

@@ -512,7 +512,7 @@ public static void UpdateCardStrings(StatusCenterItem card)
 			if (card.Destination is not null && card.Destination.Any())
 			{
 				destinationPath = PathNormalization.GetParentDir(card.Destination.First());
-				destinationDirName = card.Destination.First().Split('\\').Last();
+				destinationDirName = destinationPath.Split('\\').Last();
 			}
 
 			string headerString = string.IsNullOrWhiteSpace(card.HeaderStringResource) ? string.Empty : card.HeaderStringResource.GetLocalizedResource();