feat: Move default work directory to home/timeline.

4 files changed, 16 insertions, 18 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);

         }

     }

 }

diff --git a/deploy/upgrade.bash b/deploy/upgrade.bash
index 156bb1ca..fd3693d1 100644
--- a/deploy/upgrade.bash
+++ b/deploy/upgrade.bash
@@ -1,6 +1,6 @@
 docker pull crupest/timeline:latest
 sudo systemctl stop timeline.service
 docker rm timeline
-docker create -v $HOME/timeline:/timeline -p 5000:80 --name timeline crupest/timeline:latest
+docker create -v $HOME/timeline:/root/timeline -p 5000:80 --name timeline crupest/timeline:latest
 sudo systemctl restart timeline.service
 docker system prune