Changed default download and working directories.

ExportSettings() now created folder

CLI/Program.cs

@@ -41,9 +41,10 @@ internal sealed class TrangaCli : Command<TrangaCli.Settings>
     public override int Execute([NotNull] CommandContext context, [NotNull] Settings settings)
     {
         List<Logger.LoggerType> enabledLoggers = new();
-        if(settings.fileLogger.HasValue && settings.fileLogger.Value == true)
+        if(settings.fileLogger is true)
             enabledLoggers.Add(Logger.LoggerType.FileLogger);
-        string? logFilePath = settings.fileLoggerPath ?? "";//TODO path
+        
+        string? logFilePath = settings.fileLoggerPath ?? "";
         Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, logFilePath);
 
         TrangaSettings trangaSettings = new (settings.downloadLocation, settings.workingDirectory, settings.apiPort);

Logging/Logger.cs

@@ -1,9 +1,13 @@
-using System.Text;
+using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Logging;
 
 public class Logger : TextWriter
 {
+    private static readonly string LogDirectoryPath = RuntimeInformation.IsOSPlatform(OSPlatform.Linux)
+        ? "/var/log/tranga-api"
+        : Path.Join(Directory.GetCurrentDirectory(), "logs");
     public override Encoding Encoding { get; }
     public enum LoggerType
     {
@@ -17,13 +21,14 @@ public class Logger : TextWriter
 
     public Logger(LoggerType[] enabledLoggers, TextWriter? stdOut, Encoding? encoding, string? logFilePath)
     {
-        this.Encoding = encoding ?? Encoding.ASCII;
+        this.Encoding = encoding ?? Encoding.UTF8;
         if (enabledLoggers.Contains(LoggerType.FileLogger) && logFilePath is not null)
             _fileLogger = new FileLogger(logFilePath, encoding);
         else if(enabledLoggers.Contains(LoggerType.FileLogger) && logFilePath is null)
         {
-            _fileLogger = null;
-            throw new ArgumentException($"logFilePath can not be null for LoggerType {LoggerType.FileLogger}");
+            logFilePath = Path.Join(LogDirectoryPath,
+                $"{DateTime.Now.ToShortDateString()} {DateTime.Now.ToShortTimeString()}.log");
+            _fileLogger = new FileLogger(logFilePath, encoding);
         }
 
         if (enabledLoggers.Contains(LoggerType.ConsoleLogger) && stdOut is not null)

Tranga/TrangaSettings.cs

@@ -1,5 +1,4 @@
 using System.Runtime.InteropServices;
-using Logging;
 using Newtonsoft.Json;
 using Tranga.LibraryConnectors;
 using Tranga.NotificationConnectors;
@@ -14,7 +13,6 @@ public class TrangaSettings
     public int apiPortNumber { get; init; }
     [JsonIgnore] public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
     [JsonIgnore] public string libraryConnectorsFilePath => Path.Join(workingDirectory, "libraryConnectors.json");
-
     [JsonIgnore] public string notificationConnectorsFilePath => Path.Join(workingDirectory, "notificationConnectors.json");
     [JsonIgnore] public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
     [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
@@ -38,8 +36,9 @@ public class TrangaSettings
             if (downloadLocation?.Length < 1 || workingDirectory?.Length < 1)
                 throw new ArgumentException("Download-location and working-directory paths can not be empty!");
             this.apiPortNumber = apiPortNumber ?? 6531;
-            this.downloadLocation = downloadLocation ?? Path.Join(Directory.GetCurrentDirectory(), "Downloads");
-            this.workingDirectory = workingDirectory ?? Directory.GetCurrentDirectory();
+            this.downloadLocation = downloadLocation ?? (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/Manga" : Path.Join(Directory.GetCurrentDirectory(), "Downloads"));
+            this.workingDirectory = workingDirectory ?? Path.Join(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/var/lib" : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "tranga-api");
+            ExportSettings();
         }
         else
         {//Settingsfile is locked
@@ -114,7 +113,7 @@ public class TrangaSettings
             {
                 try
                 {
-                    using FileStream stream = new (settingsFilePath, FileMode.Open, FileAccess.Read, FileShare.None);
+                    using FileStream stream = new(settingsFilePath, FileMode.Open, FileAccess.Read, FileShare.None);
                     stream.Close();
                     inUse = false;
                 }
@@ -124,6 +123,8 @@ public class TrangaSettings
                 }
             }
         }
+        else
+            Directory.CreateDirectory(new FileInfo(settingsFilePath).DirectoryName!);
         File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(this));
     }
 }