diff options
| author | crupest <crupest@outlook.com> | 2021-04-24 15:35:43 +0800 |
|---|---|---|
| committer | crupest <crupest@outlook.com> | 2021-04-24 15:35:43 +0800 |
| commit | cac76dc4783f617015232a68bcbc56579e0c77e7 (patch) | |
| tree | 1a6b51940d904e46f85bdc419e27ae716aa6e24f /BackEnd/Timeline | |
| parent | fca2ca672b7f7c958b6465c24d89d982887fabf8 (diff) | |
| download | timeline-cac76dc4783f617015232a68bcbc56579e0c77e7.tar.gz timeline-cac76dc4783f617015232a68bcbc56579e0c77e7.tar.bz2 timeline-cac76dc4783f617015232a68bcbc56579e0c77e7.zip | |
feat: Move default work directory to home/timeline.
Diffstat (limited to 'BackEnd/Timeline')
| -rw-r--r-- | BackEnd/Timeline/Configs/ApplicationConfiguration.cs | 4 | ||||
| -rw-r--r-- | BackEnd/Timeline/Properties/launchSettings.json | 8 | ||||
| -rw-r--r-- | BackEnd/Timeline/Services/PathProvider.cs | 20 |
3 files changed, 15 insertions, 17 deletions
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<string?>(ApplicationConfiguration.WorkDirKey) ?? ApplicationConfiguration.DefaultWorkDir;
+ _workDirectory = configuration.GetValue<string?>(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);
}
}
}
|