From ae8f2d2ee84e24f972d7d31e3f6b725324203aa3 Mon Sep 17 00:00:00 2001 From: Jeremy Date: Sun, 25 Dec 2022 06:01:17 +1100 Subject: [PATCH] fix wrong Everything service warning displayed when not available --- Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml | 2 +- Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs | 3 +++ 17 files changed, 19 insertions(+), 16 deletions(-) diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml index 331a2174250..05e65442be2 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/da.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml index 0f345f2cec2..68695210bd3 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/de.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml index 87b897d73e2..2e83a86d836 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/en.xaml @@ -127,7 +127,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml index 047ecac398d..3d2247ff365 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/es-419.xaml @@ -114,7 +114,7 @@ ↓ Advertencia: No es una opción de orden rápido, las búsquedas pueden ser lentas - Click to Launch or Install Everything + Click to launch or install Everything Instalación de Everything Instalando el servicio de Everything. Por favor, espere... Servicio de Everything instalado correctamente diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml index d6ed3f049d0..9cf3c7eca95 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/fr.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml index 84cd85a0157..dc8e1f32921 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/it.xaml @@ -114,7 +114,7 @@ ↓ Attenzione: Questa non è un'opzione di ordinamento rapido, le ricerche potrebbero essere lente - Click to Launch or Install Everything + Click to launch or install Everything Installazione di Everything Installazione di everything. Si prega di attendere... Everything è stato installato con successo diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml index 51bdd025905..16be25bfa4c 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ja.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml index 0d078644725..1a15d52c819 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nb.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml index 05c08606ce7..2a1ea35d81d 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/nl.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml index 6ba8b2c9d17..7ff7d2bdbd6 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pl.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml index 7f52531040d..3db217cb048 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/pt-br.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml index 2afd0a8ab4e..28a1a7c70ac 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/ru.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml index dc14c9b59e3..53cf015bbc2 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/sr.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml index dd797f68ae6..da6c2a30dda 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/tr.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml index 3f5d97e4b94..2aab5994e23 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/uk-UA.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything Installation Installing Everything service. Please wait... Successfully installed Everything service diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml index c125664f0e5..003cf42d500 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Languages/zh-tw.xaml @@ -114,7 +114,7 @@ ↓ Warning: This is not a Fast Sort option, searches may be slow - Click to Launch or Install Everything + Click to launch or install Everything Everything 安裝程序 正在安裝 Everything 服務，請稍後... 成功安裝 Everything 服務 diff --git a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs index 3634de792c7..93a81f9470c 100644 --- a/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs +++ b/Plugins/Flow.Launcher.Plugin.Explorer/Search/SearchManager.cs @@ -110,6 +110,9 @@ when ActionKeywordMatch(query, Settings.ActionKeyword.IndexSearchActionKeyword) if (e is OperationCanceledException) return results.ToList(); + if (e is EngineNotAvailableException) + throw; + throw new SearchException(engineName, e.Message, e); }