Feature: Added experimental support for flattening folders

src/Files.App/Actions/FileSystem/FlattenRecursiveAction.cs

@@ -0,0 +1,110 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using System.IO;
+using Windows.Storage;
+using Microsoft.Extensions.Logging;
+
+namespace Files.App.Actions
+{
+	internal sealed class FlattenRecursiveAction : ObservableObject, IAction
+	{
+		private readonly IContentPageContext context;
+
+		public string Label
+			=> "FlattenRecursive".GetLocalizedResource();
+
+		public string Description
+			=> "FlattenDescription".GetLocalizedResource();
+
+		public bool IsExecutable =>
+			context.ShellPage is not null &&
+			context.HasSelection &&
+			context.SelectedItem?.PrimaryItemAttribute is StorageItemTypes.Folder;
+
+		public FlattenRecursiveAction()
+		{
+			context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
+			context.PropertyChanged += Context_PropertyChanged;
+		}
+
+		public async Task ExecuteAsync(object? parameter = null)
+		{
+			if (context.ShellPage?.ShellViewModel is null)
+				return;
+
+			var items = context.SelectedItems;
+
+			if (items is null || !items.Any() || items.Any(item => !item.IsFolder))
+				return;
+
+			foreach (var item in items)
+			{
+				await FlattenFolderAsync(item.ItemPath);
+			}
+		}
+
+		private async Task FlattenFolderAsync(string folderPath)
+		{
+			var containedFolders = await Task.Run(() => Directory.GetDirectories(folderPath));
+			var containedFiles = await Task.Run(() => Directory.GetFiles(folderPath));
+
+			foreach (var containedFolder in containedFolders)
+			{
+				await FlattenFolderAsync(containedFolder);
+
+				var folderName = Path.GetFileName(containedFolder);
+				var destinationPath = Path.Combine(context.ShellPage?.ShellViewModel?.CurrentFolder?.ItemPath ?? string.Empty, folderName);
+
+				if (Directory.Exists(destinationPath))
+					continue;
+
+				try
+				{
+					Directory.Move(containedFolder, destinationPath);
+				}
+				catch (Exception ex)
+				{
+					App.Logger.LogWarning(ex.Message, $"Folder '{folderName}' already exists in the destination folder.");
+				}
+			}
+
+			foreach (var containedFile in containedFiles)
+			{
+				var fileName = Path.GetFileName(containedFile);
+				var destinationPath = Path.Combine(context.ShellPage?.ShellViewModel?.CurrentFolder?.ItemPath ?? string.Empty, fileName);
+
+				if (File.Exists(destinationPath))
+					continue;
+
+				try
+				{
+					File.Move(containedFile, destinationPath);
+				}
+				catch (Exception ex)
+				{
+					App.Logger.LogWarning(ex.Message, $"Failed to move file '{fileName}'.");
+				}
+			}
+
+			if (Directory.GetFiles(folderPath).Length == 0 && Directory.GetDirectories(folderPath).Length == 0)
+			{
+				try
+				{
+					Directory.Delete(folderPath);
+				}
+				catch (Exception ex)
+				{
+					App.Logger.LogWarning(ex.Message, $"Failed to delete folder '{folderPath}'.");
+				}
+			}
+		}
+
+		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName is nameof(IContentPageContext.HasSelection))
+				OnPropertyChanged(nameof(IsExecutable));
+		}
+	}
+}

src/Files.App/Actions/FileSystem/FlattenSingleAction.cs

@@ -0,0 +1,105 @@
+// Copyright (c) 2024 Files Community
+// Licensed under the MIT License. See the LICENSE.
+
+using System.IO;
+using Windows.Storage;
+using Microsoft.Extensions.Logging;
+
+namespace Files.App.Actions
+{
+	internal sealed class FlattenSingleAction : ObservableObject, IAction
+	{
+		private readonly IContentPageContext context;
+
+		public string Label
+			=> "FlattenSingle".GetLocalizedResource();
+
+		public string Description
+			=> "FlattenDescription".GetLocalizedResource();
+
+		public bool IsExecutable =>
+			context.ShellPage is not null &&
+			context.HasSelection &&
+			context.SelectedItem?.PrimaryItemAttribute is StorageItemTypes.Folder;
+
+		public FlattenSingleAction()
+		{
+			context = Ioc.Default.GetRequiredService<IContentPageContext>();
+
+			context.PropertyChanged += Context_PropertyChanged;
+		}
+
+		public async Task ExecuteAsync(object? parameter = null)
+		{
+			if (context.ShellPage?.ShellViewModel is null)
+				return;
+
+			var items = context.SelectedItems;
+
+			if (items is null || !items.Any() || items.Any(item => !item.IsFolder))
+				return;
+
+			foreach (var item in items)
+			{
+				var folderPath = item.ItemPath;
+
+				var containedFolders = await Task.Run(() => Directory.GetDirectories(folderPath));
+				var containedFiles = await Task.Run(() => Directory.GetFiles(folderPath));
+
+				foreach (var containedFolder in containedFolders)
+				{
+					var folderName = Path.GetFileName(containedFolder);
+					var destinationPath = Path.Combine(context.ShellPage?.ShellViewModel?.CurrentFolder?.ItemPath ?? string.Empty, folderName);
+
+					if (Directory.Exists(destinationPath))
+						continue;
+
+					try
+					{
+						Directory.Move(containedFolder, destinationPath);
+					}
+					catch (Exception ex)
+					{
+						App.Logger.LogWarning(ex.Message, $"Folder '{folderName}' already exists in the destination folder.");
+					}
+				}
+
+				foreach (var containedFile in containedFiles)
+				{
+					var fileName = Path.GetFileName(containedFile);
+					var destinationPath = Path.Combine(context.ShellPage?.ShellViewModel?.CurrentFolder?.ItemPath ?? string.Empty, fileName);
+
+					if (File.Exists(destinationPath))
+						continue;
+
+					try
+					{
+						File.Move(containedFile, destinationPath);
+					}
+					catch (Exception ex)
+					{
+						App.Logger.LogWarning(ex.Message, $"Failed to move file '{fileName}'.");
+					}
+				}
+
+				if (Directory.GetFiles(folderPath).Length == 0 && Directory.GetDirectories(folderPath).Length == 0)
+				{
+					try
+					{
+						Directory.Delete(folderPath);
+					}
+					catch (Exception ex)
+					{
+						App.Logger.LogWarning(ex.Message, $"Failed to delete folder '{folderPath}'.");
+					}
+				}
+			}
+		}
+
+		private void Context_PropertyChanged(object? sender, PropertyChangedEventArgs e)
+		{
+			if (e.PropertyName is nameof(IContentPageContext.HasSelection))
+				OnPropertyChanged(nameof(IsExecutable));
+		}
+	}
+}

src/Files.App/Data/Commands/Manager/CommandCodes.cs

@@ -97,6 +97,10 @@ public enum CommandCodes
 		DecompressArchiveHereSmart,
 		DecompressArchiveToChildFolder,
 
+		// Folder
+		FlattenSingle,
+		FlattenRecursive,
+
 		// Image Manipulation
 		RotateLeft,
 		RotateRight,

src/Files.App/Data/Commands/Manager/CommandManager.cs

@@ -102,6 +102,8 @@ public IRichCommand this[HotKey hotKey]
 		public IRichCommand DecompressArchiveHere => commands[CommandCodes.DecompressArchiveHere];
 		public IRichCommand DecompressArchiveHereSmart => commands[CommandCodes.DecompressArchiveHereSmart];
 		public IRichCommand DecompressArchiveToChildFolder => commands[CommandCodes.DecompressArchiveToChildFolder];
+		public IRichCommand FlattenSingle => commands[CommandCodes.FlattenSingle];
+		public IRichCommand FlattenRecursive => commands[CommandCodes.FlattenRecursive];
 		public IRichCommand RotateLeft => commands[CommandCodes.RotateLeft];
 		public IRichCommand RotateRight => commands[CommandCodes.RotateRight];
 		public IRichCommand OpenItem => commands[CommandCodes.OpenItem];
@@ -289,6 +291,8 @@ public IEnumerator<IRichCommand> GetEnumerator() =>
 			[CommandCodes.DecompressArchiveHere] = new DecompressArchiveHere(),
 			[CommandCodes.DecompressArchiveHereSmart] = new DecompressArchiveHereSmart(),
 			[CommandCodes.DecompressArchiveToChildFolder] = new DecompressArchiveToChildFolderAction(),
+			[CommandCodes.FlattenSingle] = new FlattenSingleAction(),
+			[CommandCodes.FlattenRecursive] = new FlattenRecursiveAction(),
 			[CommandCodes.RotateLeft] = new RotateLeftAction(),
 			[CommandCodes.RotateRight] = new RotateRightAction(),
 			[CommandCodes.OpenItem] = new OpenItemAction(),

src/Files.App/Data/Commands/Manager/ICommandManager.cs

@@ -89,6 +89,9 @@ public interface ICommandManager : IEnumerable<IRichCommand>
 		IRichCommand DecompressArchiveHereSmart { get; }
 		IRichCommand DecompressArchiveToChildFolder { get; }
 
+		IRichCommand FlattenSingle { get; }
+		IRichCommand FlattenRecursive { get; }
+
 		IRichCommand RotateLeft { get; }
 		IRichCommand RotateRight { get; }
 

src/Files.App/Data/Contracts/IGeneralSettingsService.cs

@@ -225,6 +225,11 @@ public interface IGeneralSettingsService : IBaseSettingsService, INotifyProperty
 		/// </summary>
 		bool ShowCompressionOptions { get; set; }
 
+		/// <summary>
+		/// Gets or sets a value indicating whether or not to show the flatten options e.g. single, recursive.
+		/// </summary>
+		bool ShowFlattenOptions { get; set; }
+
 		/// <summary>
 		/// Gets or sets a value indicating whether or not to show the Send To menu.
 		/// </summary>

src/Files.App/Data/Factories/ContentPageContextFlyoutFactory.cs

@@ -539,6 +539,22 @@ public static List<ContextMenuFlyoutItemViewModel> GetBaseItemMenuItems(
 					ShowItem = UserSettingsService.GeneralSettingsService.ShowCompressionOptions && StorageArchiveService.CanDecompress(selectedItems)
 				},
 				new ContextMenuFlyoutItemViewModel()
+				{
+					Text = "Flatten".GetLocalizedResource(),
+					ShowInSearchPage = true,
+					ThemedIconModel = new ThemedIconModel()
+					{
+						ThemedIconStyle = "App.ThemedIcons.Folder",
+					},
+					Items =
+					[
+						new ContextMenuFlyoutItemViewModelBuilder(Commands.FlattenSingle).Build(),
+						new ContextMenuFlyoutItemViewModelBuilder(Commands.FlattenRecursive).Build(),
+					],
+					IsHidden = selectedItems.Count != 1 || !selectedItems.Any(item => item?.PrimaryItemAttribute is StorageItemTypes.Folder) || !itemsSelected,
+					ShowItem = UserSettingsService.GeneralSettingsService.ShowFlattenOptions
+				},
+				new ContextMenuFlyoutItemViewModel()
 				{
 					Text = "SendTo".GetLocalizedResource(),
 					Tag = "SendTo",

src/Files.App/Services/Settings/GeneralSettingsService.cs

@@ -297,6 +297,12 @@ public bool ShowSystemTrayIcon
 			set => Set(value);
 		}
 
+		public bool ShowFlattenOptions
+		{
+			get => Get(true);
+			set => Set(value);
+		}
+
 		public FileNameConflictResolveOptionType ConflictsResolveOption
 		{
 			get => (FileNameConflictResolveOptionType)Get((long)FileNameConflictResolveOptionType.GenerateNewName);

src/Files.App/Strings/af/Resources.resw

@@ -2028,6 +2028,18 @@
   <data name="Compress" xml:space="preserve">
     <value>Compress</value>
   </data>
+  <data name="Flatten" xml:space="preserve">
+    <value>Flatten</value>
+  </data>
+  <data name="FlattenDescription" xml:space="preserve">
+    <value>Flatten a folder contents into the current path.</value>
+  </data>
+  <data name="FlattenSingle" xml:space="preserve">
+    <value>Flatten Single</value>
+  </data>
+  <data name="FlattenRecursive" xml:space="preserve">
+    <value>Flatten Recursive</value>
+  </data>
   <data name="SelectFilesAndFoldersOnHover" xml:space="preserve">
     <value>Select files and folders when hovering over them</value>
   </data>

src/Files.App/Strings/ar/Resources.resw

@@ -2028,6 +2028,18 @@
   <data name="Compress" xml:space="preserve">
     <value>ضغط</value>
   </data>
+  <data name="Flatten" xml:space="preserve">
+    <value>Flatten</value>
+  </data>
+  <data name="FlattenDescription" xml:space="preserve">
+    <value>Flatten a folder contents into the current path.</value>
+  </data>
+  <data name="FlattenSingle" xml:space="preserve">
+    <value>Flatten Single</value>
+  </data>
+  <data name="FlattenRecursive" xml:space="preserve">
+    <value>Flatten Recursive</value>
+  </data>
   <data name="SelectFilesAndFoldersOnHover" xml:space="preserve">
     <value>حدد الملفات والمجلدات عند التنقل فوقها</value>
   </data>

src/Files.App/Strings/be-BY/Resources.resw

@@ -2027,6 +2027,18 @@
   <data name="Compress" xml:space="preserve">
     <value>Compress</value>
   </data>
+  <data name="Flatten" xml:space="preserve">
+    <value>Flatten</value>
+  </data>
+  <data name="FlattenDescription" xml:space="preserve">
+    <value>Flatten a folder contents into the current path.</value>
+  </data>
+  <data name="FlattenSingle" xml:space="preserve">
+    <value>Flatten Single</value>
+  </data>
+  <data name="FlattenRecursive" xml:space="preserve">
+    <value>Flatten Recursive</value>
+  </data>
   <data name="SelectFilesAndFoldersOnHover" xml:space="preserve">
     <value>Select files and folders when hovering over them</value>
   </data>

src/Files.App/Strings/bg/Resources.resw

@@ -2027,6 +2027,18 @@
   <data name="Compress" xml:space="preserve">
     <value>Компресиране</value>
   </data>
+  <data name="Flatten" xml:space="preserve">
+    <value>Flatten</value>
+  </data>
+  <data name="FlattenDescription" xml:space="preserve">
+    <value>Flatten a folder contents into the current path.</value>
+  </data>
+  <data name="FlattenSingle" xml:space="preserve">
+    <value>Flatten Single</value>
+  </data>
+  <data name="FlattenRecursive" xml:space="preserve">
+    <value>Flatten Recursive</value>
+  </data>
   <data name="SelectFilesAndFoldersOnHover" xml:space="preserve">
     <value>Избор на файлове и папки при показалец на мишката над тях</value>
   </data>

src/Files.App/Strings/ca/Resources.resw

@@ -2027,6 +2027,18 @@
   <data name="Compress" xml:space="preserve">
     <value>Comprimeix</value>
   </data>
+  <data name="Flatten" xml:space="preserve">
+    <value>Flatten</value>
+  </data>
+  <data name="FlattenDescription" xml:space="preserve">
+    <value>Flatten a folder contents into the current path.</value>
+  </data>
+  <data name="FlattenSingle" xml:space="preserve">
+    <value>Flatten Single</value>
+  </data>
+  <data name="FlattenRecursive" xml:space="preserve">
+    <value>Flatten Recursive</value>
+  </data>
   <data name="SelectFilesAndFoldersOnHover" xml:space="preserve">
     <value>Selecciona fitxers i carpetes quan passeu el cursor per sobre d'ells</value>
   </data>