Add CLI with basic functionality.

CLI/CLI.csproj

@@ -0,0 +1,18 @@
+<Project Sdk="Microsoft.NET.Sdk">
+
+    <PropertyGroup>
+        <OutputType>Exe</OutputType>
+        <TargetFramework>net7.0</TargetFramework>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+
+    <ItemGroup>
+      <PackageReference Include="Spectre.Console.Cli" Version="0.47.1-preview.0.11" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <ProjectReference Include="..\Tranga\Tranga.csproj" />
+    </ItemGroup>
+
+</Project>

CLI/Program.cs

@@ -0,0 +1,152 @@
+using System.ComponentModel;
+using System.Diagnostics.CodeAnalysis;
+using Logging;
+using Spectre.Console;
+using Spectre.Console.Cli;
+using Tranga;
+
+var app = new CommandApp<TrangaCli>();
+return app.Run(args);
+
+internal sealed class TrangaCli : Command<TrangaCli.Settings>
+{
+    public sealed class Settings : CommandSettings
+    {
+        [Description("Directory to which downloaded Manga are saved")]
+        [CommandOption("-d|--downloadLocation")]
+        [DefaultValue(null)]
+        public string? downloadLocation { get; init; }
+        
+        [Description("Directory in which application-data is saved")]
+        [CommandOption("-w|--workingDirectory")]
+        [DefaultValue(null)]
+        public string? workingDirectory { get; init; }
+        
+        [Description("Enables the file-logger")]
+        [CommandOption("-f")]
+        [DefaultValue(null)]
+        public bool? fileLogger { get; init; }
+        
+        [Description("Path to save logfile to")]
+        [CommandOption("-l|--fPath")]
+        [DefaultValue(null)]
+        public string? fileLoggerPath { get; init; }
+        
+        [Description("Port on which to run API on")]
+        [CommandOption("-p|--port")]
+        [DefaultValue(null)]
+        public int? apiPort { get; init; }
+    }
+
+    public override int Execute([NotNull] CommandContext context, [NotNull] Settings settings)
+    {
+        List<Logger.LoggerType> enabledLoggers = new();
+        if(settings.fileLogger.HasValue && settings.fileLogger.Value == true)
+            enabledLoggers.Add(Logger.LoggerType.FileLogger);
+        string? logFilePath = settings.fileLoggerPath ?? "";//TODO path
+        Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, logFilePath);
+
+        TrangaSettings trangaSettings = new (settings.downloadLocation, settings.workingDirectory, settings.apiPort);
+
+        Directory.CreateDirectory(trangaSettings.downloadLocation);
+        Directory.CreateDirectory(trangaSettings.workingDirectory);
+
+        Tranga.Tranga? api = null;
+
+        Thread trangaApi = new Thread(() =>
+        {
+            api = new(logger, trangaSettings);
+        });
+        trangaApi.Start();
+        
+        HttpClient client = new();
+        
+        bool exit = false;
+        while (!exit)
+        {
+            string menuSelect = AnsiConsole.Prompt(
+                new SelectionPrompt<string>()
+                    .Title("Menu")
+                    .PageSize(10)
+                    .MoreChoicesText("Up/Down")
+                    .AddChoices(new[]
+                    {
+                        "CustomRequest",
+                        "Log",
+                        "Exit"
+                    }));
+
+            switch (menuSelect)
+            {
+                case "CustomRequest":
+                    string requestType = AnsiConsole.Prompt(
+                        new SelectionPrompt<string>()
+                            .Title("Request Type")
+                            .AddChoices(new[]
+                            {
+                                "GET",
+                                "POST",
+                                "DELETE"
+                            }));
+                    HttpMethod method = requestType == "GET" ? HttpMethod.Get :
+                        requestType == "DELETE" ? HttpMethod.Delete : HttpMethod.Post;
+                    string requestPath = AnsiConsole.Prompt(
+                        new TextPrompt<string>("Request Path:"));
+                    List<ValueTuple<string, string>> parameters = new();
+                    while (AnsiConsole.Confirm("Add Parameter?"))
+                    {
+                        string name = AnsiConsole.Ask<string>("Parameter Name:");
+                        string value = AnsiConsole.Ask<string>("Parameter Value:");
+                        parameters.Add(new ValueTuple<string, string>(name, value));
+                    }
+
+                    string requestString = $"http://localhost:{trangaSettings.apiPortNumber}/{requestPath}";
+                    if (parameters.Any())
+                    {
+                        requestString += "?";
+                        foreach (ValueTuple<string, string> parameter in parameters)
+                            requestString += $"{parameter.Item1}={parameter.Item2}&";
+                    }
+
+                    HttpRequestMessage request = new HttpRequestMessage(method, requestString);
+                    AnsiConsole.WriteLine($"Request: {request.Method} {request.RequestUri}");
+                    HttpResponseMessage response;
+                    if (AnsiConsole.Confirm("Send Request?"))
+                        response = client.Send(request);
+                    else break;
+                    AnsiConsole.WriteLine(response.Content.ReadAsStringAsync().Result);
+                    break;
+                case "Log":
+                    List<string> lines = logger.Tail(10).ToList();
+                    Rows rows = new Rows(lines.Select(line => new Text(line)));
+                    
+                    AnsiConsole.Live(rows).Start(context =>
+                    {
+                        bool running = true;
+                        while (running)
+                        {
+                            string[] newLines = logger.GetNewLines();
+                            if (newLines.Length > 0)
+                            {
+                                lines.AddRange(newLines);
+                                rows = new Rows(lines.Select(line => new Text(line)));
+                                context.UpdateTarget(rows);
+                            }
+                            Thread.Sleep(100);
+                            if (Console.KeyAvailable)
+                                running = false;
+                        }
+                    });
+                    break;
+                case "Exit":
+                    exit = true;
+                    break;
+            }
+        }
+
+        if (api is not null)
+            api.keepRunning = false;
+        
+        return 0;
+    }
+}

Tranga.sln

@@ -4,6 +4,8 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga", ".\Tranga\Tranga.c
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Logging\Logging.csproj", "{415BE889-BB7D-426F-976F-8D977876A462}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CLI", "CLI\CLI.csproj", "{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -18,5 +20,9 @@ Global
 		{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{415BE889-BB7D-426F-976F-8D977876A462}.Release|Any CPU.Build.0 = Release|Any CPU
+		{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{4324C816-F9D2-468F-8ED6-397FE2F0DCB3}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

Tranga/Server.cs

@@ -22,8 +22,17 @@ public class Server : GlobalBase
             this._listener.Prefixes.Add($"http://*:{settings.apiPortNumber}/");
         else
             this._listener.Prefixes.Add($"http://localhost:{settings.apiPortNumber}/");
-        Thread t = new (Listen);
-        t.Start();
+        Thread listenThread = new (Listen);
+        listenThread.Start();
+        Thread watchThread = new(WatchRunning);
+        watchThread.Start();
+    }
+
+    private void WatchRunning()
+    {
+        while(_parent.keepRunning)
+            Thread.Sleep(1000);
+        this._listener.Close();
     }
 
     private void Listen()
@@ -33,13 +42,20 @@ public class Server : GlobalBase
             Log($"Listening on {prefix}");
         while (this._listener.IsListening && _parent.keepRunning)
         {
-            HttpListenerContext context = this._listener.GetContextAsync().Result;
-            Log($"{context.Request.HttpMethod} {context.Request.Url} {context.Request.UserAgent}");
-            Task t = new(() =>
+            try
             {
-                HandleRequest(context);
-            });
-            t.Start();
+                HttpListenerContext context = this._listener.GetContext();
+                Log($"{context.Request.HttpMethod} {context.Request.Url} {context.Request.UserAgent}");
+                Task t = new(() =>
+                {
+                    HandleRequest(context);
+                });
+                t.Start();
+            }
+            catch (HttpListenerException e)
+            {
+                
+            }
         }
     }
 

Tranga/TrangaSettings.cs

@@ -20,24 +20,34 @@ public class TrangaSettings
     [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
     public ushort? version { get; set; }
 
-    public TrangaSettings(string? downloadLocation = null, string? workingDirectory = null, int apiPortNumber = 6531)
+    public TrangaSettings(string? downloadLocation = null, string? workingDirectory = null, int? apiPortNumber = null)
     {
-        this.apiPortNumber = apiPortNumber;
-        downloadLocation ??= Path.Join(Directory.GetCurrentDirectory(), "Downloads");
-        workingDirectory ??= Directory.GetCurrentDirectory();
-        if (downloadLocation.Length < 1 || workingDirectory.Length < 1)
-            throw new ArgumentException("Download-location and working-directory paths can not be empty!");
-        this.workingDirectory = workingDirectory;
-        this.downloadLocation = downloadLocation;
-        
-        if (File.Exists(settingsFilePath))
-        {
-            TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(File.ReadAllText(settingsFilePath))!;
-            this.downloadLocation = settings.downloadLocation;
-            this.workingDirectory = settings.workingDirectory;
+        string lockFilePath = $"{settingsFilePath}.lock";
+        if (File.Exists(settingsFilePath) && !File.Exists(lockFilePath))
+        {//Load from settings file
+            FileStream lockFile = File.Create(lockFilePath,0, FileOptions.DeleteOnClose);
+            string settingsStr = File.ReadAllText(settingsFilePath);
+            TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(settingsStr)!;
+            this.downloadLocation = downloadLocation ?? settings.downloadLocation;
+            this.workingDirectory = workingDirectory ?? settings.workingDirectory;
+            this.apiPortNumber = apiPortNumber ?? settings.apiPortNumber;
+            lockFile.Close();
         }
-        
-        UpdateDownloadLocation(this.downloadLocation, false);
+        else if(!File.Exists(settingsFilePath))
+        {//No settings file exists
+            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();
+        }
+        else
+        {//Settingsfile is locked
+            this.apiPortNumber = apiPortNumber!.Value;
+            this.downloadLocation = downloadLocation!;
+            this.workingDirectory = workingDirectory!;
+        }
+        UpdateDownloadLocation(this.downloadLocation!, false);
     }
 
     public HashSet<LibraryConnector> LoadLibraryConnectors()
@@ -97,7 +107,7 @@ public class TrangaSettings
 
     public void ExportSettings()
     {
-        while (File.Exists(settingsFilePath))
+        if (File.Exists(settingsFilePath))
         {
             bool inUse = true;
             while (inUse)