From 45b3863353de233f6398dc14ef684cd8f3e0e538 Mon Sep 17 00:00:00 2001 From: bao-qian Date: Mon, 6 Feb 2017 22:16:58 +0000 Subject: [PATCH] move constant into local scope --- Wox.Infrastructure/Storage/JsonStorage.cs | 4 ++-- Wox.Infrastructure/Wox.cs | 2 -- 2 files changed, 2 insertions(+), 4 deletions(-) diff --git a/Wox.Infrastructure/Storage/JsonStorage.cs b/Wox.Infrastructure/Storage/JsonStorage.cs index 0726c5bd3a..94c74a4427 100644 --- a/Wox.Infrastructure/Storage/JsonStorage.cs +++ b/Wox.Infrastructure/Storage/JsonStorage.cs @@ -15,8 +15,8 @@ namespace Wox.Infrastructure.Storage internal JsonStrorage() { FileSuffix = ".json"; - DirectoryName = Constant.Settings; - DirectoryPath = Constant.SettingsPath; + DirectoryName = "Settings"; + DirectoryPath = Path.Combine(Constant.DataDirectory, DirectoryName); FilePath = Path.Combine(DirectoryPath, FileName + FileSuffix); ValidateDirectory(); diff --git a/Wox.Infrastructure/Wox.cs b/Wox.Infrastructure/Wox.cs index 3b0092fb48..4acce08458 100644 --- a/Wox.Infrastructure/Wox.cs +++ b/Wox.Infrastructure/Wox.cs @@ -9,7 +9,6 @@ namespace Wox.Infrastructure { public const string Wox = "Wox"; public const string Plugins = "Plugins"; - public const string Settings = "Settings"; private static readonly Assembly Assembly = Assembly.GetExecutingAssembly(); public static readonly string ProgramDirectory = Directory.GetParent(Assembly.Location).ToString(); @@ -17,7 +16,6 @@ namespace Wox.Infrastructure public static readonly string DataDirectory = Path.Combine(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), Wox); public static readonly string PluginsDirectory = Path.Combine(DataDirectory, Plugins); public static readonly string PreinstalledDirectory = Path.Combine(ProgramDirectory, Plugins); - public static readonly string SettingsPath = Path.Combine(DataDirectory, Settings); public const string Github = "https://github.com/Wox-launcher/Wox"; public const string Issue = "https://github.com/Wox-launcher/Wox/issues/new"; public static readonly string Version = FileVersionInfo.GetVersionInfo(Assembly.Location).ProductVersion;