refactor folder and files addition

ashikns · ashikns · commit 3191f66cc0c3 · 2019-03-06T03:05:41.000+05:30
diff --git a/Files UWP/Filesystem/ItemViewModel.cs b/Files UWP/Filesystem/ItemViewModel.cs
diff --git a/Files UWP/GenericFileBrowser.xaml.cs b/Files UWP/GenericFileBrowser.xaml.cs
@@ -332,9 +332,9 @@ private async void VisiblePath_TextChanged(object sender, KeyRoutedEventArgs e)
                 var CurrentInput = PathBox.Text;
                 if (CurrentInput != App.ViewModel.Universal.path)
                 {
-                    if (App.ViewModel.tokenSource != null)
+                    if (!App.ViewModel.TokenSource.IsCancellationRequested)
                     {
-                        App.ViewModel.tokenSource.Cancel();
+                        App.ViewModel.TokenSource.Cancel();
                         App.ViewModel.FilesAndFolders.Clear();
                     }
 
diff --git a/Files UWP/MainPage.xaml.cs b/Files UWP/MainPage.xaml.cs
@@ -151,9 +151,9 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende
             }
             else
             {
-                if(App.ViewModel.tokenSource != null)
+                if (!App.ViewModel.TokenSource.IsCancellationRequested)
                 {
-                    App.ViewModel.tokenSource.Cancel();
+                    App.ViewModel.TokenSource.Cancel();
                     App.ViewModel.FilesAndFolders.Clear();
                 }
                 App.ViewModel.TextState.isVisible = Visibility.Collapsed;
diff --git a/Files UWP/Navigation/NavigationActions.cs b/Files UWP/Navigation/NavigationActions.cs
@@ -11,9 +11,9 @@ public class NavigationActions
     {
         public static void Back_Click(object sender, RoutedEventArgs e)
         {
-            if(App.ViewModel.tokenSource != null)
+            if (!App.ViewModel.TokenSource.IsCancellationRequested)
             {
-                App.ViewModel.tokenSource.Cancel();
+                App.ViewModel.TokenSource.Cancel();
             }
             App.ViewModel.FilesAndFolders.Clear();
 
@@ -160,13 +160,11 @@ public static void Back_Click(object sender, RoutedEventArgs e)
 
         public static void Forward_Click(object sender, RoutedEventArgs e)
         {
-            
-            if(App.ViewModel.tokenSource != null)
+            if (!App.ViewModel.TokenSource.IsCancellationRequested)
             {
-                App.ViewModel.tokenSource.Cancel();
+                App.ViewModel.TokenSource.Cancel();
             }
             App.ViewModel.FilesAndFolders.Clear();
-            
 
             if (History.ForwardList.Count() > 0)
             {
@@ -313,9 +311,9 @@ public async static void Refresh_Click(object sender, RoutedEventArgs e)
         {
             await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             {
-                if(App.ViewModel.tokenSource != null)
+                if (!App.ViewModel.TokenSource.IsCancellationRequested)
                 {
-                    App.ViewModel.tokenSource.Cancel();
+                    App.ViewModel.TokenSource.Cancel();
                 }
                 App.ViewModel.TextState.isVisible = Visibility.Collapsed;
                 App.ViewModel.FilesAndFolders.Clear();
diff --git a/Files UWP/Navigation/PhotoAlbumNavActions.cs b/Files UWP/Navigation/PhotoAlbumNavActions.cs
@@ -13,10 +13,9 @@ public class PhotoAlbumNavActions
     {
         public static void Back_Click(object sender, RoutedEventArgs e)
         {
-            
-            if(App.ViewModel.tokenSource != null)
+            if (!App.ViewModel.TokenSource.IsCancellationRequested)
             {
-                App.ViewModel.tokenSource.Cancel();
+                App.ViewModel.TokenSource.Cancel();
             }
             App.ViewModel.FilesAndFolders.Clear();
             
@@ -161,9 +160,9 @@ public static void Back_Click(object sender, RoutedEventArgs e)
 
         public static void Forward_Click(object sender, RoutedEventArgs e)
         {
-            if(App.ViewModel.tokenSource != null)
+            if (!App.ViewModel.TokenSource.IsCancellationRequested)
             {
-                App.ViewModel.tokenSource.Cancel();
+                App.ViewModel.TokenSource.Cancel();
             }
             App.ViewModel.FilesAndFolders.Clear();
 
@@ -311,9 +310,9 @@ public async static void Refresh_Click(object sender, RoutedEventArgs e)
         {
             await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>
             {
-                if(App.ViewModel.tokenSource != null)
+                if (!App.ViewModel.TokenSource.IsCancellationRequested)
                 {
-                    App.ViewModel.tokenSource.Cancel();
+                    App.ViewModel.TokenSource.Cancel();
                 }
                 App.ViewModel.TextState.isVisible = Visibility.Collapsed;
                 App.ViewModel.FilesAndFolders.Clear();
diff --git a/Files UWP/PhotoAlbum.xaml.cs b/Files UWP/PhotoAlbum.xaml.cs
@@ -129,9 +129,9 @@ private async void VisiblePath_TextChanged(object sender, KeyRoutedEventArgs e)
                 var CurrentInput = PathBox.Text;
                 if (CurrentInput != App.ViewModel.Universal.path)
                 {
-                    if (App.ViewModel.tokenSource != null)
+                    if (!App.ViewModel.TokenSource.IsCancellationRequested)
                     {
-                        App.ViewModel.tokenSource.Cancel();
+                        App.ViewModel.TokenSource.Cancel();
                         App.ViewModel.FilesAndFolders.Clear();
                     }
 

Original file line number	Diff line number	Diff line change
`@@ -332,9 +332,9 @@ private async void VisiblePath_TextChanged(object sender, KeyRoutedEventArgs e)`
`332`	`332`	`var CurrentInput = PathBox.Text;`
`333`	`333`	`if (CurrentInput != App.ViewModel.Universal.path)`
`334`	`334`	`{`
`335`		`- if (App.ViewModel.tokenSource != null)`
	`335`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`336`	`336`	`{`
`337`		`- App.ViewModel.tokenSource.Cancel();`
	`337`	`+ App.ViewModel.TokenSource.Cancel();`
`338`	`338`	`App.ViewModel.FilesAndFolders.Clear();`
`339`	`339`	`}`
`340`	`340`
Original file line number	Diff line number	Diff line change
`@@ -151,9 +151,9 @@ private void NavView_ItemInvoked(Microsoft.UI.Xaml.Controls.NavigationView sende`
`151`	`151`	`}`
`152`	`152`	`else`
`153`	`153`	`{`
`154`		`- if(App.ViewModel.tokenSource != null)`
	`154`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`155`	`155`	`{`
`156`		`- App.ViewModel.tokenSource.Cancel();`
	`156`	`+ App.ViewModel.TokenSource.Cancel();`
`157`	`157`	`App.ViewModel.FilesAndFolders.Clear();`
`158`	`158`	`}`
`159`	`159`	`App.ViewModel.TextState.isVisible = Visibility.Collapsed;`
Original file line number	Diff line number	Diff line change
`@@ -11,9 +11,9 @@ public class NavigationActions`
`11`	`11`	`{`
`12`	`12`	`public static void Back_Click(object sender, RoutedEventArgs e)`
`13`	`13`	`{`
`14`		`- if(App.ViewModel.tokenSource != null)`
	`14`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`15`	`15`	`{`
`16`		`- App.ViewModel.tokenSource.Cancel();`
	`16`	`+ App.ViewModel.TokenSource.Cancel();`
`17`	`17`	`}`
`18`	`18`	`App.ViewModel.FilesAndFolders.Clear();`
`19`	`19`
`@@ -160,13 +160,11 @@ public static void Back_Click(object sender, RoutedEventArgs e)`
`160`	`160`
`161`	`161`	`public static void Forward_Click(object sender, RoutedEventArgs e)`
`162`	`162`	`{`
`163`		`-`
`164`		`- if(App.ViewModel.tokenSource != null)`
	`163`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`165`	`164`	`{`
`166`		`- App.ViewModel.tokenSource.Cancel();`
	`165`	`+ App.ViewModel.TokenSource.Cancel();`
`167`	`166`	`}`
`168`	`167`	`App.ViewModel.FilesAndFolders.Clear();`
`169`		`-`
`170`	`168`
`171`	`169`	`if (History.ForwardList.Count() > 0)`
`172`	`170`	`{`
`@@ -313,9 +311,9 @@ public async static void Refresh_Click(object sender, RoutedEventArgs e)`
`313`	`311`	`{`
`314`	`312`	`await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>`
`315`	`313`	`{`
`316`		`- if(App.ViewModel.tokenSource != null)`
	`314`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`317`	`315`	`{`
`318`		`- App.ViewModel.tokenSource.Cancel();`
	`316`	`+ App.ViewModel.TokenSource.Cancel();`
`319`	`317`	`}`
`320`	`318`	`App.ViewModel.TextState.isVisible = Visibility.Collapsed;`
`321`	`319`	`App.ViewModel.FilesAndFolders.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -13,10 +13,9 @@ public class PhotoAlbumNavActions`
`13`	`13`	`{`
`14`	`14`	`public static void Back_Click(object sender, RoutedEventArgs e)`
`15`	`15`	`{`
`16`		`-`
`17`		`- if(App.ViewModel.tokenSource != null)`
	`16`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`18`	`17`	`{`
`19`		`- App.ViewModel.tokenSource.Cancel();`
	`18`	`+ App.ViewModel.TokenSource.Cancel();`
`20`	`19`	`}`
`21`	`20`	`App.ViewModel.FilesAndFolders.Clear();`
`22`	`21`
`@@ -161,9 +160,9 @@ public static void Back_Click(object sender, RoutedEventArgs e)`
`161`	`160`
`162`	`161`	`public static void Forward_Click(object sender, RoutedEventArgs e)`
`163`	`162`	`{`
`164`		`- if(App.ViewModel.tokenSource != null)`
	`163`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`165`	`164`	`{`
`166`		`- App.ViewModel.tokenSource.Cancel();`
	`165`	`+ App.ViewModel.TokenSource.Cancel();`
`167`	`166`	`}`
`168`	`167`	`App.ViewModel.FilesAndFolders.Clear();`
`169`	`168`
`@@ -311,9 +310,9 @@ public async static void Refresh_Click(object sender, RoutedEventArgs e)`
`311`	`310`	`{`
`312`	`311`	`await Windows.ApplicationModel.Core.CoreApplication.MainView.CoreWindow.Dispatcher.RunAsync(CoreDispatcherPriority.Normal, () =>`
`313`	`312`	`{`
`314`		`- if(App.ViewModel.tokenSource != null)`
	`313`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`315`	`314`	`{`
`316`		`- App.ViewModel.tokenSource.Cancel();`
	`315`	`+ App.ViewModel.TokenSource.Cancel();`
`317`	`316`	`}`
`318`	`317`	`App.ViewModel.TextState.isVisible = Visibility.Collapsed;`
`319`	`318`	`App.ViewModel.FilesAndFolders.Clear();`
Original file line number	Diff line number	Diff line change
`@@ -129,9 +129,9 @@ private async void VisiblePath_TextChanged(object sender, KeyRoutedEventArgs e)`
`129`	`129`	`var CurrentInput = PathBox.Text;`
`130`	`130`	`if (CurrentInput != App.ViewModel.Universal.path)`
`131`	`131`	`{`
`132`		`- if (App.ViewModel.tokenSource != null)`
	`132`	`+ if (!App.ViewModel.TokenSource.IsCancellationRequested)`
`133`	`133`	`{`
`134`		`- App.ViewModel.tokenSource.Cancel();`
	`134`	`+ App.ViewModel.TokenSource.Cancel();`
`135`	`135`	`App.ViewModel.FilesAndFolders.Clear();`
`136`	`136`	`}`
`137`	`137`