Merge branch 'master' into ShowContextMenu

jjw24 · jjw24 · commit 6271305d4f70 · 2022-02-01T08:06:34.000+11:00
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -0,0 +1,29 @@
+name: Build
+
+on:
+  push:
+    branches: [ $default-branch ]
+  pull_request:
+    branches: [ $default-branch ]
+
+jobs:
+  build:
+
+    runs-on: windows-latest
+
+    steps:
+    - uses: actions/checkout@v2
+    - name: Setup .NET
+      uses: actions/setup-dotnet@v1
+      with:
+        dotnet-version: 5.0.x
+    - name: Restore dependencies
+      run: dotnet restore
+    - name: Build
+      run: dotnet build --no-restore -c Release
+    - name: Upload Artifact
+      uses: actions/upload-artifact@v2
+      with:
+        name: Flow.Launcher.Plugin.Everything
+        path: Output/Release/Flow.Launcher.Plugin.Everything
+
diff --git a/EverythingSettings.xaml b/EverythingSettings.xaml
@@ -85,6 +85,7 @@
             ItemsSource="{Binding GetSortOptions, Mode=OneWay}"
             SelectedItem="{Binding SortOption}"
             SelectionChanged="onSelectionChange">
+                  ItemsSource="{Binding GetSortOptions, Mode=OneWay}"
             <ComboBox.ItemTemplate>
                 <DataTemplate>
                     <Grid>
diff --git a/Flow.Launcher.Plugin.Everything.csproj b/Flow.Launcher.Plugin.Everything.csproj
@@ -52,9 +52,9 @@
     </Content>
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="Flow.Launcher.Plugin" Version="2.0.0" />
+    <PackageReference Include="Flow.Launcher.Plugin" Version="2.1.0" />
     <PackageReference Include="Droplex" Version="1.4.0" />
-    <PackageReference Include="JetBrains.Annotations" Version="2021.2.0" />
+    <PackageReference Include="JetBrains.Annotations" Version="2021.3.0" />
     <PackageReference Include="System.Runtime" Version="4.3.1" />
   </ItemGroup>
   <ItemGroup>
diff --git a/Helper/EnumNameConverter.cs b/Helper/EnumNameConverter.cs
@@ -11,8 +11,6 @@ namespace Flow.Launcher.Plugin.Everything.Helper
 {
     class EnumNameConverter : IValueConverter
     {
-        private Dictionary<string, SortOption> translationRecord = new Dictionary<string, SortOption>();
-
         public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
         {
             return value is SortOption option ? option.GetTranslatedName() : value;
diff --git a/Main.cs b/Main.cs
@@ -57,8 +57,8 @@ public List<Result> Query(Query query)
                         IcoPath = "Images\\warning.png",
                         Action = _ =>
                         {
-                            if (FilesFolders.FileExists(_settings.EverythingInstalledPath))
-                                FilesFolders.OpenPath(_settings.EverythingInstalledPath);
+                            if (_settings.EverythingInstalledPath.FileExists())
+                                _context.API.OpenDirectory(_settings.EverythingInstalledPath);
 
                             return true;
                         }
@@ -109,23 +109,25 @@ private Result CreateResult(string keyword, SearchResult searchResult)
                             case ResultType.Folder:
                                 if (!_settings.LaunchHidden)
                                 {
-                                    Process.Start(_settings.ExplorerPath,
-                                        _settings.ExplorerArgs.Replace(Settings.DirectoryPathPlaceHolder, $"\"{path}\""));
+                                    _context.API.OpenDirectory(path);
                                 }
                                 else
                                 {
+                                    // Launch hidden is no longer supported due to API change.
+                                    // This the default behaviour kept 
                                     ProcessStartInfo startInfo = new ProcessStartInfo();
                                     //Hide the process
                                     startInfo.UseShellExecute = false;
                                     startInfo.RedirectStandardOutput = true;
                                     startInfo.WindowStyle = ProcessWindowStyle.Hidden;
                                     startInfo.CreateNoWindow = true;
                                     //Set file and args
-                                    startInfo.FileName = _settings.ExplorerPath;
-                                    startInfo.Arguments = _settings.ExplorerArgs.Replace(Settings.DirectoryPathPlaceHolder, $"\"{path}\"");
+                                    startInfo.FileName = "explorer";
+                                    startInfo.Arguments = $"\"{path}\"";
                                     //Start the process
                                     Process proc = Process.Start(startInfo);
                                 }
+
                                 break;
                             case ResultType.Volume:
                             case ResultType.File:
@@ -158,34 +160,6 @@ private Result CreateResult(string keyword, SearchResult searchResult)
             return r;
         }
 
-        private List<ContextMenu> GetDefaultContextMenu()
-        {
-            List<ContextMenu> defaultContextMenus = new List<ContextMenu>();
-            ContextMenu openFolderContextMenu = new ContextMenu
-            {
-                Name = _context.API.GetTranslation("flowlauncher_plugin_everything_open_containing_folder"),
-                Command = _settings.ExplorerPath,
-                Argument = $"{_settings.ExplorerArgs}",
-                ImagePath = "Images\\folder.png"
-            };
-
-            defaultContextMenus.Add(openFolderContextMenu);
-
-            string editorPath = string.IsNullOrEmpty(_settings.EditorPath) ? "notepad.exe" : _settings.EditorPath;
-
-            ContextMenu openWithEditorContextMenu = new ContextMenu
-            {
-                Name = string.Format(_context.API.GetTranslation("flowlauncher_plugin_everything_open_with_editor"), Path.GetFileNameWithoutExtension(editorPath)),
-                Command = editorPath,
-                Argument = $" {Settings.FilePathPlaceHolder}",
-                ImagePath = editorPath
-            };
-
-            defaultContextMenus.Add(openWithEditorContextMenu);
-
-            return defaultContextMenus;
-        }
-
         public void Init(PluginInitContext context)
         {
             _context = context;
@@ -279,103 +253,109 @@ public string GetTranslatedPluginDescription()
 
         public List<Result> LoadContextMenus(Result selectedResult)
         {
-            SearchResult record = selectedResult.ContextData as SearchResult;
-            List<Result> contextMenus = new List<Result>();
-            if (record == null) return contextMenus;
+            if (selectedResult.ContextData is not SearchResult record)
+                return new List<Result>();
 
-            List<ContextMenu> availableContextMenus = new List<ContextMenu>();
-            availableContextMenus.AddRange(GetDefaultContextMenu());
-            availableContextMenus.AddRange(_settings.ContextMenus);
+            var icoPath = record.Type == ResultType.File ? "Images\\file.png" : "Images\\folder.png";
 
-            if (record.Type == ResultType.File)
+            List<Result> contextMenus = new List<Result>
             {
-                foreach (ContextMenu contextMenu in availableContextMenus)
+                new()
                 {
-                    var menu = contextMenu;
-                    contextMenus.Add(new Result
+                    Title = _context.API.GetTranslation("flowlauncher_plugin_everything_open_containing_folder"),
+                    Action = _ =>
                     {
-                        Title = contextMenu.Name,
-                        Action = _ =>
-                        {
-                            var parentPath = Directory.GetParent(record.FullPath);
-
-                            if ((menu.Argument.Trim() == Settings.DirectoryPathPlaceHolder || string.IsNullOrWhiteSpace(menu.Argument)) && _settings.ExplorerPath.Trim() == Settings.Explorer)
-                                menu.Argument = Settings.DefaultExplorerArgsWithFilePath;
-
-                            string argument = menu.Argument.Replace(Settings.FilePathPlaceHolder, '"' + record.FullPath + '"')
-                                .Replace(Settings.DirectoryPathPlaceHolder, '"' + parentPath.ToString() + '"');
-
-
-                            try
-                            {
-                                Process.Start(menu.Command, argument);
-                            }
-                            catch
-                            {
-                                _context.API.ShowMsg(string.Format(_context.API.GetTranslation("flowlauncher_plugin_everything_canot_start"), record.FullPath), string.Empty, string.Empty);
-                                return false;
-                            }
-                            return true;
-                        },
-                        IcoPath = contextMenu.ImagePath
-                    });
+                        _context.API.OpenDirectory(Path.GetDirectoryName(record.FullPath), record.FullPath);
+                        return true;
+                    },
+                    IcoPath = icoPath,
+                    Glyph = new GlyphInfo("/Resources/#Segoe Fluent Icons", "\ue8de")
                 }
-            }
-
-            var icoPath = (record.Type == ResultType.File) ? "Images\\file.png" : "Images\\folder.png";
+            };
 
-            if (_settings.ShowWindowsContextMenu)
+            if (record.Type is ResultType.File)
             {
-	            contextMenus.Add(new Result
-	            {
-		            Title = _context.API.GetTranslation("flowlauncher_plugin_everything_show_windows_context_menu"),
-		            Action = (context) =>
-		            {
-			            var fileInfos = new FileInfo[] { new(record.FullPath) };
-
-			            var screenWithMouseCursor = System.Windows.Forms.Screen.FromPoint(System.Windows.Forms.Cursor.Position);
-			            var xOfScreenCenter = screenWithMouseCursor.WorkingArea.Left + screenWithMouseCursor.WorkingArea.Width / 2;
-			            var yOfScreenCenter = screenWithMouseCursor.WorkingArea.Top + screenWithMouseCursor.WorkingArea.Height / 2;
-			            var showPosition = new System.Drawing.Point(xOfScreenCenter, yOfScreenCenter);
-
-			            new Peter.ShellContextMenu().ShowContextMenu(fileInfos, showPosition);
-
-			            return true;
-		            },
-		            IcoPath = icoPath
-	            });
+                var notepadPath = string.IsNullOrEmpty(_settings.EditorPath) ? "notepad.exe" : _settings.EditorPath;
+                contextMenus.Add(new Result
+                {
+                    Title = string.Format(
+                        _context.API.GetTranslation("flowlauncher_plugin_everything_open_with_editor"),
+                        Path.GetFileNameWithoutExtension(notepadPath)
+                    ),
+                    Action = state =>
+                    {
+                        using var notepad = new Process();
+                        notepad.StartInfo = new ProcessStartInfo()
+                        {
+                            FileName = notepadPath,
+                            Arguments = record.FullPath
+                        };
+                        if (state.SpecialKeyState.CtrlPressed && state.SpecialKeyState.ShiftPressed)
+                        {
+                            notepad.StartInfo.Verb = "runAs";
+                        }
+                        Task.Run(() => notepad.Start());
+                        return true;
+                    },
+                    Glyph = new GlyphInfo("/Resources/#Segoe Fluent Icons", "\ue932")
+                });
             }
 
-            contextMenus.Add(new Result
+            if (_settings.ShowWindowsContextMenu)
             {
-                Title = _context.API.GetTranslation("flowlauncher_plugin_everything_copy_path"),
-                Action = (context) =>
+                contextMenus.Add(new Result
                 {
-                    Clipboard.SetDataObject(record.FullPath);
-                    return true;
-                },
-                IcoPath = icoPath
-            });
+                    Title = _context.API.GetTranslation("flowlauncher_plugin_everything_show_windows_context_menu"),
+                    Action = (context) =>
+                    {
+                        var fileInfos = new FileInfo[] { new(record.FullPath) };
 
-            contextMenus.Add(new Result
-            {
-                Title = _context.API.GetTranslation("flowlauncher_plugin_everything_copy"),
-                Action = (context) =>
+                        var screenWithMouseCursor = System.Windows.Forms.Screen.FromPoint(System.Windows.Forms.Cursor.Position);
+                        var xOfScreenCenter = screenWithMouseCursor.WorkingArea.Left + screenWithMouseCursor.WorkingArea.Width / 2;
+                        var yOfScreenCenter = screenWithMouseCursor.WorkingArea.Top + screenWithMouseCursor.WorkingArea.Height / 2;
+                        var showPosition = new System.Drawing.Point(xOfScreenCenter, yOfScreenCenter);
+
+                        new Peter.ShellContextMenu().ShowContextMenu(fileInfos, showPosition);
+
+                        return true;
+                    },
+                    IcoPath = icoPath
+                });
+            }
+
+            contextMenus.Add(
+                new()
                 {
-                    Clipboard.SetFileDropList(new System.Collections.Specialized.StringCollection
+                    Title = _context.API.GetTranslation("flowlauncher_plugin_everything_copy_path"),
+                    Action = _ =>
                     {
-                        record.FullPath
-                    });
-                    return true;
-                },
-                IcoPath = icoPath
-            });
+                        Clipboard.SetDataObject(record.FullPath);
+                        return true;
+                    },
+                    IcoPath = icoPath,
+                    Glyph = new GlyphInfo("/Resources/#Segoe Fluent Icons", "\ue8c8")
+                });
+            contextMenus.Add(
+                new Result
+                {
+                    Title = _context.API.GetTranslation("flowlauncher_plugin_everything_copy"),
+                    Action = _ =>
+                    {
+                        Clipboard.SetFileDropList(new System.Collections.Specialized.StringCollection
+                        {
+                            record.FullPath
+                        });
+                        return true;
+                    },
+                    IcoPath = icoPath,
+                    Glyph = new GlyphInfo("/Resources/#Segoe Fluent Icons", "\ue8c8")
+                });
 
-            if (record.Type == ResultType.File || record.Type == ResultType.Folder)
+            if (record.Type is ResultType.File or ResultType.Folder)
                 contextMenus.Add(new Result
                 {
                     Title = _context.API.GetTranslation("flowlauncher_plugin_everything_delete"),
-                    Action = (context) =>
+                    Action = _ =>
                     {
                         try
                         {
@@ -392,9 +372,9 @@ public List<Result> LoadContextMenus(Result selectedResult)
 
                         return true;
                     },
-                    IcoPath = icoPath
+                    IcoPath = icoPath,
+                    Glyph = new("/Resources/#Segoe Fluent Icons", "\ue74d")
                 });
-
             return contextMenus;
         }
 
@@ -403,4 +383,5 @@ public Control CreateSettingPanel()
             return new EverythingSettings(_settings, new SettingsViewModel(_api, _settings, _context));
         }
     }
+
 }
diff --git a/Settings.cs b/Settings.cs
@@ -11,29 +11,6 @@ public class Settings
 
         public string EditorPath { get; set; } = "";
 
-        internal const string Explorer = "explorer";
-
-        internal const string alternativeExplorerPath = "explorer.exe";
-
-        internal string explorerPath = Explorer;
-
-        public string ExplorerPath
-        {
-            get => explorerPath.Trim() switch
-            {
-                "" => Explorer,
-                alternativeExplorerPath => Explorer,
-                _ => explorerPath
-            }; set => explorerPath = value;
-        }
-        public string ExplorerArgs { get; set; } = DirectoryPathPlaceHolder;
-
-        internal const string DirectoryPathPlaceHolder = "%s";
-
-        internal const string FilePathPlaceHolder = "%f";
-
-        internal const string DefaultExplorerArgsWithFilePath = "/select, %f";
-
         public List<ContextMenu> ContextMenus = new List<ContextMenu>();
 
         public int MaxSearchCount { get; set; } = DefaultMaxSearchCount;
diff --git a/crowdin.yml b/crowdin.yml
@@ -0,0 +1,4 @@
+files:
+  - source: Languages/en.xaml
+    translation: /%original_path%/%two_letters_code%.xaml
+commit_message: '[ci skip]'
diff --git a/plugin.json b/plugin.json
@@ -3,8 +3,8 @@
   "ActionKeyword": "*",
   "Name": "Everything",
   "Description": "Search Everything",
-  "Author": "qianlifeng,orzfly",
-  "Version": "1.5.6",
+  "Author": "qianlifeng, orzfly",
+  "Version": "1.6.0",
   "Language": "csharp",
   "Website": "https://github.com/Flow-Launcher/Flow.Launcher.Plugin.Everything",
   "IcoPath": "Images\\find.png",

Original file line number	Diff line number	Diff line change
`@@ -11,8 +11,6 @@ namespace Flow.Launcher.Plugin.Everything.Helper`
`11`	`11`	`{`
`12`	`12`	`class EnumNameConverter : IValueConverter`
`13`	`13`	`{`
`14`		`- private Dictionary<string, SortOption> translationRecord = new Dictionary<string, SortOption>();`
`15`		`-`
`16`	`14`	`public object Convert(object value, Type targetType, object parameter, CultureInfo culture)`
`17`	`15`	`{`
`18`	`16`	`return value is SortOption option ? option.GetTranslatedName() : value;`