merge PR #94: Explorer plugin enhancements

JohnTheGr8 · web-flow · commit 97ca6269b2c0 · 2020-06-30T18:43:43.000+03:00
diff --git a/Flow.Launcher.Plugin/Result.cs b/Flow.Launcher.Plugin/Result.cs
@@ -130,5 +130,15 @@ public Result() { }
         /// Plugin ID that generated this result
         /// </summary>
         public string PluginID { get; internal set; }
+
+        /// <summary>
+        /// Show message as ToolTip on result Title hover over
+        /// </summary>
+        public string TitleToolTip { get; set; }
+
+        /// <summary>
+        /// Show message as ToolTip on result SubTitle hover over
+        /// </summary>
+        public string SubTitleToolTip { get; set; }
     }
 }
diff --git a/Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs b/Flow.Launcher.Plugin/SharedCommands/FilesFolders.cs
@@ -8,6 +8,9 @@ namespace Flow.Launcher.Plugin.SharedCommands
     public static class FilesFolders
     {
         private const string FileExplorerProgramName = "explorer";
+
+        private const string FileExplorerProgramEXE = "explorer.exe";
+
         public static void Copy(this string sourcePath, string targetPath)
         {
             // Get the subdirectories for the specified directory.
@@ -128,6 +131,11 @@ public static void OpenPath(string fileOrFolderPath)
             }
         }
 
+        public static void OpenContainingFolder(string path)
+        {
+            Process.Start(FileExplorerProgramEXE, $" /select,\"{path}\"");
+        }
+
         ///<summary>
         /// This checks whether a given string is a directory path or network location string. 
         /// It does not check if location actually exists.
diff --git a/Flow.Launcher/ResultListBox.xaml b/Flow.Launcher/ResultListBox.xaml
@@ -62,7 +62,7 @@
                                 </TextBlock>
                             </StackPanel>
                             <TextBlock Style="{DynamicResource ItemTitleStyle}" DockPanel.Dock="Left"
-                                       VerticalAlignment="Center" ToolTip="{Binding Result.Title}" x:Name="Title"
+                                       VerticalAlignment="Center" ToolTip="{Binding ShowTitleToolTip}" x:Name="Title"
                                        Text="{Binding Result.Title}">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
@@ -71,7 +71,7 @@
                                     </MultiBinding>
                                 </vm:ResultsViewModel.FormattedText>
                             </TextBlock>
-                            <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding Result.SubTitle}"
+                            <TextBlock Style="{DynamicResource ItemSubTitleStyle}" ToolTip="{Binding ShowSubTitleToolTip}"
                                        Grid.Row="1" x:Name="SubTitle" Text="{Binding Result.SubTitle}" MinWidth="750">
                                 <vm:ResultsViewModel.FormattedText>
                                     <MultiBinding Converter="{StaticResource HighlightTextConverter}">
diff --git a/Flow.Launcher/ViewModel/ResultViewModel.cs b/Flow.Launcher/ViewModel/ResultViewModel.cs
@@ -29,6 +29,14 @@ public ResultViewModel(Result result, Settings settings)
 
         public string OpenResultModifiers => Settings.OpenResultModifiers;
 
+        public string ShowTitleToolTip => string.IsNullOrEmpty(Result.TitleToolTip)
+                                            ? Result.Title 
+                                            : Result.TitleToolTip;
+
+        public string ShowSubTitleToolTip => string.IsNullOrEmpty(Result.SubTitleToolTip)
+                                                ? Result.SubTitle 
+                                                : Result.SubTitleToolTip;
+
         public ImageSource Image
         {
             get
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -156,7 +156,7 @@ private Result CreateOpenContainingFolderResult(SearchResult record)
                 {
                     try
                     {
-                        Process.Start("explorer.exe", $" /select,\"{record.FullPath}\"");
+                        FilesFolders.OpenContainingFolder(record.FullPath);
                     }
                     catch (Exception e)
                     {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Constants.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Constants.cs
@@ -16,7 +16,9 @@ internal static class Constants
         internal const string DifferentUserIconImagePath = "Images\\user.png";
         internal const string IndexingOptionsIconImagePath = "Images\\windowsindexingoptions.png";
 
-        internal const string DefaultFolderSubtitleString = "Ctrl + Enter to open the directory";
+        internal const string ToolTipOpenDirectory = "Ctrl + Enter to open the directory";
+
+        internal const string ToolTipOpenContainingFolder = "Ctrl + Enter to open the containing folder";
 
         internal const char AllFilesFolderSearchWildcard = '>';
 
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/DirectoryInfo/DirectoryInfoSearch.cs
@@ -65,7 +65,7 @@ private List<Result> DirectorySearch(SearchOption searchOption, Query query, str
 
                     if (fileSystemInfo is System.IO.DirectoryInfo)
                     {
-                        folderList.Add(resultManager.CreateFolderResult(fileSystemInfo.Name, Constants.DefaultFolderSubtitleString, fileSystemInfo.FullName, query, true, false));
+                        folderList.Add(resultManager.CreateFolderResult(fileSystemInfo.Name, fileSystemInfo.FullName, fileSystemInfo.FullName, query, true, false));
                     }
                     else
                     {
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/FolderLinks/QuickFolderAccess.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/FolderLinks/QuickFolderAccess.cs
@@ -12,7 +12,7 @@ internal List<Result> FolderList(Query query, List<FolderLink> folderLinks, Plug
                 return folderLinks
                         .Select(item =>
                                     new ResultManager(context)
-                                            .CreateFolderResult(item.Nickname, Constants.DefaultFolderSubtitleString, item.Path, query))
+                                            .CreateFolderResult(item.Nickname, item.Path, item.Path, query))
                         .ToList();
 
             string search = query.Search.ToLower();
@@ -21,7 +21,7 @@ internal List<Result> FolderList(Query query, List<FolderLink> folderLinks, Plug
 
             return queriedFolderLinks.Select(item =>
                                                 new ResultManager(context)
-                                                        .CreateFolderResult(item.Nickname, Constants.DefaultFolderSubtitleString, item.Path, query))
+                                                        .CreateFolderResult(item.Nickname, item.Path, item.Path, query))
                                      .ToList();
         }
     }
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/ResultManager.cs
@@ -1,6 +1,7 @@
 ﻿using Flow.Launcher.Infrastructure;
 using Flow.Launcher.Plugin.SharedCommands;
 using System;
+using System.Diagnostics;
 using System.IO;
 using System.Linq;
 using System.Windows;
@@ -38,13 +39,15 @@ internal Result CreateFolderResult(string title, string subtitle, string path, Q
                             return false;
                         }
                     }
-                    
+
                     string changeTo = path.EndsWith(Constants.DirectorySeperator) ? path : path + Constants.DirectorySeperator;
                     context.API.ChangeQuery(string.IsNullOrEmpty(query.ActionKeyword) ?
                         changeTo :
                         query.ActionKeyword + " " + changeTo);
                     return false;
                 },
+                TitleToolTip = Constants.ToolTipOpenDirectory,
+                SubTitleToolTip = Constants.ToolTipOpenDirectory,
                 ContextData = new SearchResult { Type = ResultType.Folder, FullPath = path, ShowIndexState = showIndexState, WindowsIndexed = windowsIndexed }
             };
         }
@@ -85,6 +88,8 @@ internal Result CreateOpenCurrentFolderResult(string path, bool windowsIndexed =
                     FilesFolders.OpenPath(retrievedDirectoryPath);
                     return true;
                 },
+                TitleToolTip = retrievedDirectoryPath,
+                SubTitleToolTip = retrievedDirectoryPath,
                 ContextData = new SearchResult { Type = ResultType.Folder, FullPath = retrievedDirectoryPath, ShowIndexState = true, WindowsIndexed = windowsIndexed }
             };
         }
@@ -101,7 +106,14 @@ internal Result CreateFileResult(string filePath, Query query, bool showIndexSta
                 {
                     try
                     {
-                        FilesFolders.OpenPath(filePath);
+                        if (c.SpecialKeyState.CtrlPressed)
+                        {
+                            FilesFolders.OpenContainingFolder(filePath);
+                        }
+                        else
+                        {
+                            FilesFolders.OpenPath(filePath);
+                        }
                     }
                     catch (Exception ex)
                     {
@@ -110,6 +122,8 @@ internal Result CreateFileResult(string filePath, Query query, bool showIndexSta
 
                     return true;
                 },
+                TitleToolTip = Constants.ToolTipOpenContainingFolder,
+                SubTitleToolTip = Constants.ToolTipOpenContainingFolder,
                 ContextData = new SearchResult { Type = ResultType.File, FullPath = filePath, ShowIndexState = showIndexState, WindowsIndexed = windowsIndexed }
             };
             return result;
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/WindowsIndex/IndexSearch.cs
@@ -54,8 +54,8 @@ internal List<Result> ExecuteWindowsIndexSearch(string indexQueryString, string
                                         if (dataReaderResults.GetString(2) == "Directory")
                                         {
                                             folderResults.Add(resultManager.CreateFolderResult(
-                                                                                dataReaderResults.GetString(0), 
-                                                                                Constants.DefaultFolderSubtitleString, 
+                                                                                dataReaderResults.GetString(0),
+                                                                                dataReaderResults.GetString(1), 
                                                                                 dataReaderResults.GetString(1), 
                                                                                 query, true, true));
                                         }

Original file line number	Diff line number	Diff line change
`@@ -8,6 +8,9 @@ namespace Flow.Launcher.Plugin.SharedCommands`
`8`	`8`	`public static class FilesFolders`
`9`	`9`	`{`
`10`	`10`	`private const string FileExplorerProgramName = "explorer";`
	`11`	`+`
	`12`	`+ private const string FileExplorerProgramEXE = "explorer.exe";`
	`13`	`+`
`11`	`14`	`public static void Copy(this string sourcePath, string targetPath)`
`12`	`15`	`{`
`13`	`16`	`// Get the subdirectories for the specified directory.`
`@@ -128,6 +131,11 @@ public static void OpenPath(string fileOrFolderPath)`
`128`	`131`	`}`
`129`	`132`	`}`
`130`	`133`
	`134`	`+ public static void OpenContainingFolder(string path)`
	`135`	`+ {`
	`136`	`+ Process.Start(FileExplorerProgramEXE, $" /select,\"{path}\"");`
	`137`	`+ }`
	`138`	`+`
`131`	`139`	`///<summary>`
`132`	`140`	`/// This checks whether a given string is a directory path or network location string.`
`133`	`141`	`/// It does not check if location actually exists.`
Original file line number	Diff line number	Diff line change
`@@ -156,7 +156,7 @@ private Result CreateOpenContainingFolderResult(SearchResult record)`
`156`	`156`	`{`
`157`	`157`	`try`
`158`	`158`	`{`
`159`		`- Process.Start("explorer.exe", $" /select,\"{record.FullPath}\"");`
	`159`	`+ FilesFolders.OpenContainingFolder(record.FullPath);`
`160`	`160`	`}`
`161`	`161`	`catch (Exception e)`
`162`	`162`	`{`
Original file line number	Diff line number	Diff line change
`@@ -65,7 +65,7 @@ private List<Result> DirectorySearch(SearchOption searchOption, Query query, str`
`65`	`65`
`66`	`66`	`if (fileSystemInfo is System.IO.DirectoryInfo)`
`67`	`67`	`{`
`68`		`- folderList.Add(resultManager.CreateFolderResult(fileSystemInfo.Name, Constants.DefaultFolderSubtitleString, fileSystemInfo.FullName, query, true, false));`
	`68`	`+ folderList.Add(resultManager.CreateFolderResult(fileSystemInfo.Name, fileSystemInfo.FullName, fileSystemInfo.FullName, query, true, false));`
`69`	`69`	`}`
`70`	`70`	`else`
`71`	`71`	`{`
Original file line number	Diff line number	Diff line change
`@@ -54,8 +54,8 @@ internal List<Result> ExecuteWindowsIndexSearch(string indexQueryString, string`
`54`	`54`	`if (dataReaderResults.GetString(2) == "Directory")`
`55`	`55`	`{`
`56`	`56`	`folderResults.Add(resultManager.CreateFolderResult(`
`57`		`- dataReaderResults.GetString(0),`
`58`		`- Constants.DefaultFolderSubtitleString,`
	`57`	`+ dataReaderResults.GetString(0),`
	`58`	`+ dataReaderResults.GetString(1),`
`59`	`59`	`dataReaderResults.GetString(1),`
`60`	`60`	`query, true, true));`
`61`	`61`	`}`