Implement Removable Drive Access

lukeblevins · lukeblevins · commit 43a50e0ce673 · 2019-02-12T19:33:23.000-05:00
diff --git a/FileLoader.cs b/FileLoader.cs
@@ -12,6 +12,7 @@
 using Windows.UI.Popups;
 using Interacts;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media.Animation;
 
 namespace ItemListPresenter
 {
@@ -342,6 +343,13 @@ public async void GetItemsAsync(string path)
             {
                 DisplayConsentDialog();
             }
+            catch (System.Runtime.InteropServices.COMException e)
+            {
+                Frame rootFrame = Window.Current.Content as Frame;
+                MessageDialog driveGone = new MessageDialog(e.Message, "Drive Not Found");
+                await driveGone.ShowAsync();
+                rootFrame.Navigate(typeof(MainPage), new SuppressNavigationTransitionInfo());
+            }
             stopwatch.Stop();
             Debug.WriteLine("Loading of: " + path + " completed in " + stopwatch.ElapsedMilliseconds + " Milliseconds.");
 
diff --git a/GenericFileBrowser.xaml.cs b/GenericFileBrowser.xaml.cs
@@ -3,6 +3,7 @@
 using Navigation;
 using System;
 using System.ComponentModel;
+using System.Diagnostics;
 using System.Linq;
 using Windows.ApplicationModel.Core;
 using Windows.ApplicationModel.DataTransfer;
@@ -68,6 +69,8 @@ public GenericFileBrowser()
             ReviewBox.SecondaryButtonClick += Interacts.Interaction.SkipChoiceClick;
         }
 
+        
+
         private async void AddItem_ClickAsync(object sender, RoutedEventArgs e)
         {
             var CurrentView = ApplicationView.GetForCurrentView();
@@ -109,10 +112,6 @@ private void Clipboard_ContentChanged(object sender, object e)
 
         public static UniversalPath p = new UniversalPath();
         public static UniversalPath P { get { return GenericFileBrowser.p; } }
-
-        //private static GenericFileBrowser getGenericFileBrowser = new GenericFileBrowser();
-        //public static GenericFileBrowser GetGenericFileBrowser { get { return getGenericFileBrowser; } }
-
         
         protected override void OnNavigatedTo(NavigationEventArgs eventArgs)
         {
diff --git a/ItemInteractions.cs b/ItemInteractions.cs
@@ -154,15 +154,18 @@ public static async void List_ItemClick(object sender, DoubleTappedRoutedEventAr
                         }
                         else
                         {
-                            GenericFileBrowser.P.path = clickedOnItem.FilePath;
-                            foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in MainPage.nv.MenuItems)
+                            if (clickedOnItem.FilePath.Contains("C:"))
                             {
-                                if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "LocD_IC")
+                                foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in MainPage.nv.MenuItems)
                                 {
-                                    MainPage.Select.itemSelected = NavItemChoice;
-                                    break;
+                                    if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "LocD_IC")
+                                    {
+                                        MainPage.Select.itemSelected = NavItemChoice;
+                                        break;
+                                    }
                                 }
                             }
+                            GenericFileBrowser.P.path = clickedOnItem.FilePath;
                             ItemViewModel.ViewModel = new ItemViewModel(clickedOnItem.FilePath, GenericFileBrowser.GFBPageName);
                         }
                     }
@@ -319,6 +322,7 @@ public static async void List_ItemClick(object sender, DoubleTappedRoutedEventAr
                         Interaction.message.Commands.Add(new UICommand("Continue...", new UICommandInvokedHandler(Interaction.CommandInvokedHandler)));
                         Interaction.message.Commands.Add(new UICommand("Cancel"));
                         await Interaction.message.ShowAsync();
+
                     }
                     else
                     {
@@ -492,11 +496,6 @@ private static void Manager_DataRequested(DataTransferManager sender, DataReques
 
         }
 
-        public static void ScanItem_Click(object sender, RoutedEventArgs e)
-        {
-
-        }
-
         public static void DeleteItem_Click(object sender, RoutedEventArgs e)
         {
 
diff --git a/MainPage.xaml b/MainPage.xaml
@@ -423,7 +423,7 @@
 
                 <UILib:NavigationViewItemHeader Content="Drives"/>
 
-                <UILib:NavigationViewItem Content="Local Disk" x:Name="LocD_IC" FontFamily="Segoe UI" Margin="0,0,0,0" Tag="LDPage">
+                <UILib:NavigationViewItem Content="Local Disk (C:\)" x:Name="LocD_IC" FontFamily="Segoe UI" Margin="0,0,0,0" Tag="LDPage">
                     <UILib:NavigationViewItem.Icon>
                         <FontIcon Glyph="&#xEDA2;" FontFamily="Segoe MDL2 Assets"/>
                     </UILib:NavigationViewItem.Icon>
diff --git a/MainPage.xaml.cs b/MainPage.xaml.cs
@@ -1,12 +1,20 @@
 ﻿using ItemListPresenter;
 using System;
+using System.Collections;
+using System.Collections.ObjectModel;
 using System.ComponentModel;
 using System.Diagnostics;
 using Windows.ApplicationModel.Core;
+using Windows.Devices.Enumeration;
+using Windows.Devices.Usb;
+using Windows.Foundation;
+using Windows.Storage;
 using Windows.UI;
+using Windows.UI.Popups;
 using Windows.UI.ViewManagement;
 using Windows.UI.Xaml;
 using Windows.UI.Xaml.Controls;
+using Windows.UI.Xaml.Media.Animation;
 
 namespace Files
 {
@@ -23,6 +31,7 @@ public sealed partial class MainPage : Page
         string PicturesPath = Environment.GetFolderPath(Environment.SpecialFolder.MyPictures);
         string MusicPath = Environment.GetFolderPath(Environment.SpecialFolder.MyMusic);
         string VideosPath = Environment.GetFolderPath(Environment.SpecialFolder.MyVideos);
+
         public MainPage()
         {
             this.InitializeComponent();
@@ -36,8 +45,25 @@ public MainPage()
             titleBar.ButtonHoverBackgroundColor = Color.FromArgb(75, 10, 10, 10);
             nv = navView;
             accessibleAutoSuggestBox = auto_suggest;
+            PopulateNavViewWithExternalDrives();
+
         }
 
+        public async void PopulateNavViewWithExternalDrives()
+        {
+            StorageFolder RemDevicesFolder = KnownFolders.RemovableDevices;
+            foreach (StorageFolder fol in await RemDevicesFolder.GetFoldersAsync())
+            {
+                nv.MenuItems.Add(new Microsoft.UI.Xaml.Controls.NavigationViewItem()
+                {
+                    Content = "Removable Drive (" + fol.Name + ")",
+                    Icon = new SymbolIcon((Symbol)0xE88E),
+                    Tag = fol.Name
+                });
+                
+            }
+        }
+        
         private static SelectItem select = new SelectItem();
         public static SelectItem Select { get { return MainPage.select; } }
 
@@ -52,17 +78,15 @@ private void navView_ItemSelected(Microsoft.UI.Xaml.Controls.NavigationView send
             }
         }
 
-
-
-
+        
         private void auto_suggest_QuerySubmitted(AutoSuggestBox sender, AutoSuggestBoxQuerySubmittedEventArgs args)
         {
 
         }
 
         private void navView_Loaded(object sender, RoutedEventArgs e)
         {
-
+            
             foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in nv.MenuItems)
             {
                 if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "homeIc")
@@ -80,7 +104,7 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
         {
 
             var item = args.InvokedItem;
-
+            var itemContainer = args.InvokedItemContainer;
             //var item = Interaction.FindParent<NavigationViewItemBase>(args.InvokedItem as DependencyObject);
             if (args.IsSettingsInvoked == true)
             {
@@ -129,7 +153,7 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
                     ContentFrame.Navigate(typeof(GenericFileBrowser), VideosPath);
                     auto_suggest.PlaceholderText = "Search Videos";
                 }
-                else if (item.ToString() == "Local Disk")
+                else if (item.ToString() == "Local Disk (C:\\)")
                 {
                     ItemViewModel.TextState.isVisible = Visibility.Collapsed;
                     ContentFrame.Navigate(typeof(GenericFileBrowser), @"C:\");
@@ -141,6 +165,22 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
                     ContentFrame.Navigate(typeof(GenericFileBrowser), OneDrivePath);
                     auto_suggest.PlaceholderText = "Search OneDrive";
                 }
+                else
+                {
+                    var tagOfInvokedItem = (nv.MenuItems[nv.MenuItems.IndexOf(itemContainer)] as Microsoft.UI.Xaml.Controls.NavigationViewItem).Tag;
+
+                    if (StorageFolder.GetFolderFromPathAsync(tagOfInvokedItem.ToString()) != null)
+                    {
+                        ItemViewModel.TextState.isVisible = Visibility.Collapsed;
+                        ContentFrame.Navigate(typeof(GenericFileBrowser), tagOfInvokedItem);
+                        auto_suggest.PlaceholderText = "Search " + tagOfInvokedItem;
+                    }
+                    else
+                    {
+                        
+                    }
+                    
+                }
 
             }
         }
diff --git a/NavigationSystem.cs b/NavigationSystem.cs
@@ -263,16 +263,21 @@ public static void Back_Click(object sender, RoutedEventArgs e)
                 }
                 else
                 {
-                    GenericFileBrowser.P.path = (History.HistoryList[History.HistoryList.Count - 1]);
-                    foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in MainPage.nv.MenuItems)
+
+                    if((History.HistoryList[History.HistoryList.Count - 1]).Contains("C:"))
                     {
-                        if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "LocD_IC")
+                        foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in MainPage.nv.MenuItems)
                         {
-                            MainPage.Select.itemSelected = NavItemChoice;
-                            break;
+                            if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "LocD_IC")
+                            {
+                                MainPage.Select.itemSelected = NavItemChoice;
+                                break;
+                            }
                         }
                     }
+                    GenericFileBrowser.P.path = (History.HistoryList[History.HistoryList.Count - 1]);
                     ItemViewModel.ViewModel = new ItemViewModel(History.HistoryList[History.HistoryList.Count - 1], GenericFileBrowser.GFBPageName); // To take into account the correct index without interference from the folder being navigated to
+
                 }
 
                 if (History.ForwardList.Count == 0)
diff --git a/Package.appxmanifest b/Package.appxmanifest
@@ -1,5 +1,5 @@
 ﻿<?xml version="1.0" encoding="utf-8"?>
-<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" IgnorableNamespaces="uap mp rescap desktop4">
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" xmlns:mp="http://schemas.microsoft.com/appx/2014/phone/manifest" xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10" xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" xmlns:desktop4="http://schemas.microsoft.com/appx/manifest/desktop/windows10/4" xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" xmlns:uap3="http://schemas.microsoft.com/appx/manifest/uap/windows10/3" xmlns:uap4="http://schemas.microsoft.com/appx/manifest/uap/windows10/4" IgnorableNamespaces="uap mp rescap desktop4 desktop uap3 uap4">
   <Identity Name="cd15f916-6036-4135-8201-430a5c5547dd" Publisher="CN=lukeb" Version="0.4.5.0" />
   <mp:PhoneIdentity PhoneProductId="cd15f916-6036-4135-8201-430a5c5547dd" PhonePublisherId="00000000-0000-0000-0000-000000000000" />
   <Properties>
@@ -25,10 +25,18 @@
         </uap:DefaultTile>
         <uap:SplashScreen Image="Assets\SplashScreen.png" BackgroundColor="black" />
       </uap:VisualElements>
+      <!--<Extensions>
+        <desktop:Extension Category="windows.fullTrustProcess" Executable="LegacyLauncher.exe"/>
+        <uap:Extension Category="windows.appService" EntryPoint="MyAppService.ExeNameProvider">
+          <uap3:AppService Name="com.placeholder.here" uap4:SupportsMultipleInstances="true"/>
+        </uap:Extension>
+      </Extensions>-->
     </Application>
   </Applications>
   <Capabilities>
     <Capability Name="internetClient" />
+    <uap:Capability Name="removableStorage" />
+    <!--<rescap:Capability Name="runFullTrust"/>-->
     <rescap:Capability Name="broadFileSystemAccess" />
   </Capabilities>
 </Package>

Original file line number	Diff line number	Diff line change
`@@ -12,6 +12,7 @@`
`12`	`12`	`using Windows.UI.Popups;`
`13`	`13`	`using Interacts;`
`14`	`14`	`using Windows.UI.Xaml.Controls;`
	`15`	`+using Windows.UI.Xaml.Media.Animation;`
`15`	`16`
`16`	`17`	`namespace ItemListPresenter`
`17`	`18`	`{`
`@@ -342,6 +343,13 @@ public async void GetItemsAsync(string path)`
`342`	`343`	`{`
`343`	`344`	`DisplayConsentDialog();`
`344`	`345`	`}`
	`346`	`+ catch (System.Runtime.InteropServices.COMException e)`
	`347`	`+ {`
	`348`	`+ Frame rootFrame = Window.Current.Content as Frame;`
	`349`	`+ MessageDialog driveGone = new MessageDialog(e.Message, "Drive Not Found");`
	`350`	`+ await driveGone.ShowAsync();`
	`351`	`+ rootFrame.Navigate(typeof(MainPage), new SuppressNavigationTransitionInfo());`
	`352`	`+ }`
`345`	`353`	`stopwatch.Stop();`
`346`	`354`	`Debug.WriteLine("Loading of: " + path + " completed in " + stopwatch.ElapsedMilliseconds + " Milliseconds.");`
`347`	`355`
Original file line number	Diff line number	Diff line change
`@@ -154,15 +154,18 @@ public static async void List_ItemClick(object sender, DoubleTappedRoutedEventAr`
`154`	`154`	`}`
`155`	`155`	`else`
`156`	`156`	`{`
`157`		`- GenericFileBrowser.P.path = clickedOnItem.FilePath;`
`158`		`- foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in MainPage.nv.MenuItems)`
	`157`	`+ if (clickedOnItem.FilePath.Contains("C:"))`
`159`	`158`	`{`
`160`		`- if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "LocD_IC")`
	`159`	`+ foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in MainPage.nv.MenuItems)`
`161`	`160`	`{`
`162`		`- MainPage.Select.itemSelected = NavItemChoice;`
`163`		`- break;`
	`161`	`+ if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "LocD_IC")`
	`162`	`+ {`
	`163`	`+ MainPage.Select.itemSelected = NavItemChoice;`
	`164`	`+ break;`
	`165`	`+ }`
`164`	`166`	`}`
`165`	`167`	`}`
	`168`	`+ GenericFileBrowser.P.path = clickedOnItem.FilePath;`
`166`	`169`	`ItemViewModel.ViewModel = new ItemViewModel(clickedOnItem.FilePath, GenericFileBrowser.GFBPageName);`
`167`	`170`	`}`
`168`	`171`	`}`
`@@ -319,6 +322,7 @@ public static async void List_ItemClick(object sender, DoubleTappedRoutedEventAr`
`319`	`322`	`Interaction.message.Commands.Add(new UICommand("Continue...", new UICommandInvokedHandler(Interaction.CommandInvokedHandler)));`
`320`	`323`	`Interaction.message.Commands.Add(new UICommand("Cancel"));`
`321`	`324`	`await Interaction.message.ShowAsync();`
	`325`	`+`
`322`	`326`	`}`
`323`	`327`	`else`
`324`	`328`	`{`
`@@ -492,11 +496,6 @@ private static void Manager_DataRequested(DataTransferManager sender, DataReques`
`492`	`496`
`493`	`497`	`}`
`494`	`498`
`495`		`- public static void ScanItem_Click(object sender, RoutedEventArgs e)`
`496`		`- {`
`497`		`-`
`498`		`- }`
`499`		`-`
`500`	`499`	`public static void DeleteItem_Click(object sender, RoutedEventArgs e)`
`501`	`500`	`{`
`502`	`501`
Original file line number	Diff line number	Diff line change
`@@ -263,16 +263,21 @@ public static void Back_Click(object sender, RoutedEventArgs e)`
`263`	`263`	`}`
`264`	`264`	`else`
`265`	`265`	`{`
`266`		`- GenericFileBrowser.P.path = (History.HistoryList[History.HistoryList.Count - 1]);`
`267`		`- foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in MainPage.nv.MenuItems)`
	`266`	`+`
	`267`	`+ if((History.HistoryList[History.HistoryList.Count - 1]).Contains("C:"))`
`268`	`268`	`{`
`269`		`- if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "LocD_IC")`
	`269`	`+ foreach (Microsoft.UI.Xaml.Controls.NavigationViewItemBase NavItemChoice in MainPage.nv.MenuItems)`
`270`	`270`	`{`
`271`		`- MainPage.Select.itemSelected = NavItemChoice;`
`272`		`- break;`
	`271`	`+ if (NavItemChoice is Microsoft.UI.Xaml.Controls.NavigationViewItem && NavItemChoice.Name.ToString() == "LocD_IC")`
	`272`	`+ {`
	`273`	`+ MainPage.Select.itemSelected = NavItemChoice;`
	`274`	`+ break;`
	`275`	`+ }`
`273`	`276`	`}`
`274`	`277`	`}`
	`278`	`+ GenericFileBrowser.P.path = (History.HistoryList[History.HistoryList.Count - 1]);`
`275`	`279`	`ItemViewModel.ViewModel = new ItemViewModel(History.HistoryList[History.HistoryList.Count - 1], GenericFileBrowser.GFBPageName); // To take into account the correct index without interference from the folder being navigated to`
	`280`	`+`
`276`	`281`	`}`
`277`	`282`
`278`	`283`	`if (History.ForwardList.Count == 0)`