rename project items to quick access link naming

jjw24 · jjw24 · commit 3a1d40893ee0 · 2021-01-26T20:31:55.000+11:00
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -7,7 +7,7 @@
 using Flow.Launcher.Infrastructure.Logger;
 using Flow.Launcher.Plugin.SharedCommands;
 using Flow.Launcher.Plugin.Explorer.Search;
-using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;
+using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink;
 using System.Linq;
 using MessageBox = System.Windows.Forms.MessageBox;
 using MessageBoxIcon = System.Windows.Forms.MessageBoxIcon;
@@ -61,7 +61,7 @@ public List<Result> LoadContextMenus(Result selectedResult)
                         {
                             try
                             {
-                                Settings.QuickFolderAccessLinks.Add(new FolderLink { Path = record.FullPath, Type = record.Type });
+                                Settings.QuickFolderAccessLinks.Add(new AccessLink { Path = record.FullPath, Type = record.Type });
 
                                 Context.API.ShowMsg(Context.API.GetTranslation("plugin_explorer_addfilefoldersuccess"),
                                                                             string.Format(
@@ -260,7 +260,7 @@ private Result CreateAddToIndexSearchExclusionListResult(SearchResult record)
                 Action = _ =>
                 {
                     if(!Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => x.Path == record.FullPath))
-                        Settings.IndexSearchExcludedSubdirectoryPaths.Add(new FolderLink { Path = record.FullPath });
+                        Settings.IndexSearchExcludedSubdirectoryPaths.Add(new AccessLink { Path = record.FullPath });
 
                     Task.Run(() =>
                     {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLink/AccessLink.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLink/AccessLink.cs
@@ -1,11 +1,10 @@
 ﻿using System;
 using System.Linq;
-using System.Text.Json;
 using System.Text.Json.Serialization;
 
-namespace Flow.Launcher.Plugin.Explorer.Search.FolderLinks
+namespace Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink
 {
-    public class FolderLink
+    public class AccessLink
     {
         public string Path { get; set; }
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLink/QuickAccess.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/QuickAccessLink/QuickAccess.cs
@@ -2,18 +2,18 @@
 using System.Collections.Generic;
 using System.Linq;
 
-namespace Flow.Launcher.Plugin.Explorer.Search.FolderLinks
+namespace Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink
 {
-    public class QuickFolderAccess
+    public class QuickAccess
     {
         private readonly ResultManager resultManager;
 
-        public QuickFolderAccess(PluginInitContext context)
+        public QuickAccess(PluginInitContext context)
         {
             resultManager = new ResultManager(context);
         }
 
-        internal List<Result> FolderListMatched(Query query, List<FolderLink> folderLinks)
+        internal List<Result> FolderListMatched(Query query, List<AccessLink> folderLinks)
         {
             if (string.IsNullOrEmpty(query.Search))
                 return new List<Result>();
@@ -37,7 +37,7 @@ internal List<Result> FolderListMatched(Query query, List<FolderLink> folderLink
                 .ToList();
         }
 
-        internal List<Result> FolderListAll(Query query, List<FolderLink> folderLinks)
+        internal List<Result> FolderListAll(Query query, List<AccessLink> folderLinks)
             => folderLinks
                 .Where(x => x.Type == ResultType.Folder)
                 .Select(item => 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs
@@ -1,5 +1,5 @@
 ﻿using Flow.Launcher.Plugin.Explorer.Search.DirectoryInfo;
-using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;
+using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink;
 using Flow.Launcher.Plugin.Explorer.Search.WindowsIndex;
 using Flow.Launcher.Plugin.SharedCommands;
 using System;
@@ -16,7 +16,7 @@ public class SearchManager
 
         private readonly IndexSearch indexSearch;
 
-        private readonly QuickFolderAccess quickFolderAccess;
+        private readonly QuickAccess quickFolderAccess;
 
         private readonly ResultManager resultManager;
 
@@ -28,7 +28,7 @@ public SearchManager(Settings settings, PluginInitContext context)
             indexSearch = new IndexSearch(context);
             resultManager = new ResultManager(context);
             this.settings = settings;
-            quickFolderAccess = new QuickFolderAccess(context);
+            quickFolderAccess = new QuickAccess(context);
         }
 
         internal async Task<List<Result>> SearchAsync(Query query, CancellationToken token)
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Settings.cs
@@ -1,5 +1,5 @@
 ﻿using Flow.Launcher.Plugin.Explorer.Search;
-using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;
+using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink;
 using System.Collections.Generic;
 
 namespace Flow.Launcher.Plugin.Explorer
@@ -8,11 +8,11 @@ public class Settings
     {
         public int MaxResult { get; set; } = 100;
 
-        public List<FolderLink> QuickFolderAccessLinks { get; set; } = new List<FolderLink>();
+        public List<AccessLink> QuickFolderAccessLinks { get; set; } = new List<AccessLink>();
 
         public bool UseWindowsIndexForDirectorySearch { get; set; } = true;
 
-        public List<FolderLink> IndexSearchExcludedSubdirectoryPaths { get; set; } = new List<FolderLink>();
+        public List<AccessLink> IndexSearchExcludedSubdirectoryPaths { get; set; } = new List<AccessLink>();
 
         public string SearchActionKeyword { get; set; } = Query.GlobalPluginWildcardSign;
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ViewModels/SettingsViewModel.cs
@@ -1,7 +1,7 @@
 ﻿using Flow.Launcher.Core.Plugin;
 using Flow.Launcher.Infrastructure.Storage;
 using Flow.Launcher.Plugin.Explorer.Search;
-using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;
+using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink;
 using System.Diagnostics;
 using System.Threading.Tasks;
 
@@ -32,9 +32,9 @@ public void Save()
             storage.Save();
         }
 
-        internal void RemoveFolderLinkFromQuickFolders(FolderLink selectedRow) => Settings.QuickFolderAccessLinks.Remove(selectedRow);
+        internal void RemoveFolderLinkFromQuickFolders(AccessLink selectedRow) => Settings.QuickFolderAccessLinks.Remove(selectedRow);
 
-        internal void RemoveFolderLinkFromExcludedIndexPaths(FolderLink selectedRow) => Settings.IndexSearchExcludedSubdirectoryPaths.Remove(selectedRow);
+        internal void RemoveFolderLinkFromExcludedIndexPaths(AccessLink selectedRow) => Settings.IndexSearchExcludedSubdirectoryPaths.Remove(selectedRow);
 
         internal void OpenWindowsIndexingOptions()
         {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Views/ExplorerSettings.xaml.cs
@@ -1,4 +1,4 @@
-using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;
+using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink;
 using Flow.Launcher.Plugin.Explorer.ViewModels;
 using System;
 using System.Collections.Generic;
@@ -161,7 +161,7 @@ private void expExcludedPaths_Click(object sender, RoutedEventArgs e)
 
         private void btnDelete_Click(object sender, RoutedEventArgs e)
         {
-            var selectedRow = lbxFolderLinks.SelectedItem as FolderLink?? lbxExcludedPaths.SelectedItem as FolderLink;
+            var selectedRow = lbxFolderLinks.SelectedItem as AccessLink?? lbxExcludedPaths.SelectedItem as AccessLink;
 
             if (selectedRow != null)
             {
@@ -199,7 +199,7 @@ private void btnEdit_Click(object sender, RoutedEventArgs e)
             }
             else
             {
-                var selectedRow = lbxFolderLinks.SelectedItem as FolderLink ?? lbxExcludedPaths.SelectedItem as FolderLink;
+                var selectedRow = lbxFolderLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;
 
                 if (selectedRow != null)
                 {
@@ -235,7 +235,7 @@ private void btnAdd_Click(object sender, RoutedEventArgs e)
             var folderBrowserDialog = new FolderBrowserDialog();
             if (folderBrowserDialog.ShowDialog() == DialogResult.OK)
             {
-                var newFolderLink = new FolderLink
+                var newFolderLink = new AccessLink
                 {
                     Path = folderBrowserDialog.SelectedPath
                 };
@@ -253,13 +253,13 @@ private void lbxFolders_Drop(object sender, DragEventArgs e)
             if (files != null && files.Count() > 0)
             {
                 if (expFolderLinks.IsExpanded && viewModel.Settings.QuickFolderAccessLinks == null)
-                    viewModel.Settings.QuickFolderAccessLinks = new List<FolderLink>();
+                    viewModel.Settings.QuickFolderAccessLinks = new List<AccessLink>();
 
                 foreach (string s in files)
                 {
                     if (Directory.Exists(s))
                     {
-                        var newFolderLink = new FolderLink
+                        var newFolderLink = new AccessLink
                         {
                             Path = s
                         };
@@ -272,13 +272,13 @@ private void lbxFolders_Drop(object sender, DragEventArgs e)
             }
         }
 
-        private void AddFolderLink(FolderLink newFolderLink)
+        private void AddFolderLink(AccessLink newFolderLink)
         {
             if (expFolderLinks.IsExpanded
                     && !viewModel.Settings.QuickFolderAccessLinks.Any(x => x.Path == newFolderLink.Path))
             {
                 if (viewModel.Settings.QuickFolderAccessLinks == null)
-                    viewModel.Settings.QuickFolderAccessLinks = new List<FolderLink>();
+                    viewModel.Settings.QuickFolderAccessLinks = new List<AccessLink>();
 
                 viewModel.Settings.QuickFolderAccessLinks.Add(newFolderLink);
             }
@@ -287,7 +287,7 @@ private void AddFolderLink(FolderLink newFolderLink)
                 && !viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => x.Path == newFolderLink.Path))
             {
                 if (viewModel.Settings.IndexSearchExcludedSubdirectoryPaths == null)
-                    viewModel.Settings.IndexSearchExcludedSubdirectoryPaths = new List<FolderLink>();
+                    viewModel.Settings.IndexSearchExcludedSubdirectoryPaths = new List<AccessLink>();
 
                 viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Add(newFolderLink);
             }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`using Flow.Launcher.Infrastructure.Logger;`
`8`	`8`	`using Flow.Launcher.Plugin.SharedCommands;`
`9`	`9`	`using Flow.Launcher.Plugin.Explorer.Search;`
`10`		`-using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;`
	`10`	`+using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink;`
`11`	`11`	`using System.Linq;`
`12`	`12`	`using MessageBox = System.Windows.Forms.MessageBox;`
`13`	`13`	`using MessageBoxIcon = System.Windows.Forms.MessageBoxIcon;`
`@@ -61,7 +61,7 @@ public List<Result> LoadContextMenus(Result selectedResult)`
`61`	`61`	`{`
`62`	`62`	`try`
`63`	`63`	`{`
`64`		`- Settings.QuickFolderAccessLinks.Add(new FolderLink { Path = record.FullPath, Type = record.Type });`
	`64`	`+ Settings.QuickFolderAccessLinks.Add(new AccessLink { Path = record.FullPath, Type = record.Type });`
`65`	`65`
`66`	`66`	`Context.API.ShowMsg(Context.API.GetTranslation("plugin_explorer_addfilefoldersuccess"),`
`67`	`67`	`string.Format(`
`@@ -260,7 +260,7 @@ private Result CreateAddToIndexSearchExclusionListResult(SearchResult record)`
`260`	`260`	`Action = _ =>`
`261`	`261`	`{`
`262`	`262`	`if(!Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => x.Path == record.FullPath))`
`263`		`- Settings.IndexSearchExcludedSubdirectoryPaths.Add(new FolderLink { Path = record.FullPath });`
	`263`	`+ Settings.IndexSearchExcludedSubdirectoryPaths.Add(new AccessLink { Path = record.FullPath });`
`264`	`264`
`265`	`265`	`Task.Run(() =>`
`266`	`266`	`{`
Original file line number	Diff line number	Diff line change
`@@ -1,11 +1,10 @@`
`1`	`1`	`using System;`
`2`	`2`	`using System.Linq;`
`3`		`-using System.Text.Json;`
`4`	`3`	`using System.Text.Json.Serialization;`
`5`	`4`
`6`		`-namespace Flow.Launcher.Plugin.Explorer.Search.FolderLinks`
	`5`	`+namespace Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink`
`7`	`6`	`{`
`8`		`- public class FolderLink`
	`7`	`+ public class AccessLink`
`9`	`8`	`{`
`10`	`9`	`public string Path { get; set; }`
`11`	`10`
Original file line number	Diff line number	Diff line change
`@@ -2,18 +2,18 @@`
`2`	`2`	`using System.Collections.Generic;`
`3`	`3`	`using System.Linq;`
`4`	`4`
`5`		`-namespace Flow.Launcher.Plugin.Explorer.Search.FolderLinks`
	`5`	`+namespace Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink`
`6`	`6`	`{`
`7`		`- public class QuickFolderAccess`
	`7`	`+ public class QuickAccess`
`8`	`8`	`{`
`9`	`9`	`private readonly ResultManager resultManager;`
`10`	`10`
`11`		`- public QuickFolderAccess(PluginInitContext context)`
	`11`	`+ public QuickAccess(PluginInitContext context)`
`12`	`12`	`{`
`13`	`13`	`resultManager = new ResultManager(context);`
`14`	`14`	`}`
`15`	`15`
`16`		`- internal List<Result> FolderListMatched(Query query, List<FolderLink> folderLinks)`
	`16`	`+ internal List<Result> FolderListMatched(Query query, List<AccessLink> folderLinks)`
`17`	`17`	`{`
`18`	`18`	`if (string.IsNullOrEmpty(query.Search))`
`19`	`19`	`return new List<Result>();`
`@@ -37,7 +37,7 @@ internal List<Result> FolderListMatched(Query query, List<FolderLink> folderLink`
`37`	`37`	`.ToList();`
`38`	`38`	`}`
`39`	`39`
`40`		`- internal List<Result> FolderListAll(Query query, List<FolderLink> folderLinks)`
	`40`	`+ internal List<Result> FolderListAll(Query query, List<AccessLink> folderLinks)`
`41`	`41`	`=> folderLinks`
`42`	`42`	`.Where(x => x.Type == ResultType.Folder)`
`43`	`43`	`.Select(item =>`
Original file line number	Diff line number	Diff line change
`@@ -1,4 +1,4 @@`
`1`		`-using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;`
	`1`	`+using Flow.Launcher.Plugin.Explorer.Search.QuickAccessLink;`
`2`	`2`	`using Flow.Launcher.Plugin.Explorer.ViewModels;`
`3`	`3`	`using System;`
`4`	`4`	`using System.Collections.Generic;`
`@@ -161,7 +161,7 @@ private void expExcludedPaths_Click(object sender, RoutedEventArgs e)`
`161`	`161`
`162`	`162`	`private void btnDelete_Click(object sender, RoutedEventArgs e)`
`163`	`163`	`{`
`164`		`- var selectedRow = lbxFolderLinks.SelectedItem as FolderLink?? lbxExcludedPaths.SelectedItem as FolderLink;`
	`164`	`+ var selectedRow = lbxFolderLinks.SelectedItem as AccessLink?? lbxExcludedPaths.SelectedItem as AccessLink;`
`165`	`165`
`166`	`166`	`if (selectedRow != null)`
`167`	`167`	`{`
`@@ -199,7 +199,7 @@ private void btnEdit_Click(object sender, RoutedEventArgs e)`
`199`	`199`	`}`
`200`	`200`	`else`
`201`	`201`	`{`
`202`		`- var selectedRow = lbxFolderLinks.SelectedItem as FolderLink ?? lbxExcludedPaths.SelectedItem as FolderLink;`
	`202`	`+ var selectedRow = lbxFolderLinks.SelectedItem as AccessLink ?? lbxExcludedPaths.SelectedItem as AccessLink;`
`203`	`203`
`204`	`204`	`if (selectedRow != null)`
`205`	`205`	`{`
`@@ -235,7 +235,7 @@ private void btnAdd_Click(object sender, RoutedEventArgs e)`
`235`	`235`	`var folderBrowserDialog = new FolderBrowserDialog();`
`236`	`236`	`if (folderBrowserDialog.ShowDialog() == DialogResult.OK)`
`237`	`237`	`{`
`238`		`- var newFolderLink = new FolderLink`
	`238`	`+ var newFolderLink = new AccessLink`
`239`	`239`	`{`
`240`	`240`	`Path = folderBrowserDialog.SelectedPath`
`241`	`241`	`};`
`@@ -253,13 +253,13 @@ private void lbxFolders_Drop(object sender, DragEventArgs e)`
`253`	`253`	`if (files != null && files.Count() > 0)`
`254`	`254`	`{`
`255`	`255`	`if (expFolderLinks.IsExpanded && viewModel.Settings.QuickFolderAccessLinks == null)`
`256`		`- viewModel.Settings.QuickFolderAccessLinks = new List<FolderLink>();`
	`256`	`+ viewModel.Settings.QuickFolderAccessLinks = new List<AccessLink>();`
`257`	`257`
`258`	`258`	`foreach (string s in files)`
`259`	`259`	`{`
`260`	`260`	`if (Directory.Exists(s))`
`261`	`261`	`{`
`262`		`- var newFolderLink = new FolderLink`
	`262`	`+ var newFolderLink = new AccessLink`
`263`	`263`	`{`
`264`	`264`	`Path = s`
`265`	`265`	`};`
`@@ -272,13 +272,13 @@ private void lbxFolders_Drop(object sender, DragEventArgs e)`
`272`	`272`	`}`
`273`	`273`	`}`
`274`	`274`
`275`		`- private void AddFolderLink(FolderLink newFolderLink)`
	`275`	`+ private void AddFolderLink(AccessLink newFolderLink)`
`276`	`276`	`{`
`277`	`277`	`if (expFolderLinks.IsExpanded`
`278`	`278`	`&& !viewModel.Settings.QuickFolderAccessLinks.Any(x => x.Path == newFolderLink.Path))`
`279`	`279`	`{`
`280`	`280`	`if (viewModel.Settings.QuickFolderAccessLinks == null)`
`281`		`- viewModel.Settings.QuickFolderAccessLinks = new List<FolderLink>();`
	`281`	`+ viewModel.Settings.QuickFolderAccessLinks = new List<AccessLink>();`
`282`	`282`
`283`	`283`	`viewModel.Settings.QuickFolderAccessLinks.Add(newFolderLink);`
`284`	`284`	`}`
`@@ -287,7 +287,7 @@ private void AddFolderLink(FolderLink newFolderLink)`
`287`	`287`	`&& !viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => x.Path == newFolderLink.Path))`
`288`	`288`	`{`
`289`	`289`	`if (viewModel.Settings.IndexSearchExcludedSubdirectoryPaths == null)`
`290`		`- viewModel.Settings.IndexSearchExcludedSubdirectoryPaths = new List<FolderLink>();`
	`290`	`+ viewModel.Settings.IndexSearchExcludedSubdirectoryPaths = new List<AccessLink>();`
`291`	`291`
`292`	`292`	`viewModel.Settings.IndexSearchExcludedSubdirectoryPaths.Add(newFolderLink);`
`293`	`293`	`}`