Requested changes

files-community · Feb 7, 2024 · c656d43 · c656d43
1 parent a16adba
commit c656d43
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 17 deletions.
diff --git a/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs b/src/Files.App/Data/Factories/ShellContextFlyoutHelper.cs
@@ -12,6 +12,7 @@
 using Vanara.PInvoke;
 using Windows.System;
 using Windows.UI.Core;
+using static Vanara.PInvoke.Kernel32;
 
 namespace Files.App.Helpers
 {
@@ -180,11 +181,11 @@ async Task InvokeShellMenuItemAsync(ContextMenu contextMenu, object? tag)
 				switch (verb)
 				{
 					case "install" when isFont:
-							await Task.WhenAll(contextMenu.ItemsPath.Select(path => Win32API.InstallFont(path, false)));
+						await Win32API.InstallFontsAsync(contextMenu.ItemsPath.ToArray(), false);
 						break;
 
 					case "installAllUsers" when isFont:
-						await Task.WhenAll(contextMenu.ItemsPath.Select(path => Win32API.InstallFont(path, true)));
+						await Win32API.InstallFontsAsync(contextMenu.ItemsPath.ToArray(), true);
 						break;
 
 					case "mount":

diff --git a/src/Files.App/Utils/Shell/Win32API.cs b/src/Files.App/Utils/Shell/Win32API.cs
@@ -850,21 +850,6 @@ public static async Task<bool> InstallInf(string filePath)
 			}
 		}
 
-		public static Task InstallFont(string fontFilePath, bool forAllUsers)
-		{
-			string fontDirectory = forAllUsers
-				? Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.Windows), "Fonts")
-				: Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.LocalApplicationData), "Microsoft", "Windows", "Fonts");
-
-			string registryKey = forAllUsers
-				? "HKLM:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts"
-				: "HKCU:\\Software\\Microsoft\\Windows NT\\CurrentVersion\\Fonts";
-
-			var destinationPath = Path.Combine(fontDirectory, Path.GetFileName(fontFilePath));
-
-			return RunPowershellCommandAsync($"-command \"Copy-Item '{fontFilePath}' '{fontDirectory}'; New-ItemProperty -Name '{Path.GetFileNameWithoutExtension(fontFilePath)}' -Path '{registryKey}' -PropertyType string -Value '{destinationPath}'\"", forAllUsers);
-		}
-
 		public static async Task InstallFontsAsync(string[] fontFilePaths, bool forAllUsers)
 		{
 			string fontDirectory = forAllUsers