fix path configuration

Author: ax-meyer

SimpleMailArchiver/SimpleMailArchiver/Data/PathConfig.cs

@@ -2,11 +2,11 @@
 
 public record class PathConfig
 {
-    public string ArchiveBasePath { get; init; } = "";
+    public string ArchiveBasePath { get; init; } = "/etc/mailarchive";
 
-    public string ImportBasePath { get; init; } = "";
+    public string ImportBasePath { get; init; } = "/etc/mailimport";
 
-    public string AccountConfigsPath { get; init; } = "";
+    public string AccountConfigsPath { get; init; } = "/etc/mailaccounts";
 
-    public string DbPath { get; init; } = "";
+    public string DbPath { get; init; } = "/etc/maildb";
 }

SimpleMailArchiver/SimpleMailArchiver/Services/MessageImportService/MessageImportService.ImportFromServer.cs

@@ -107,8 +107,8 @@ public async Task ImportFromServer(string accountFilename, ImportProgress progre
 #if DEBUG
                     _logger.LogInformation("Debug mode, not deleting on server");
 #else
-                        //await folder.AddFlagsAsync(messageToDeleteIds, MessageFlags.Deleted, true, ct);
-                        //await folder.ExpungeAsync(ct);
+                        await folder.AddFlagsAsync(messageToDeleteIds, MessageFlags.Deleted, true, ct);
+                        await folder.ExpungeAsync(ct);
 #endif
                     progress.Report(new ProgressData(
                         RemoteMessagesDeletedCount: progress.RemoteMessagesDeletedCount + messageToDeleteIds.Count));

SimpleMailArchiver/SimpleMailArchiver/Startup.cs

@@ -16,11 +16,13 @@ public Startup(IConfiguration configuration)
     {
         _appConfig = new PathConfig();
         configuration.Bind("Paths", _appConfig);
-        if (configuration["Paths"] is null)
+        
+        // load paths from cnfig.json if not set in configuration, mostly used for development overrides
+        const string configFile = "config.json";
+        if (configuration["Paths"] is null && File.Exists(configFile))
         {
-            var configFile = "config.json";
-            if (!File.Exists(configFile)) throw new Exception();
-            _appConfig = JsonSerializer.Deserialize<PathConfig>(File.ReadAllText(configFile)) ?? throw new Exception();
+            _appConfig = JsonSerializer.Deserialize<PathConfig>(File.ReadAllText(configFile)) ??
+                         throw new Exception("Deserialization of config.json failed");
         }
 
         ConfigRoot = configuration;