From 6d4fbd3ac272b6aca2b4f1ba87ef9647f0e20066 Mon Sep 17 00:00:00 2001
From: Yair <39923744+yaira2@users.noreply.github.com>
Date: Sun, 19 Oct 2025 16:59:52 -0400
Subject: [PATCH] Save extraction paths

---
 .../Archives/Decompress/DecompressArchive.cs  |  17 +++
 .../Data/Contracts/IGeneralSettingsService.cs |   5 +
 .../Dialogs/DecompressArchiveDialog.xaml      |   8 +-
 .../Dialogs/DecompressArchiveDialog.xaml.cs   |   8 ++
 .../Settings/GeneralSettingsService.cs        |   6 +
 .../Services/Settings/UserSettingsService.cs  |   1 +
 .../DecompressArchiveDialogViewModel.cs       | 111 ++++++++++++++----
 7 files changed, 130 insertions(+), 26 deletions(-)

diff --git a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs
index 3cbfbea3b828..c9e21127950e 100644
--- a/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs
+++ b/src/Files.App/Actions/Content/Archives/Decompress/DecompressArchive.cs
@@ -14,6 +14,8 @@ namespace Files.App.Actions
 	[GeneratedRichCommand]
 	internal sealed partial class DecompressArchiveAction : BaseDecompressArchiveAction
 	{
+		private readonly IUserSettingsService UserSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
+
 		public override string Label
 			=> Strings.ExtractFiles.GetLocalizedResource();
 
@@ -81,6 +83,9 @@ public override async Task ExecuteAsync(object? parameter = null)
 			BaseStorageFolder destinationFolder = decompressArchiveViewModel.DestinationFolder;
 			string destinationFolderPath = decompressArchiveViewModel.DestinationFolderPath;
 
+			// Save extraction location for future use
+			SaveExtractionLocation(destinationFolderPath);
+
 			if (destinationFolder is null)
 			{
 				BaseStorageFolder parentFolder = await StorageHelpers.ToStorageItem<BaseStorageFolder>(Path.GetDirectoryName(archive.Path) ?? string.Empty);
@@ -119,5 +124,17 @@ protected override bool CanDecompressSelectedItems()
 
 			return null;
 		}
+
+		private void SaveExtractionLocation(string path)
+		{
+			var previousArchiveExtractionLocations = UserSettingsService.GeneralSettingsService.PreviousArchiveExtractionLocations?.ToList() ?? [];
+			previousArchiveExtractionLocations.Remove(path);
+			previousArchiveExtractionLocations.Insert(0, path);
+
+			if (previousArchiveExtractionLocations.Count > 10)
+				UserSettingsService.GeneralSettingsService.PreviousArchiveExtractionLocations = previousArchiveExtractionLocations.RemoveFrom(11);
+			else
+				UserSettingsService.GeneralSettingsService.PreviousArchiveExtractionLocations = previousArchiveExtractionLocations;
+		}
 	}
 }
diff --git a/src/Files.App/Data/Contracts/IGeneralSettingsService.cs b/src/Files.App/Data/Contracts/IGeneralSettingsService.cs
index 068f4f088fda..ff069961403a 100644
--- a/src/Files.App/Data/Contracts/IGeneralSettingsService.cs
+++ b/src/Files.App/Data/Contracts/IGeneralSettingsService.cs
@@ -55,6 +55,11 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		List<string> PreviousSearchQueriesList { get; set; }
 
+		/// <summary>
+		/// Stores list of paths where archives have previously been extracted.
+		/// </summary>
+		List<string> PreviousArchiveExtractionLocations { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating which date and time format to use.
 		/// </summary>
diff --git a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml
index 732f04e7072d..2d09b523720b 100644
--- a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml
+++ b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml
@@ -12,6 +12,7 @@
 	CornerRadius="{StaticResource OverlayCornerRadius}"
 	DefaultButton="Primary"
 	HighContrastAdjustment="None"
+	IsPrimaryButtonEnabled="{x:Bind ViewModel.IsDestinationPathValid, Mode=OneWay}"
 	PrimaryButtonClick="ContentDialog_PrimaryButtonClick"
 	PrimaryButtonText="{helpers:ResourceString Name=Extract}"
 	RequestedTheme="{x:Bind RootAppElement.RequestedTheme, Mode=OneWay}"
@@ -44,13 +45,14 @@
 					Text="{helpers:ResourceString Name=ExtractToPath}" />
 
 				<!--  Path Box  -->
-				<TextBox
+				<AutoSuggestBox
 					x:Name="DestinationFolderPath"
 					Grid.Row="1"
 					Grid.Column="0"
 					HorizontalAlignment="Stretch"
-					IsReadOnly="True"
-					Text="{x:Bind ViewModel.DestinationFolderPath, Mode=OneWay}" />
+					ItemsSource="{x:Bind ViewModel.PreviousExtractionLocations, Mode=OneWay}"
+					Text="{x:Bind ViewModel.DestinationFolderPath, Mode=TwoWay, UpdateSourceTrigger=PropertyChanged}"
+					TextChanged="DestinationFolderPath_TextChanged" />
 
 				<Button
 					x:Name="SelectDestination"
diff --git a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs
index 6f260b9325a9..be2caabecdcf 100644
--- a/src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs
+++ b/src/Files.App/Dialogs/DecompressArchiveDialog.xaml.cs
@@ -28,5 +28,13 @@ private void ContentDialog_PrimaryButtonClick(ContentDialog sender, ContentDialo
 			if (ViewModel.IsArchiveEncrypted)
 				ViewModel.PrimaryButtonClickCommand.Execute(new DisposableArray(Encoding.UTF8.GetBytes(Password.Password)));
 		}
+
+		private void DestinationFolderPath_TextChanged(AutoSuggestBox sender, AutoSuggestBoxTextChangedEventArgs args)
+		{
+			if (args.Reason == AutoSuggestionBoxTextChangeReason.UserInput)
+			{
+				ViewModel.UpdateSuggestions(sender.Text);
+			}
+		}
 	}
 }
diff --git a/src/Files.App/Services/Settings/GeneralSettingsService.cs b/src/Files.App/Services/Settings/GeneralSettingsService.cs
index 9c3d0e157d72..938187ee6b18 100644
--- a/src/Files.App/Services/Settings/GeneralSettingsService.cs
+++ b/src/Files.App/Services/Settings/GeneralSettingsService.cs
@@ -71,6 +71,12 @@ public List<string> PreviousSearchQueriesList
 			set => Set(value);
 		}
 
+		public List<string> PreviousArchiveExtractionLocations
+		{
+			get => Get<List<string>>(null);
+			set => Set(value);
+		}
+
 		public DateTimeFormats DateTimeFormat
 		{
 			get => Get(DateTimeFormats.Application);
diff --git a/src/Files.App/Services/Settings/UserSettingsService.cs b/src/Files.App/Services/Settings/UserSettingsService.cs
index 590bb6bf8ae5..3de250b54c77 100644
--- a/src/Files.App/Services/Settings/UserSettingsService.cs
+++ b/src/Files.App/Services/Settings/UserSettingsService.cs
@@ -70,6 +70,7 @@ public override object ExportSettings()
 			export.Remove(nameof(GeneralSettingsService.LastCrashedTabList));
 			export.Remove(nameof(GeneralSettingsService.PathHistoryList));
 			export.Remove(nameof(GeneralSettingsService.PreviousSearchQueriesList));
+			export.Remove(nameof(GeneralSettingsService.PreviousArchiveExtractionLocations));
 
 			return JsonSettingsSerializer.SerializeToJson(export);
 		}
diff --git a/src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs b/src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs
index 131ae481234e..05045b2d2593 100644
--- a/src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs
+++ b/src/Files.App/ViewModels/Dialogs/DecompressArchiveDialogViewModel.cs
@@ -10,17 +10,57 @@ namespace Files.App.ViewModels.Dialogs
 {
 	public sealed partial class DecompressArchiveDialogViewModel : ObservableObject
 	{
+		// Services
 		private ICommonDialogService CommonDialogService { get; } = Ioc.Default.GetRequiredService<ICommonDialogService>();
+		private readonly IUserSettingsService UserSettingsService = Ioc.Default.GetRequiredService<IUserSettingsService>();
 
+		// Fields
 		private readonly IStorageFile archive;
 
+		// Properties
 		public BaseStorageFolder DestinationFolder { get; private set; }
 
 		private string destinationFolderPath;
 		public string DestinationFolderPath
 		{
 			get => destinationFolderPath;
-			private set => SetProperty(ref destinationFolderPath, value);
+			set
+			{
+				if (SetProperty(ref destinationFolderPath, value))
+				{
+					OnPropertyChanged(nameof(IsDestinationPathValid));
+				}
+			}
+		}
+
+		public bool IsDestinationPathValid
+		{
+			get
+			{
+				try
+				{
+					if (string.IsNullOrWhiteSpace(DestinationFolderPath))
+						return false;
+
+					string parentDir = Path.GetDirectoryName(DestinationFolderPath);
+					string finalSegment = Path.GetFileName(DestinationFolderPath);
+
+					// Check parent directory exists
+					if (string.IsNullOrWhiteSpace(parentDir) || !Directory.Exists(parentDir))
+						return false;
+
+					// Check for invalid characters (IsValidForFilename already does this)
+					if (!FilesystemHelpers.IsValidForFilename(finalSegment))
+						return false;
+
+					return true;
+				}
+				catch
+				{
+					// Catch any exception to prevent crashes
+					return false;
+				}
+			}
 		}
 
 		private bool openDestinationFolderOnCompletion;
@@ -65,31 +105,17 @@ public bool ShowPathSelection
 		public DisposableArray? Password { get; private set; }
 
 		public EncodingItem[] EncodingOptions { get; set; } = EncodingItem.Defaults;
-		public EncodingItem SelectedEncoding { get; set; }
-		void RefreshEncodingOptions()
-		{
-			if (detectedEncoding != null)
-			{
-				EncodingOptions = EncodingItem.Defaults
-				.Prepend(new EncodingItem(
-					detectedEncoding,
-					string.Format(Strings.EncodingDetected.GetLocalizedResource(), detectedEncoding.EncodingName)
-				))
-				.ToArray();
-			}
-			else
-			{
-				EncodingOptions = EncodingItem.Defaults;
-			}
-			SelectedEncoding = EncodingOptions.FirstOrDefault();
-		}
 
+		public EncodingItem SelectedEncoding { get; set; }
 
+		public ObservableCollection<string> PreviousExtractionLocations { get; } = [];
 
+		// Commands
 		public IRelayCommand PrimaryButtonClickCommand { get; private set; }
-
 		public ICommand SelectDestinationCommand { get; private set; }
+		public ICommand QuerySubmittedCommand { get; private set; }
 
+		// Constructor
 		public DecompressArchiveDialogViewModel(IStorageFile archive)
 		{
 			this.archive = archive;
@@ -101,6 +127,12 @@ public DecompressArchiveDialogViewModel(IStorageFile archive)
 			PrimaryButtonClickCommand = new RelayCommand<DisposableArray>(password => Password = password);
 		}
 
+		// Private Methods
+		private string DefaultDestinationFolderPath()
+		{
+			return Path.Combine(Path.GetDirectoryName(archive.Path), Path.GetFileNameWithoutExtension(archive.Path));
+		}
+
 		private async Task SelectDestinationAsync()
 		{
 			bool result = CommonDialogService.Open_FileOpenDialog(MainWindow.Instance.WindowHandle, true, [], Environment.SpecialFolder.Desktop, out var filePath);
@@ -111,9 +143,42 @@ private async Task SelectDestinationAsync()
 			DestinationFolderPath = (DestinationFolder is not null) ? DestinationFolder.Path : DefaultDestinationFolderPath();
 		}
 
-		private string DefaultDestinationFolderPath()
+		private void RefreshEncodingOptions()
 		{
-			return Path.Combine(Path.GetDirectoryName(archive.Path), Path.GetFileNameWithoutExtension(archive.Path));
+			if (detectedEncoding != null)
+			{
+				EncodingOptions = EncodingItem.Defaults
+				.Prepend(new EncodingItem(
+					detectedEncoding,
+					string.Format(Strings.EncodingDetected.GetLocalizedResource(), detectedEncoding.EncodingName)
+				))
+				.ToArray();
+			}
+			else
+			{
+				EncodingOptions = EncodingItem.Defaults;
+			}
+			SelectedEncoding = EncodingOptions.FirstOrDefault();
+		}
+
+		// Public Methods
+		public void UpdateSuggestions(string query)
+		{
+			var allItems = UserSettingsService.GeneralSettingsService.PreviousArchiveExtractionLocations;
+			if (allItems is null)
+				return;
+
+			var filtered = allItems
+				.Where(item => item.StartsWith(query, StringComparison.OrdinalIgnoreCase))
+				.ToList();
+
+			// Only update if results changed to prevent flickering
+			if (!filtered.SequenceEqual(PreviousExtractionLocations))
+			{
+				PreviousExtractionLocations.Clear();
+				foreach (var item in filtered)
+					PreviousExtractionLocations.Add(item);
+			}
 		}
 	}
-}
+}
\ No newline at end of file