Fix Settings not returning as JSON

CLI/Program.cs

@@ -49,6 +49,8 @@ internal sealed class TrangaCli : Command<TrangaCli.Settings>
         
         if(settings.workingDirectory is not null)
             TrangaSettings.LoadFromWorkingDirectory(settings.workingDirectory);
+        else
+            TrangaSettings.CreateOrUpdate();
         if(settings.downloadLocation is not null)
             TrangaSettings.CreateOrUpdate(downloadDirectory: settings.downloadLocation);
 

Tranga/Server.cs

@@ -198,7 +198,7 @@ public class Server : GlobalBase
                 SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs.Where(jjob => jjob is DownloadNewChapters).OrderBy(jjob => ((DownloadNewChapters)jjob).manga.sortName));
                 break;
             case "Settings":
-                SendResponse(HttpStatusCode.OK, response, TrangaSettings.Serialize());
+                SendResponse(HttpStatusCode.OK, response, TrangaSettings.AsJObject());
                 break;
             case "Settings/userAgent":
                 SendResponse(HttpStatusCode.OK, response, TrangaSettings.userAgent);

Tranga/TrangaArgs.cs

@@ -41,6 +41,8 @@ public partial class Tranga : GlobalBase
 
         if (wdp)
             TrangaSettings.LoadFromWorkingDirectory(workingDirectoryPath![0]);
+        else
+            TrangaSettings.CreateOrUpdate();
         if(dlp)
             TrangaSettings.CreateOrUpdate(downloadDirectory: downloadLocationPath![0]);
 

Tranga/TrangaSettings.cs

@@ -37,14 +37,9 @@ public static class TrangaSettings
     public static void LoadFromWorkingDirectory(string directory)
     {
         TrangaSettings.workingDirectory = directory;
-        if (!File.Exists(settingsFilePath))
-        {
-            return;
-        }
-        else
-        {
+        if(File.Exists(settingsFilePath))
             Deserialize(File.ReadAllText(settingsFilePath));
-        }
+        else return;
 
         Directory.CreateDirectory(downloadLocation);
         Directory.CreateDirectory(workingDirectory);
@@ -53,6 +48,8 @@ public static class TrangaSettings
 
     public static void CreateOrUpdate(string? downloadDirectory = null, string? pWorkingDirectory = null, int? pApiPortNumber = null, string? pUserAgent = null, bool? pAprilFoolsMode = null)
     {
+        if(pWorkingDirectory is null && File.Exists(settingsFilePath))
+            LoadFromWorkingDirectory(workingDirectory);
         TrangaSettings.downloadLocation = downloadDirectory ?? TrangaSettings.downloadLocation;
         TrangaSettings.workingDirectory = pWorkingDirectory ?? TrangaSettings.workingDirectory;
         TrangaSettings.apiPortNumber = pApiPortNumber ?? TrangaSettings.apiPortNumber;
@@ -154,7 +151,7 @@ public static class TrangaSettings
         File.WriteAllText(settingsFilePath, Serialize());
     }
 
-    public static string Serialize()
+    public static JObject AsJObject()
     {
         JObject jobj = new JObject();
         jobj.Add("downloadLocation", JToken.FromObject(TrangaSettings.downloadLocation));
@@ -164,9 +161,11 @@ public static class TrangaSettings
         jobj.Add("aprilFoolsMode", JToken.FromObject(TrangaSettings.aprilFoolsMode));
         jobj.Add("version", JToken.FromObject(TrangaSettings.version));
         jobj.Add("requestLimits", JToken.FromObject(TrangaSettings.requestLimits));
-        return jobj.ToString();
+        return jobj;
     }
 
+    public static string Serialize() => AsJObject().ToString();
+
     public static void Deserialize(string serialized)
     {
         JObject jobj = JObject.Parse(serialized);