Launch all files with Process.Start

lukeblevins · lukeblevins · commit f1d7add2f9db · 2019-12-30T14:12:24.000-05:00
diff --git a/Files.Launcher/Program.cs b/Files.Launcher/Program.cs
@@ -1,4 +1,5 @@
-﻿using System.Diagnostics;
+﻿using System.ComponentModel;
+using System.Diagnostics;
 using System.IO;
 using System.IO.Pipes;
 using System.Security.Principal;
@@ -55,15 +56,22 @@ static void Main(string[] args)
                     process.StartInfo.CreateNoWindow = true;
                     process.Start();
                 }
-                catch (System.ComponentModel.Win32Exception)
+                catch (Win32Exception)
                 {
                     var executable = (string)ApplicationData.Current.LocalSettings.Values["Application"];
                     Process process = new Process();
                     process.StartInfo.UseShellExecute = true;
                     process.StartInfo.Verb = "runas";
                     process.StartInfo.FileName = executable;
                     process.StartInfo.CreateNoWindow = true;
-                    process.Start();
+                    try
+                    {
+                        process.Start();
+                    }
+                    catch (Win32Exception)
+                    {
+                        Process.Start(executable);
+                    }
                 }
                 
 
diff --git a/Files/Controls/RibbonArea.xaml.cs b/Files/Controls/RibbonArea.xaml.cs
@@ -155,11 +155,11 @@ public async void CheckPathInput(ItemViewModel instance, string CurrentInput)
                             {
                                 if (parentPage.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))
                                 {
-                                    await Interaction.LaunchExe(CurrentInput);
+                                    await Interaction.InvokeWin32Component(CurrentInput);
                                 }
                                 else if (parentPage.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))
                                 {
-                                    await Interaction.LaunchExe(CurrentInput);
+                                    await Interaction.InvokeWin32Component(CurrentInput);
                                 }
 
                                 VisiblePath.Text = instance.Universal.path;
diff --git a/Files/Interacts/Interaction.cs b/Files/Interacts/Interaction.cs
@@ -257,7 +257,7 @@ public void GetPath_Click(object sender, RoutedEventArgs e)
             }
         }
 
-        public static async Task LaunchExe(string ApplicationPath)
+        public static async Task InvokeWin32Component(string ApplicationPath)
         {
             Debug.WriteLine("Launching EXE in FullTrustProcess");
             ApplicationData.Current.LocalSettings.Values["Application"] = ApplicationPath;
@@ -411,22 +411,30 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
                             currentInstance.ItemDisplayFrame.Navigate(sourcePageType, selectedItemPath, new SuppressNavigationTransitionInfo());
                         }
                     }
-                    else if (clickedOnItem.FileType == "Application")
-                    {
-                        // Add location to MRU List
-                        mostRecentlyUsed.Add(await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath));
-                        await LaunchExe(clickedOnItem.FilePath);
-                    }
                     else
                     {
-                        StorageFile file = await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath);
-                        // Add location to MRU List
-                        mostRecentlyUsed.Add(file);
-                        var options = new LauncherOptions
+                        if (clickedOnItem.FileType == "Folder")
+                        {
+                            instanceTabsView.AddNewTab(typeof(ProHome), clickedOnItem.FilePath);
+                        }
+                        else
                         {
-                            DisplayApplicationPicker = displayApplicationPicker
-                        };
-                        await Launcher.LaunchFileAsync(file, options);
+                            // Add location to MRU List
+                            mostRecentlyUsed.Add(await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath));
+                            if (displayApplicationPicker)
+                            {
+                                StorageFile file = await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath);
+                                var options = new LauncherOptions
+                                {
+                                    DisplayApplicationPicker = true
+                                };
+                                await Launcher.LaunchFileAsync(file, options);
+                            }
+                            else
+                            {
+                                await InvokeWin32Component(clickedOnItem.FilePath);
+                            }
+                        }
                     }
                 }
                 else if(selectedItemCount > 1)
@@ -438,22 +446,23 @@ private async void OpenSelectedItems(bool displayApplicationPicker)
                         {
                             instanceTabsView.AddNewTab(typeof(ProHome), clickedOnItem.FilePath);
                         }
-                        else if (clickedOnItem.FileType == "Application")
-                        {
-                            // Add location to MRU List
-                            mostRecentlyUsed.Add(await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath));
-                            await LaunchExe(clickedOnItem.FilePath);
-                        }
                         else
                         {
-                            StorageFile file = await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath);
                             // Add location to MRU List
-                            mostRecentlyUsed.Add(file);
-                            var options = new LauncherOptions
+                            mostRecentlyUsed.Add(await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath));
+                            if (displayApplicationPicker)
                             {
-                                DisplayApplicationPicker = displayApplicationPicker
-                            };
-                            await Launcher.LaunchFileAsync(file, options);
+                                StorageFile file = await StorageFile.GetFileFromPathAsync(clickedOnItem.FilePath);
+                                var options = new LauncherOptions
+                                {
+                                    DisplayApplicationPicker = true
+                                };
+                                await Launcher.LaunchFileAsync(file, options);
+                            }
+                            else
+                            {
+                                await InvokeWin32Component(clickedOnItem.FilePath);
+                            }
                         }
                     }
                 }
diff --git a/Files/YourHome.xaml.cs b/Files/YourHome.xaml.cs
@@ -281,17 +281,7 @@ public async void PopulateRecentsList()
                 try
                 {
                     Windows.Storage.IStorageItem item = await mostRecentlyUsed.GetItemAsync(mruToken);
-                    if (item.IsOfType(StorageItemTypes.Folder))
-                    {
-                        ItemName = item.Name;
-                        ItemPath = item.Path;
-                        ItemType = StorageItemTypes.Folder;
-                        ItemFolderImgVis = Visibility.Visible;
-                        ItemEmptyImgVis = Visibility.Collapsed;
-                        ItemFileIconVis = Visibility.Collapsed;
-                        recentItemsCollection.Add(new RecentItem() { name = ItemName, path = ItemPath, type = ItemType, EmptyImgVis = ItemEmptyImgVis, FolderImg = ItemFolderImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });
-                    }
-                    else if (item.IsOfType(StorageItemTypes.File))
+                    if (item.IsOfType(StorageItemTypes.File))
                     {
                         ItemName = item.Name;
                         ItemPath = item.Path;
@@ -329,20 +319,7 @@ private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)
             var path = (e.ClickedItem as RecentItem).path;
             try
             {
-                var file = (await StorageFile.GetFileFromPathAsync(path));
-                if (file.DisplayType == "Application")
-                {
-                    await Interaction.LaunchExe(path);
-
-                }
-                else
-                {
-                    var options = new LauncherOptions
-                    {
-                        DisplayApplicationPicker = false
-                    };
-                    await Launcher.LaunchFileAsync(file, options);
-                }
+                await Interaction.InvokeWin32Component(path);
             }
             catch (UnauthorizedAccessException)
             {
@@ -357,7 +334,7 @@ private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)
                 }
                 else
                 {
-                    foreach(DriveItem drive in App.foundDrives)
+                    foreach (DriveItem drive in App.foundDrives)
                     {
                         if (drive.tag.ToString() == new DirectoryInfo(path).Root.ToString())
                         {

Original file line number	Diff line number	Diff line change
`@@ -155,11 +155,11 @@ public async void CheckPathInput(ItemViewModel instance, string CurrentInput)`
`155`	`155`	`{`
`156`	`156`	`if (parentPage.ItemDisplayFrame.SourcePageType == typeof(GenericFileBrowser))`
`157`	`157`	`{`
`158`		`- await Interaction.LaunchExe(CurrentInput);`
	`158`	`+ await Interaction.InvokeWin32Component(CurrentInput);`
`159`	`159`	`}`
`160`	`160`	`else if (parentPage.ItemDisplayFrame.SourcePageType == typeof(PhotoAlbum))`
`161`	`161`	`{`
`162`		`- await Interaction.LaunchExe(CurrentInput);`
	`162`	`+ await Interaction.InvokeWin32Component(CurrentInput);`
`163`	`163`	`}`
`164`	`164`
`165`	`165`	`VisiblePath.Text = instance.Universal.path;`
Original file line number	Diff line number	Diff line change
`@@ -281,17 +281,7 @@ public async void PopulateRecentsList()`
`281`	`281`	`try`
`282`	`282`	`{`
`283`	`283`	`Windows.Storage.IStorageItem item = await mostRecentlyUsed.GetItemAsync(mruToken);`
`284`		`- if (item.IsOfType(StorageItemTypes.Folder))`
`285`		`- {`
`286`		`- ItemName = item.Name;`
`287`		`- ItemPath = item.Path;`
`288`		`- ItemType = StorageItemTypes.Folder;`
`289`		`- ItemFolderImgVis = Visibility.Visible;`
`290`		`- ItemEmptyImgVis = Visibility.Collapsed;`
`291`		`- ItemFileIconVis = Visibility.Collapsed;`
`292`		`- recentItemsCollection.Add(new RecentItem() { name = ItemName, path = ItemPath, type = ItemType, EmptyImgVis = ItemEmptyImgVis, FolderImg = ItemFolderImgVis, FileImg = ItemImage, FileIconVis = ItemFileIconVis });`
`293`		`- }`
`294`		`- else if (item.IsOfType(StorageItemTypes.File))`
	`284`	`+ if (item.IsOfType(StorageItemTypes.File))`
`295`	`285`	`{`
`296`	`286`	`ItemName = item.Name;`
`297`	`287`	`ItemPath = item.Path;`
`@@ -329,20 +319,7 @@ private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)`
`329`	`319`	`var path = (e.ClickedItem as RecentItem).path;`
`330`	`320`	`try`
`331`	`321`	`{`
`332`		`- var file = (await StorageFile.GetFileFromPathAsync(path));`
`333`		`- if (file.DisplayType == "Application")`
`334`		`- {`
`335`		`- await Interaction.LaunchExe(path);`
`336`		`-`
`337`		`- }`
`338`		`- else`
`339`		`- {`
`340`		`- var options = new LauncherOptions`
`341`		`- {`
`342`		`- DisplayApplicationPicker = false`
`343`		`- };`
`344`		`- await Launcher.LaunchFileAsync(file, options);`
`345`		`- }`
	`322`	`+ await Interaction.InvokeWin32Component(path);`
`346`	`323`	`}`
`347`	`324`	`catch (UnauthorizedAccessException)`
`348`	`325`	`{`
`@@ -357,7 +334,7 @@ private async void RecentsView_ItemClick(object sender, ItemClickEventArgs e)`
`357`	`334`	`}`
`358`	`335`	`else`
`359`	`336`	`{`
`360`		`- foreach(DriveItem drive in App.foundDrives)`
	`337`	`+ foreach (DriveItem drive in App.foundDrives)`
`361`	`338`	`{`
`362`	`339`	`if (drive.tag.ToString() == new DirectoryInfo(path).Root.ToString())`
`363`	`340`	`{`