From da73745f7c811ecc06031f092ec05e8a1edddcef Mon Sep 17 00:00:00 2001 From: crupest Date: Sat, 24 Apr 2021 15:35:43 +0800 Subject: feat: Move default work directory to home/timeline. --- BackEnd/Timeline/Configs/ApplicationConfiguration.cs | 4 ++-- BackEnd/Timeline/Properties/launchSettings.json | 8 -------- BackEnd/Timeline/Services/PathProvider.cs | 20 +++++++++++++------- 3 files changed, 15 insertions(+), 17 deletions(-) (limited to 'BackEnd') diff --git a/BackEnd/Timeline/Configs/ApplicationConfiguration.cs b/BackEnd/Timeline/Configs/ApplicationConfiguration.cs index 25ee7ab2..c7c679d1 100644 --- a/BackEnd/Timeline/Configs/ApplicationConfiguration.cs +++ b/BackEnd/Timeline/Configs/ApplicationConfiguration.cs @@ -2,8 +2,8 @@ { public static class ApplicationConfiguration { - public const string WorkDirKey = "WorkDir"; - public const string DefaultWorkDir = "/timeline"; + public const string WorkDirectoryKey = "WorkDirectory"; + public const string DefaultWorkDirectoryName = "timeline"; public const string DatabaseFileName = "timeline.db"; public const string DatabaseBackupDirectoryName = "backup"; public const string FrontEndKey = "FrontEnd"; diff --git a/BackEnd/Timeline/Properties/launchSettings.json b/BackEnd/Timeline/Properties/launchSettings.json index 3c8a465b..f683ca2d 100644 --- a/BackEnd/Timeline/Properties/launchSettings.json +++ b/BackEnd/Timeline/Properties/launchSettings.json @@ -19,14 +19,6 @@ "environmentVariables": { "ASPNETCORE_ENVIRONMENT": "Staging" } - }, - "Dev-Windows": { - "commandName": "Project", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development", - "ASPNETCORE_FRONTEND": "Proxy", - "TIMELINE_WORKDIR": "D:\\timeline-development" - } } } } diff --git a/BackEnd/Timeline/Services/PathProvider.cs b/BackEnd/Timeline/Services/PathProvider.cs index 1baba5c0..46fe7430 100644 --- a/BackEnd/Timeline/Services/PathProvider.cs +++ b/BackEnd/Timeline/Services/PathProvider.cs @@ -1,4 +1,5 @@ using Microsoft.Extensions.Configuration; +using System; using System.IO; using Timeline.Configs; @@ -6,7 +7,7 @@ namespace Timeline.Services { public interface IPathProvider { - public string GetWorkingDirectory(); + public string GetWorkDirectory(); public string GetDatabaseFilePath(); public string GetDatabaseBackupDirectory(); } @@ -15,28 +16,33 @@ namespace Timeline.Services { private readonly IConfiguration _configuration; - private readonly string _workingDirectory; + private readonly string _workDirectory; + public static string GetDefaultWorkDirectory() + { + var home = Environment.GetFolderPath(Environment.SpecialFolder.UserProfile); + return Path.Combine(home, ApplicationConfiguration.DefaultWorkDirectoryName); + } public PathProvider(IConfiguration configuration) { _configuration = configuration; - _workingDirectory = configuration.GetValue(ApplicationConfiguration.WorkDirKey) ?? ApplicationConfiguration.DefaultWorkDir; + _workDirectory = configuration.GetValue(ApplicationConfiguration.WorkDirectoryKey) ?? GetDefaultWorkDirectory(); } - public string GetWorkingDirectory() + public string GetWorkDirectory() { - return _workingDirectory; + return _workDirectory; } public string GetDatabaseFilePath() { - return Path.Combine(_workingDirectory, ApplicationConfiguration.DatabaseFileName); + return Path.Combine(_workDirectory, ApplicationConfiguration.DatabaseFileName); } public string GetDatabaseBackupDirectory() { - return Path.Combine(_workingDirectory, ApplicationConfiguration.DatabaseBackupDirectoryName); + return Path.Combine(_workDirectory, ApplicationConfiguration.DatabaseBackupDirectoryName); } } } -- cgit v1.2.3