Skip to content

Commit 07bc2a7

Browse files
committed
remove PythonEmbeddable location
1 parent 9eb5489 commit 07bc2a7

File tree

3 files changed

+12
-1
lines changed

3 files changed

+12
-1
lines changed

Flow.Launcher.Core/ExternalPlugins/Environments/AbstractPluginEnvironment.cs

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
using Flow.Launcher.Plugin.SharedCommands;
66
using System;
77
using System.Collections.Generic;
8+
using System.IO;
89
using System.Linq;
910
using System.Windows.Forms;
1011

@@ -41,6 +42,14 @@ internal IEnumerable<PluginPair> Setup()
4142
if (!PluginMetadataList.Any(o => o.Language.Equals(Language, StringComparison.OrdinalIgnoreCase)))
4243
return new List<PluginPair>();
4344

45+
// TODO: Remove. This is backwards compatibility for 1.10.0 release- changed PythonEmbeded to Environments/Python
46+
if (!string.IsNullOrEmpty(PluginSettings.PythonDirectory) && PluginSettings.PythonDirectory.StartsWith(Path.Combine(DataLocation.DataDirectory(), "PythonEmbeddable")))
47+
{
48+
FilesFolders.RemoveFolderIfExists(PluginSettings.PythonDirectory);
49+
InstallEnvironment();
50+
PluginSettings.PythonDirectory = string.Empty;
51+
}
52+
4453
if (!string.IsNullOrEmpty(PluginsSettingsFilePath) && FilesFolders.FileExists(PluginsSettingsFilePath))
4554
{
4655
// Ensure latest only if user is using Flow's environment setup.

Flow.Launcher.Infrastructure/UserSettings/PluginSettings.cs

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ public string NodeExecutablePath
2626
}
2727
}
2828

29+
// TODO: Remove. This is backwards compatibility for 1.10.0 release.
30+
public string PythonDirectory { get; set; }
31+
2932
public Dictionary<string, Plugin> Plugins { get; set; } = new Dictionary<string, Plugin>();
3033

3134
public void UpdatePluginSettings(List<PluginMetadata> metadatas)

Flow.Launcher/Languages/es.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,6 @@
5353
<system:String x:Key="defaultFileManagerToolTip">Selecciona el administrador de archivos que se desea utilizar para abrir la carpeta.</system:String>
5454
<system:String x:Key="defaultBrowser">Navegador web predeterminado</system:String>
5555
<system:String x:Key="defaultBrowserToolTip">Configuración para Nueva Pestaña, Nueva Ventana, Modo Privado.</system:String>
56-
<system:String x:Key="pythonDirectory">Carpeta de Python</system:String>
5756
<system:String x:Key="autoUpdates">Actualización automática</system:String>
5857
<system:String x:Key="select">Seleccionar</system:String>
5958
<system:String x:Key="hideOnStartup">Ocultar Flow Launcher al inicio</system:String>

0 commit comments

Comments
 (0)