Feature: Added an option for "smart" extract (files-community#14205)

marcelwgn · Dec 10, 2023 · 3340637 · 3340637
1 parent 0ccf13e
commit 3340637
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 3 deletions.
diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHereSmart.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchiveHereSmart.cs
@@ -0,0 +1,26 @@
+// Copyright (c) 2023 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+namespace Files.App.Actions
+{
+	internal sealed class DecompressArchiveHereSmart : BaseDecompressArchiveAction
+	{
+		public override string Label
+			=> "ExtractHereSmart".GetLocalizedResource();
+
+		public override string Description
+			=> "DecompressArchiveHereSmartDescription".GetLocalizedResource();
+
+		public override HotKey HotKey
+			=> new(Keys.E, KeyModifiers.CtrlShift);
+
+		public DecompressArchiveHereSmart()
+		{
+		}
+
+		public override Task ExecuteAsync()
+		{
+			return DecompressHelper.DecompressArchiveHereAsync(context.ShellPage, true);
+		}
+	}
+}
diff --git a/src/Files.App/Data/Commands/CommandCodes.cs b/src/Files.App/Data/Commands/CommandCodes.cs
@@ -92,6 +92,7 @@ public enum CommandCodes
 		CompressIntoZip,
 		DecompressArchive,
 		DecompressArchiveHere,
+		DecompressArchiveHereSmart,
 		DecompressArchiveToChildFolder,
 
 		// Image Manipulation

diff --git a/src/Files.App/Data/Commands/Manager/CommandManager.cs b/src/Files.App/Data/Commands/Manager/CommandManager.cs
@@ -95,6 +95,7 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand CompressIntoZip => commands[CommandCodes.CompressIntoZip];
 		public IRichCommand DecompressArchive => commands[CommandCodes.DecompressArchive];
 		public IRichCommand DecompressArchiveHere => commands[CommandCodes.DecompressArchiveHere];
+		public IRichCommand DecompressArchiveHereSmart => commands[CommandCodes.DecompressArchiveHereSmart];
 		public IRichCommand DecompressArchiveToChildFolder => commands[CommandCodes.DecompressArchiveToChildFolder];
 		public IRichCommand RotateLeft => commands[CommandCodes.RotateLeft];
 		public IRichCommand RotateRight => commands[CommandCodes.RotateRight];
@@ -259,6 +260,7 @@ public CommandManager()
 			[CommandCodes.CompressIntoZip] = new CompressIntoZipAction(),
 			[CommandCodes.DecompressArchive] = new DecompressArchive(),
 			[CommandCodes.DecompressArchiveHere] = new DecompressArchiveHere(),
+			[CommandCodes.DecompressArchiveHereSmart] = new DecompressArchiveHereSmart(),
 			[CommandCodes.DecompressArchiveToChildFolder] = new DecompressArchiveToChildFolderAction(),
 			[CommandCodes.RotateLeft] = new RotateLeftAction(),
 			[CommandCodes.RotateRight] = new RotateRightAction(),

diff --git a/src/Files.App/Data/Commands/Manager/ICommandManager.cs b/src/Files.App/Data/Commands/Manager/ICommandManager.cs
@@ -81,6 +81,7 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand CompressIntoZip { get; }
 		IRichCommand DecompressArchive { get; }
 		IRichCommand DecompressArchiveHere { get; }
+		IRichCommand DecompressArchiveHereSmart { get; }
 		IRichCommand DecompressArchiveToChildFolder { get; }
 
 		IRichCommand RotateLeft { get; }

diff --git a/src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs b/src/Files.App/Helpers/MenuFlyout/ContextFlyoutItemHelper.cs
@@ -516,6 +516,7 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					Items = new List<ContextMenuFlyoutItemViewModel>
 					{
 						new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchive).Build(),
+						new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveHereSmart).Build(),
 						new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveHere).Build(),
 						new ContextMenuFlyoutItemViewModelBuilder(commands.DecompressArchiveToChildFolder).Build(),
 					},

diff --git a/src/Files.App/Strings/en-US/Resources.resw b/src/Files.App/Strings/en-US/Resources.resw
@@ -3638,4 +3638,10 @@
   <data name="Login" xml:space="preserve">
     <value>Login</value>
   </data>
-</root>
+  <data name="DecompressArchiveHereSmartDescription" xml:space="preserve">
+    <value>Extract items from selected archive(s) to current folder for single-item archive, or to new folder for multi-item archive</value>
+  </data>
+  <data name="ExtractHereSmart" xml:space="preserve">
+    <value>Extract here (Smart)</value>
+  </data>
+</root>
diff --git a/src/Files.App/UserControls/InnerNavigationToolbar.xaml b/src/Files.App/UserControls/InnerNavigationToolbar.xaml
@@ -273,6 +273,13 @@
 								KeyboardAcceleratorTextOverride="{x:Bind Commands.DecompressArchive.HotKeyText, Mode=OneWay}"
 								Text="{x:Bind Commands.DecompressArchive.Label}"
 								Visibility="{x:Bind ViewModel.IsMultipleArchivesSelected, Mode=OneWay, Converter={StaticResource NegatedBoolToVisibilityConverter}}" />
+							<MenuFlyoutItem
+								x:Name="ExtractHereSmart"
+								Command="{x:Bind Commands.DecompressArchiveHereSmart, Mode=OneWay}"
+								IsEnabled="{x:Bind ViewModel.IsSelectionArchivesOnly, Mode=OneWay, FallbackValue=False}"
+								KeyboardAcceleratorTextOverride="{x:Bind Commands.DecompressArchiveHereSmart.HotKeyText, Mode=OneWay}"
+								Text="{x:Bind Commands.DecompressArchiveHereSmart.Label}"
+								Visibility="{x:Bind ViewModel.IsArchiveOpened, Mode=OneWay, Converter={StaticResource NegatedBoolToVisibilityConverter}}" />
 							<MenuFlyoutItem
 								x:Name="ExtractHere"
 								Command="{x:Bind Commands.DecompressArchiveHere, Mode=OneWay}"

diff --git a/src/Files.App/Utils/Archives/DecompressHelper.cs b/src/Files.App/Utils/Archives/DecompressHelper.cs
@@ -175,7 +175,7 @@ public static async Task DecompressArchiveAsync(IShellPage associatedInstance)
 				await NavigationHelpers.OpenPath(destinationFolderPath, associatedInstance, FilesystemItemType.Directory);
 		}
 
-		public static async Task DecompressArchiveHereAsync(IShellPage associatedInstance)
+		public static async Task DecompressArchiveHereAsync(IShellPage associatedInstance, bool smart = false)
 		{
 			if (associatedInstance?.SlimContentPage?.SelectedItems == null)
 				return;
@@ -210,7 +210,13 @@ public static async Task DecompressArchiveHereAsync(IShellPage associatedInstanc
 					password = Encoding.UTF8.GetString(decompressArchiveViewModel.Password);
 				}
 
-				await DecompressArchiveAsync(archive, currentFolder, password);
+				if (smart && currentFolder is not null && await FilesystemTasks.Wrap(() => IsMultipleItems(archive)))
+				{
+					var destinationFolder = await FilesystemTasks.Wrap(() => currentFolder.CreateFolderAsync(Path.GetFileNameWithoutExtension(archive.Path), CreationCollisionOption.GenerateUniqueName).AsTask());
+					await DecompressArchiveAsync(archive, destinationFolder, password);
+				}
+				else
+					await DecompressArchiveAsync(archive, currentFolder, password);
 			}
 		}
 
@@ -274,5 +280,14 @@ private static async Task<bool> IsArchiveEncrypted(BaseStorageFile archive)
 
 			return zipFile.ArchiveFileData.Any(file => file.Encrypted || file.Method.Contains("Crypto") || file.Method.Contains("AES"));
 		}
+
+		private static async Task<bool> IsMultipleItems(BaseStorageFile archive)
+		{
+			using SevenZipExtractor? zipFile = await GetZipFile(archive);
+			if (zipFile is null)
+				return true;
+
+			return zipFile.ArchiveFileData.Count > 1;
+		}
 	}
 }