Skip to content

Commit 89d726d

Browse files
committed
Use getter to fix data location issue
1 parent 9211fe4 commit 89d726d

File tree

2 files changed

+13
-11
lines changed

2 files changed

+13
-11
lines changed

Flow.Launcher.Core/Plugin/PluginManager.cs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
using System;
1+
using System;
22
using System.Collections.Concurrent;
33
using System.Collections.Generic;
44
using System.IO;
@@ -47,10 +47,10 @@ public static class PluginManager
4747
/// <summary>
4848
/// Directories that will hold Flow Launcher plugin directory
4949
/// </summary>
50-
public static readonly string[] Directories =
51-
{
50+
public static string[] Directories =>
51+
[
5252
Constant.PreinstalledDirectory, DataLocation.PluginsDirectory
53-
};
53+
];
5454

5555
private static void DeletePythonBinding()
5656
{

Flow.Launcher.Infrastructure/UserSettings/DataLocation.cs

Lines changed: 9 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
using System;
22
using System.IO;
33

4+
#pragma warning disable CA2211 // Non-constant fields should not be visible
5+
46
namespace Flow.Launcher.Infrastructure.UserSettings
57
{
68
public static class DataLocation
@@ -28,17 +30,17 @@ public static bool PortableDataLocationInUse()
2830
public static string VersionLogDirectory => Path.Combine(LogDirectory, Constant.Version);
2931
public static string LogDirectory => Path.Combine(DataDirectory(), Constant.Logs);
3032

31-
public static readonly string CacheDirectory = Path.Combine(DataDirectory(), Constant.Cache);
32-
public static readonly string SettingsDirectory = Path.Combine(DataDirectory(), Constant.Settings);
33-
public static readonly string PluginsDirectory = Path.Combine(DataDirectory(), Constant.Plugins);
34-
public static readonly string ThemesDirectory = Path.Combine(DataDirectory(), Constant.Themes);
33+
public static string CacheDirectory => Path.Combine(DataDirectory(), Constant.Cache);
34+
public static string SettingsDirectory = Path.Combine(DataDirectory(), Constant.Settings);
35+
public static string PluginsDirectory = Path.Combine(DataDirectory(), Constant.Plugins);
36+
public static string ThemesDirectory = Path.Combine(DataDirectory(), Constant.Themes);
3537

36-
public static readonly string PluginSettingsDirectory = Path.Combine(SettingsDirectory, Constant.Plugins);
37-
public static readonly string PluginCacheDirectory = Path.Combine(DataDirectory(), Constant.Cache, Constant.Plugins);
38+
public static string PluginSettingsDirectory => Path.Combine(SettingsDirectory, Constant.Plugins);
39+
public static string PluginCacheDirectory => Path.Combine(DataDirectory(), Constant.Cache, Constant.Plugins);
3840

3941
public const string PythonEnvironmentName = "Python";
4042
public const string NodeEnvironmentName = "Node.js";
4143
public const string PluginEnvironments = "Environments";
42-
public static readonly string PluginEnvironmentsPath = Path.Combine(DataDirectory(), PluginEnvironments);
44+
public static string PluginEnvironmentsPath => Path.Combine(DataDirectory(), PluginEnvironments);
4345
}
4446
}

0 commit comments

Comments
 (0)