Merge branch 'dev' into add_filecontent_search

jjw24 · jjw24 · commit ef46225c3397 · 2020-07-12T22:50:51.000+10:00
diff --git a/Flow.Launcher.Core/Updater.cs b/Flow.Launcher.Core/Updater.cs
@@ -16,6 +16,7 @@
 using Flow.Launcher.Infrastructure.Logger;
 using System.IO;
 using Flow.Launcher.Infrastructure.UserSettings;
+using Flow.Launcher.Plugin;
 
 namespace Flow.Launcher.Core
 {
@@ -28,11 +29,14 @@ public Updater(string gitHubRepository)
             GitHubRepository = gitHubRepository;
         }
 
-        public async Task UpdateApp(bool silentIfLatestVersion = true)
+        public async Task UpdateApp(IPublicAPI api , bool silentUpdate = true)
         {
             UpdateManager updateManager;
             UpdateInfo newUpdateInfo;
 
+            if (!silentUpdate)
+                api.ShowMsg("Please wait...", "Checking for new update");
+
             try
             {
                 updateManager = await GitHubUpdateManager(GitHubRepository);
@@ -62,12 +66,15 @@ public async Task UpdateApp(bool silentIfLatestVersion = true)
 
             if (newReleaseVersion <= currentVersion)
             {
-                if (!silentIfLatestVersion)
+                if (!silentUpdate)
                     MessageBox.Show("You already have the latest Flow Launcher version");
                 updateManager.Dispose();
                 return;
             }
-            
+
+            if (!silentUpdate)
+                api.ShowMsg("Update found", "Updating...");
+
             try
             {
                 await updateManager.DownloadReleases(newUpdateInfo.ReleasesToApply);
@@ -96,11 +103,15 @@ public async Task UpdateApp(bool silentIfLatestVersion = true)
 
             var newVersionTips = NewVersinoTips(newReleaseVersion.ToString());
             
-            MessageBox.Show(newVersionTips);
             Log.Info($"|Updater.UpdateApp|Update success:{newVersionTips}");
 
             // always dispose UpdateManager
             updateManager.Dispose();
+
+            if (MessageBox.Show(newVersionTips, "New Update", MessageBoxButton.YesNo) == MessageBoxResult.Yes)
+            {
+                UpdateManager.RestartApp(Constant.ApplicationFileName);
+            }
         }
 
         [UsedImplicitly]
diff --git a/Flow.Launcher.Infrastructure/Storage/FlowLauncherJsonStorage.cs b/Flow.Launcher.Infrastructure/Storage/FlowLauncherJsonStorage.cs
diff --git a/Flow.Launcher/App.xaml.cs b/Flow.Launcher/App.xaml.cs
@@ -118,12 +118,12 @@ private void AutoUpdates()
                     var timer = new Timer(1000 * 60 * 60 * 5);
                     timer.Elapsed += async (s, e) =>
                     {
-                        await _updater.UpdateApp();
+                        await _updater.UpdateApp(API);
                     };
                     timer.Start();
 
                     // check updates on startup
-                    await _updater.UpdateApp();
+                    await _updater.UpdateApp(API);
                 }
             });
         }
diff --git a/Flow.Launcher/Languages/en.xaml b/Flow.Launcher/Languages/en.xaml
@@ -96,7 +96,7 @@
     <system:String x:Key="version">Version</system:String>
     <system:String x:Key="about_activate_times">You have activated Flow Launcher {0} times</system:String>
     <system:String x:Key="checkUpdates">Check for Updates</system:String>
-    <system:String x:Key="newVersionTips">New version {0} is available, please restart Flow Launcher.</system:String>
+    <system:String x:Key="newVersionTips">New version {0} is available, would you like to restart Flow Launcher to use the update?</system:String>
     <system:String x:Key="checkUpdatesFailed">Check updates failed, please check your connection and proxy settings to api.github.com.</system:String>
     <system:String x:Key="downloadUpdatesFailed">
         Download updates failed, please check your connection and proxy settings to github-cloud.s3.amazonaws.com, 
diff --git a/Flow.Launcher/Themes/BlurWhite.xaml b/Flow.Launcher/Themes/BlurWhite.xaml
@@ -9,13 +9,10 @@
 
     <Style x:Key="QueryBoxStyle" BasedOn="{StaticResource BaseQueryBoxStyle}" TargetType="{x:Type TextBox}">
         <Setter Property="Foreground" Value="#FF000000" />
-        <Setter Property="Background" Value="#01FFFFFF" />
+        <Setter Property="Background" Value="Transparent" />
     </Style>
 
-    <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}">
-        <Setter Property="Foreground" Value="#FF000000" />
-        <Setter Property="Background" Value="#01FFFFFF" />
-    </Style>
+    <Style x:Key="QuerySuggestionBoxStyle" BasedOn="{StaticResource BaseQuerySuggestionBoxStyle}" TargetType="{x:Type TextBox}" />
 
     <Style x:Key="WindowBorderStyle" BasedOn="{StaticResource BaseWindowBorderStyle}" TargetType="{x:Type Border}">
         <Setter Property="Background">
diff --git a/Flow.Launcher/ViewModel/SettingWindowViewModel.cs b/Flow.Launcher/ViewModel/SettingWindowViewModel.cs
@@ -45,7 +45,7 @@ public SettingWindowViewModel(Updater updater, IPortable portable)
 
         public async void UpdateApp()
         {
-            await _updater.UpdateApp(false);
+            await _updater.UpdateApp(App.API, false);
         }
 
         public bool AutoUpdates
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs b/Plugins/Flow.Launcher.Plugin.Explorer/ContextMenu.cs
@@ -1,4 +1,4 @@
-﻿using System;
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -9,7 +9,10 @@
 using Flow.Launcher.Plugin.Explorer.Search;
 using Flow.Launcher.Plugin.Explorer.Search.FolderLinks;
 using System.Linq;
-using System.Reflection;
+using MessageBox = System.Windows.Forms.MessageBox;
+using MessageBoxIcon = System.Windows.Forms.MessageBoxIcon;
+using MessageBoxButton = System.Windows.Forms.MessageBoxButtons;
+using DialogResult = System.Windows.Forms.DialogResult;
 
 namespace Flow.Launcher.Plugin.Explorer
 {
@@ -101,10 +104,25 @@ public List<Result> LoadContextMenus(Result selectedResult)
                         {
                             try
                             {
+                                if (MessageBox.Show(
+                                        string.Format(Context.API.GetTranslation("plugin_explorer_deletefilefolderconfirm"),fileOrFolder), 
+                                        string.Empty, 
+                                        MessageBoxButton.YesNo, 
+                                        MessageBoxIcon.Warning) 
+                                    == DialogResult.No)
+                                    return false;
+
                                 if (record.Type == ResultType.File)
                                     File.Delete(record.FullPath);
                                 else
                                     Directory.Delete(record.FullPath, true);
+
+                                Task.Run(() =>
+                                {
+                                    Context.API.ShowMsg(Context.API.GetTranslation("plugin_explorer_deletefilefoldersuccess"),
+                                                                        string.Format(Context.API.GetTranslation("plugin_explorer_deletefilefoldersuccess_detail"), fileOrFolder), 
+                                                                        Constants.ExplorerIconImageFullPath);
+                                });
                             }
                             catch (Exception e)
                             {
@@ -212,15 +230,11 @@ private Result CreateAddToIndexSearchExclusionListResult(SearchResult record)
                     if(!Settings.IndexSearchExcludedSubdirectoryPaths.Any(x => x.Path == record.FullPath))
                         Settings.IndexSearchExcludedSubdirectoryPaths.Add(new FolderLink { Path = record.FullPath });
 
-                    var pluginDirectory = Directory.GetParent(Assembly.GetExecutingAssembly().Location.ToString());
-
-                    var iconPath = pluginDirectory + "\\" + Constants.ExplorerIconImagePath;
-
                     Task.Run(() =>
                     {
                         Context.API.ShowMsg(Context.API.GetTranslation("plugin_explorer_excludedfromindexsearch_msg"), 
                                                             Context.API.GetTranslation("plugin_explorer_path") + 
-                                                            " " + record.FullPath, iconPath);
+                                                            " " + record.FullPath, Constants.ExplorerIconImageFullPath);
 
                         // so the new path can be persisted to storage and not wait till next ViewModel save.
                         Context.API.SaveAppAllSettings();
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml
@@ -5,6 +5,9 @@
     <!--Dialogues-->
     <system:String x:Key="plugin_explorer_select_folder_link_warning">Please select a folder link</system:String>
     <system:String x:Key="plugin_explorer_delete_folder_link">Are you sure you want to delete {0}?</system:String>
+    <system:String x:Key="plugin_explorer_deletefilefolderconfirm">Are you sure you want to permanently delete this {0}?</system:String>
+    <system:String x:Key="plugin_explorer_deletefilefoldersuccess">Deletion successful</system:String>
+    <system:String x:Key="plugin_explorer_deletefilefoldersuccess_detail">Successfully deleted the {0}</system:String>
 
     <!--Controls-->
     <system:String x:Key="plugin_explorer_delete">Delete</system:String>
diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/Constants.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/Constants.cs
@@ -1,6 +1,6 @@
 ﻿using System;
-using System.Collections.Generic;
-using System.Text;
+using System.IO;
+using System.Reflection;
 
 namespace Flow.Launcher.Plugin.Explorer.Search
 {
@@ -26,6 +26,9 @@ internal static class Constants
 
         internal const string WindowsIndexingOptions = "srchadmin.dll";
 
+        internal static string ExplorerIconImageFullPath 
+            => Directory.GetParent(Assembly.GetExecutingAssembly().Location.ToString()) + "\\" + ExplorerIconImagePath;
+
         internal const string WindowsIndexFileContentSearchHotkey = "content:";
     }
 }
diff --git a/Plugins/Flow.Launcher.Plugin.Sys/Main.cs b/Plugins/Flow.Launcher.Plugin.Sys/Main.cs
@@ -244,8 +244,6 @@ private List<Result> Commands()
                     {
                         Application.Current.MainWindow.Hide();
                         context.API.CheckForNewUpdate();
-                        context.API.ShowMsg("Please wait...",
-                            "Checking for new update");
                         return true;
                     }
                 }

Original file line number	Diff line number	Diff line change
`@@ -118,12 +118,12 @@ private void AutoUpdates()`
`118`	`118`	`var timer = new Timer(1000 * 60 * 60 * 5);`
`119`	`119`	`timer.Elapsed += async (s, e) =>`
`120`	`120`	`{`
`121`		`- await _updater.UpdateApp();`
	`121`	`+ await _updater.UpdateApp(API);`
`122`	`122`	`};`
`123`	`123`	`timer.Start();`
`124`	`124`
`125`	`125`	`// check updates on startup`
`126`		`- await _updater.UpdateApp();`
	`126`	`+ await _updater.UpdateApp(API);`
`127`	`127`	`}`
`128`	`128`	`});`
`129`	`129`	`}`
Original file line number	Diff line number	Diff line change
`@@ -45,7 +45,7 @@ public SettingWindowViewModel(Updater updater, IPortable portable)`
`45`	`45`
`46`	`46`	`public async void UpdateApp()`
`47`	`47`	`{`
`48`		`- await _updater.UpdateApp(false);`
	`48`	`+ await _updater.UpdateApp(App.API, false);`
`49`	`49`	`}`
`50`	`50`
`51`	`51`	`public bool AutoUpdates`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`using System;`
`2`		`-using System.Collections.Generic;`
`3`		`-using System.Text;`
	`2`	`+using System.IO;`
	`3`	`+using System.Reflection;`
`4`	`4`
`5`	`5`	`namespace Flow.Launcher.Plugin.Explorer.Search`
`6`	`6`	`{`
`@@ -26,6 +26,9 @@ internal static class Constants`
`26`	`26`
`27`	`27`	`internal const string WindowsIndexingOptions = "srchadmin.dll";`
`28`	`28`
	`29`	`+ internal static string ExplorerIconImageFullPath`
	`30`	`+ => Directory.GetParent(Assembly.GetExecutingAssembly().Location.ToString()) + "\\" + ExplorerIconImagePath;`
	`31`	`+`
`29`	`32`	`internal const string WindowsIndexFileContentSearchHotkey = "content:";`
`30`	`33`	`}`
`31`	`34`	`}`
Original file line number	Diff line number	Diff line change
`@@ -244,8 +244,6 @@ private List<Result> Commands()`
`244`	`244`	`{`
`245`	`245`	`Application.Current.MainWindow.Hide();`
`246`	`246`	`context.API.CheckForNewUpdate();`
`247`		`- context.API.ShowMsg("Please wait...",`
`248`		`- "Checking for new update");`
`249`	`247`	`return true;`
`250`	`248`	`}`
`251`	`249`	`}`