Merge pull request 'api-testing' (#5) from api-testing into master

Reviewed-on: #5

Logging/FileLogger.cs

@@ -6,10 +6,16 @@ namespace Logging;
 public class FileLogger : LoggerBase
 {
     private string logFilePath { get; }
+    private const int MaxNumberOfLogFiles = 5;
 
     public FileLogger(string logFilePath, TextWriter? stdOut, Encoding? encoding = null) : base (stdOut, encoding)
     {
         this.logFilePath = logFilePath;
+        
+        //Remove oldest logfile if more than MaxNumberOfLogFiles
+        string parentFolderPath = Path.GetDirectoryName(logFilePath)!;
+        for (int fileCount = new DirectoryInfo(parentFolderPath).EnumerateFiles().Count(); fileCount > MaxNumberOfLogFiles - 1; fileCount--) //-1 because we create own logfile later
+            File.Delete(new DirectoryInfo(parentFolderPath).EnumerateFiles().MinBy(file => file.LastWriteTime)!.FullName);
     }
     
     protected override void Write(LogMessage logMessage)

Logging/Logger.cs

@@ -55,4 +55,9 @@ public class Logger : TextWriter
     {
         return _memoryLogger.Tail(lines);
     }
+
+    public string[] GetNewLines()
+    {
+        return _memoryLogger.GetNewLines();
+    }
 }

Logging/MemoryLogger.cs

@@ -4,7 +4,8 @@ namespace Logging;
 
 public class MemoryLogger : LoggerBase
 {
-    private SortedList<DateTime, LogMessage> logMessages = new();
+    private readonly SortedList<DateTime, LogMessage> _logMessages = new();
+    private int _lastLogMessageIndex = 0;
 
     public MemoryLogger(TextWriter? stdOut, Encoding? encoding = null) : base(stdOut, encoding)
     {
@@ -13,27 +14,44 @@ public class MemoryLogger : LoggerBase
 
     protected override void Write(LogMessage value)
     {
-        logMessages.Add(value.logTime, value);
+        _logMessages.Add(value.logTime, value);
     }
 
     public string[] GetLogMessage()
     {
-        return Tail(Convert.ToUInt32(logMessages.Count));
+        return Tail(Convert.ToUInt32(_logMessages.Count));
     }
 
     public string[] Tail(uint? length)
     {
         int retLength;
-        if (length is null || length > logMessages.Count)
+        if (length is null || length > _logMessages.Count)
-            retLength = logMessages.Count;
+            retLength = _logMessages.Count;
         else
             retLength = (int)length;
         
         string[] ret = new string[retLength];
-        
-        for (int logMessageIndex = logMessages.Count - retLength; logMessageIndex < logMessages.Count; logMessageIndex++)
-            ret[logMessageIndex + retLength - logMessages.Count] = logMessages.GetValueAtIndex(logMessageIndex).ToString();
 
+        for (int retIndex = 0; retIndex < ret.Length; retIndex++)
+        {
+            ret[retIndex] = _logMessages.GetValueAtIndex(_logMessages.Count - retLength + retIndex).ToString();
+        }
+
+        _lastLogMessageIndex = _logMessages.Count - 1;
+        return ret;
+    }
+
+    public string[] GetNewLines()
+    {
+        int logMessageCount = _logMessages.Count;
+        string[] ret = new string[logMessageCount - _lastLogMessageIndex];
+
+        for (int retIndex = 0; retIndex < ret.Length; retIndex++)
+        {
+            ret[retIndex] = _logMessages.GetValueAtIndex(_lastLogMessageIndex + retIndex).ToString();
+        }
+
+        _lastLogMessageIndex = logMessageCount;
         return ret;
     }
 }

Tranga-API/Program.cs

@@ -1,81 +1,122 @@
-using System.Text.Json;
+
+using Logging;
 using Tranga;
 
-TaskManager taskManager = new (Directory.GetCurrentDirectory());
+string applicationFolderPath =  Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Tranga-API");
-var builder = WebApplication.CreateBuilder(args);
+string logsFolderPath = Path.Join(applicationFolderPath, "logs");
-var app = builder.Build();
+string logFilePath = Path.Join(logsFolderPath, $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt");
+string settingsFilePath = Path.Join(applicationFolderPath, "data.json");
 
-app.MapGet("/GetConnectors", () => JsonSerializer.Serialize(taskManager.GetAvailableConnectors().Values.ToArray()));
+Directory.CreateDirectory(applicationFolderPath);
-
+Directory.CreateDirectory(logsFolderPath);
-app.MapGet("/GetPublications", (string connectorName, string? publicationName) =>
-{
-    Connector connector = taskManager.GetConnector(connectorName);
-
-    Publication[] publications;
-    if (publicationName is not null)
-        publications = connector.GetPublications(publicationName);
-    else
-        publications = connector.GetPublications();
-
-    return JsonSerializer.Serialize(publications);
-});
-
-app.MapGet("/ListTasks", () => JsonSerializer.Serialize(taskManager.GetAllTasks()));
-
-app.MapGet("/CreateTask",
-    (TrangaTask.Task task, string? connectorName, string? publicationName, TimeSpan reoccurrence, string? language) =>
-    {
-        switch (task)
-        {
-            case TrangaTask.Task.UpdateKomgaLibrary:
-                taskManager.AddTask(TrangaTask.Task.UpdateKomgaLibrary, null, null, reoccurrence);
-                break;
-            case TrangaTask.Task.DownloadNewChapters:
-                try
-                {
-                    Connector connector = taskManager.GetConnector(connectorName);
-                    
-                    Publication[] publications;
-                    if (publicationName is not null)
-                        publications = connector.GetPublications(publicationName);
-                    else
-                        publications = connector.GetPublications();
-                    
-                    Publication? publication = publications.FirstOrDefault(pub => pub.downloadUrl == publicationName);
-                    if (publication is null)
-                        JsonSerializer.Serialize($"Publication {publicationName} is unknown.");
-                    taskManager.AddTask(TrangaTask.Task.DownloadNewChapters, connectorName, publication, reoccurrence, language ?? "");
-                    return JsonSerializer.Serialize("Success");
-                }
-                catch (Exception e)
-                {
-                    return JsonSerializer.Serialize(e.Message);
-                }
-
-            default: return JsonSerializer.Serialize("Not Implemented");
-        }
-
-        return JsonSerializer.Serialize("Not Implemented");
-    });
-
-app.MapGet("/RemoveTask", (TrangaTask.Task task, string? connectorName, string? publicationName) =>
-{
-    switch (task)
-    {
-        case TrangaTask.Task.UpdateKomgaLibrary:
-            taskManager.RemoveTask(TrangaTask.Task.UpdateKomgaLibrary, null, null);
-            return JsonSerializer.Serialize("Success");
-        case TrangaTask.Task.DownloadNewChapters:
-            Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.downloadUrl == publicationName);
-            if (publication is null)
-                JsonSerializer.Serialize($"Publication {publicationName} is unknown.");
-            
-            taskManager.RemoveTask(TrangaTask.Task.DownloadNewChapters, connectorName, publication);
-            
-            return JsonSerializer.Serialize("Success");
         
-        default: return JsonSerializer.Serialize("Not Implemented");
+Console.WriteLine($"Logfile-Path: {logFilePath}");
-    }
+Console.WriteLine($"Settings-File-Path: {settingsFilePath}");
+
+Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null, logFilePath);
+        
+logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
+TaskManager.SettingsData settings;
+if (File.Exists(settingsFilePath))
+    settings = TaskManager.LoadData(settingsFilePath);
+else
+    settings = new TaskManager.SettingsData(Directory.GetCurrentDirectory(), settingsFilePath, null, new HashSet<TrangaTask>());
+
+TaskManager taskManager = new (settings, logger);
+
+var builder = WebApplication.CreateBuilder(args);
+builder.Services.AddEndpointsApiExplorer();
+builder.Services.AddSwaggerGen();
+builder.Services.AddControllers().AddNewtonsoftJson();
+var app = builder.Build();
+app.UseSwagger();
+app.UseSwaggerUI();
+app.UseSwagger();
+app.UseSwaggerUI();
+
+app.MapGet("/GetAvailableControllers", () =>  taskManager.GetAvailableConnectors());
+
+app.MapGet("/GetKnownPublications", () => taskManager.GetAllPublications());
+
+app.MapGet("/GetPublicationsFromConnector", (string connectorName, string title) =>
+{
+    Connector? connector = taskManager.GetAvailableConnectors().FirstOrDefault(con => con.Key == connectorName).Value;
+    if (connector is null)
+        return Array.Empty<Publication>();
+    if(title.Length < 4)
+        return Array.Empty<Publication>();
+    return taskManager.GetPublicationsFromConnector(connector, title);
 });
 
-app.Run();
+app.MapGet("/Tasks/GetTaskTypes", () => Enum.GetNames(typeof(TrangaTask.Task)));
+
+
+app.MapPost("/Tasks/Create", (string taskType, string? connectorName, string? publicationId, string reoccurrenceTime, string? language) =>
+{
+    Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == publicationId);
+    TrangaTask.Task task = Enum.Parse<TrangaTask.Task>(taskType);
+    taskManager.AddTask(task, connectorName, publication, TimeSpan.Parse(reoccurrenceTime), language??"");
+});
+
+app.MapPost("/Tasks/Delete", (string taskType, string? connectorName, string? publicationId) =>
+{
+    Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == publicationId);
+    TrangaTask.Task task = Enum.Parse<TrangaTask.Task>(taskType);
+    taskManager.DeleteTask(task, connectorName, publication);
+});
+
+app.MapGet("/Tasks/GetList", () => taskManager.GetAllTasks());
+
+app.MapPost("/Tasks/Start", (string taskType, string? connectorName, string? publicationId) =>
+{
+    TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
+    TrangaTask? task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
+        tTask.task == pTask && tTask.publication?.internalId == publicationId && tTask.connectorName == connectorName);
+    if (task is null)
+        return;
+    taskManager.ExecuteTaskNow(task);
+});
+
+app.MapGet("/Tasks/GetRunningTasks",
+    () => taskManager.GetAllTasks().Where(task => task.state is TrangaTask.ExecutionState.Running));
+
+app.MapGet("/Queue/GetList",
+    () => taskManager.GetAllTasks().Where(task => task.state is TrangaTask.ExecutionState.Enqueued));
+
+app.MapPost("/Queue/Enqueue", (string taskType, string? connectorName, string? publicationId) =>
+{
+    TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
+    TrangaTask? task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
+        tTask.task == pTask && tTask.publication?.internalId == publicationId && tTask.connectorName == connectorName);
+    if (task is null)
+        return;
+    taskManager.AddTaskToQueue(task);
+});
+
+app.MapPost("/Queue/Dequeue", (string taskType, string? connectorName, string? publicationId) =>
+{
+    TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
+    TrangaTask? task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
+        tTask.task == pTask && tTask.publication?.internalId == publicationId && tTask.connectorName == connectorName);
+    if (task is null)
+        return;
+    taskManager.RemoveTaskFromQueue(task);
+});
+
+app.MapGet("/Settings/Get", () => new Settings(taskManager.settings));
+
+app.MapPost("/Settings/Update", (string? downloadLocation, string? komgaUrl, string? komgaAuth) => taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth) );
+
+app.Run();
+
+class Settings
+{
+    public string downloadLocation { get; }
+    public Komga? komga { get; }
+
+    public Settings(TaskManager.SettingsData settings)
+    {
+        this.downloadLocation = settings.downloadLocation;
+        this.komga = settings.komga;
+    }
+}

Tranga-API/Properties/launchSettings.json

@@ -3,8 +3,8 @@
     "windowsAuthentication": false,
     "anonymousAuthentication": true,
     "iisExpress": {
-      "applicationUrl": "http://localhost:14826",
+      "applicationUrl": "http://localhost:1716",
-      "sslPort": 44333
+      "sslPort": 44391
     }
   },
   "profiles": {
@@ -12,7 +12,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "http://localhost:5119",
+      "applicationUrl": "http://localhost:5177",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }
@@ -21,7 +21,7 @@
       "commandName": "Project",
       "dotnetRunMessages": true,
       "launchBrowser": true,
-      "applicationUrl": "https://localhost:7070;http://localhost:5119",
+      "applicationUrl": "https://localhost:7036;http://localhost:5177",
       "environmentVariables": {
         "ASPNETCORE_ENVIRONMENT": "Development"
       }

Tranga-API/Tranga-API.csproj

@@ -15,7 +15,14 @@
     </ItemGroup>
 
     <ItemGroup>
+      <ProjectReference Include="..\Logging\Logging.csproj" />
       <ProjectReference Include="..\Tranga\Tranga.csproj" />
     </ItemGroup>
 
+    <ItemGroup>
+      <PackageReference Include="Microsoft.AspNetCore.Mvc.NewtonsoftJson" Version="7.0.5" />
+      <PackageReference Include="Microsoft.VisualStudio.Web.CodeGeneration.Design" Version="7.0.6" />
+      <PackageReference Include="Swashbuckle.AspNetCore" Version="6.5.0" />
+    </ItemGroup>
+
 </Project>

Tranga-API/tasks.json

@@ -1 +0,0 @@
-[{"reoccurrence":"00:00:00","lastExecuted":"2023-05-19T17:34:40.5349215+02:00","connectorName":"MangaDex","task":0,"publication":{"sortName":null,"description":null,"tags":null,"posterUrl":null,"year":null,"originalLanguage":null,"status":null,"folderName":null,"downloadUrl":null},"language":"en"}]

Tranga-CLI/Tranga_Cli.cs

@@ -14,16 +14,25 @@ public static class Tranga_Cli
 {
     public static void Main(string[] args)
     {
-        Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null,
+        string applicationFolderPath =  Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "Tranga");
-            Path.Join(Directory.GetCurrentDirectory(), $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt"));
+        string logsFolderPath = Path.Join(applicationFolderPath, "logs");
+        string logFilePath = Path.Join(logsFolderPath, $"log-{DateTime.Now:dd-M-yyyy-HH-mm-ss}.txt");
+        string settingsFilePath = Path.Join(applicationFolderPath, "data.json");
+
+        Directory.CreateDirectory(applicationFolderPath);
+        Directory.CreateDirectory(logsFolderPath);
         
-        logger.WriteLine("Tranga_CLI", "Loading Settings.");
+        Console.WriteLine($"Logfile-Path: {logFilePath}");
+        Console.WriteLine($"Settings-File-Path: {settingsFilePath}");
+
+        Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, null, logFilePath);
+        
+        logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
         TaskManager.SettingsData settings;
-        string settingsPath = Path.Join(Directory.GetCurrentDirectory(), "data.json");
+        if (File.Exists(settingsFilePath))
-        if (File.Exists(settingsPath))
+            settings = TaskManager.LoadData(settingsFilePath);
-            settings = TaskManager.LoadData(Directory.GetCurrentDirectory());
         else
-            settings = new TaskManager.SettingsData(Directory.GetCurrentDirectory(), null, new HashSet<TrangaTask>());
+            settings = new TaskManager.SettingsData(Directory.GetCurrentDirectory(), settingsFilePath, null, new HashSet<TrangaTask>());
 
             
         logger.WriteLine("Tranga_CLI", "User Input");
@@ -32,7 +41,7 @@ public static class Tranga_Cli
         while(tmpPath is null)
             tmpPath = Console.ReadLine();
         if(tmpPath.Length > 0)
-            settings.downloadLocation = tmpPath;
+            settings.UpdateSettings(pDownloadLocation: tmpPath, null);
         
         Console.WriteLine($"Komga BaseURL [{settings.komga?.baseUrl}]:");
         string? tmpUrl = Console.ReadLine();
@@ -64,8 +73,8 @@ public static class Tranga_Cli
                     tmpPass += keyInfo.KeyChar;
                 }
             } while (key != ConsoleKey.Enter);
-
+            
-            settings.komga = new Komga(tmpUrl, tmpUser, tmpPass, logger);
+            settings.UpdateSettings(null, new Komga(tmpUrl, tmpUser, tmpPass, logger));
         }
         
         logger.WriteLine("Tranga_CLI", "Loaded.");
@@ -75,56 +84,84 @@ public static class Tranga_Cli
     private static void TaskMode(TaskManager.SettingsData settings, Logger logger)
     {
         TaskManager taskManager = new (settings, logger);
-        ConsoleKey selection = PrintMenu(taskManager, settings.downloadLocation, logger);
+        ConsoleKey selection = ConsoleKey.EraseEndOfFile;
+        PrintMenu(taskManager, taskManager.settings.downloadLocation, logger);
         while (selection != ConsoleKey.Q)
         {
-            switch (selection)
+            int taskCount = taskManager.GetAllTasks().Length;
+            int taskRunningCount = taskManager.GetAllTasks().Count(task => task.state == TrangaTask.ExecutionState.Running);
+            int taskEnqueuedCount =
+                taskManager.GetAllTasks().Count(task => task.state == TrangaTask.ExecutionState.Enqueued);
+            Console.SetCursorPosition(0,1);
+            Console.WriteLine($"Tasks (Running/Queue/Total)): {taskRunningCount}/{taskEnqueuedCount}/{taskCount}");
+
+            if (Console.KeyAvailable)
             {
-                case ConsoleKey.L:
+                selection = Console.ReadKey().Key;
-                    PrintTasks(taskManager.GetAllTasks(), logger);
+                switch (selection)
-                    Console.WriteLine("Press any key.");
+                {
-                    Console.ReadKey();
+                    case ConsoleKey.L:
-                    break;
+                        PrintTasks(taskManager.GetAllTasks(), logger);
-                case ConsoleKey.C:
+                        Console.WriteLine("Press any key.");
-                    CreateTask(taskManager, settings, logger);
+                        Console.ReadKey();
-                    Console.WriteLine("Press any key.");
+                        break;
-                    Console.ReadKey();
+                    case ConsoleKey.C:
-                    break;
+                        CreateTask(taskManager, taskManager.settings, logger);
-                case ConsoleKey.D:
+                        Console.WriteLine("Press any key.");
-                    RemoveTask (taskManager, logger);
+                        Console.ReadKey();
-                    Console.WriteLine("Press any key.");
+                        break;
-                    Console.ReadKey();
+                    case ConsoleKey.D:
-                    break;
+                        DeleteTask(taskManager, logger);
-                case ConsoleKey.E:
+                        Console.WriteLine("Press any key.");
-                    ExecuteTaskNow(taskManager, logger);
+                        Console.ReadKey();
-                    Console.WriteLine("Press any key.");
+                        break;
-                    Console.ReadKey();
+                    case ConsoleKey.E:
-                    break;
+                        ExecuteTaskNow(taskManager, logger);
-                case ConsoleKey.S:
+                        Console.WriteLine("Press any key.");
-                    SearchTasks(taskManager, logger);
+                        Console.ReadKey();
-                    Console.WriteLine("Press any key.");
+                        break;
-                    Console.ReadKey();
+                    case ConsoleKey.S:
-                    break;
+                        SearchTasks(taskManager, logger);
-                case ConsoleKey.R:
+                        Console.WriteLine("Press any key.");
-                    PrintTasks(taskManager.GetAllTasks().Where(eTask => eTask.state == TrangaTask.ExecutionState.Running).ToArray(), logger);
+                        Console.ReadKey();
-                    Console.WriteLine("Press any key.");
+                        break;
-                    Console.ReadKey();
+                    case ConsoleKey.R:
-                    break;
+                        PrintTasks(
-                case ConsoleKey.K:
+                            taskManager.GetAllTasks().Where(eTask => eTask.state == TrangaTask.ExecutionState.Running)
-                    PrintTasks(taskManager.GetAllTasks().Where(qTask => qTask.state is TrangaTask.ExecutionState.Enqueued).ToArray(), logger);
+                                .ToArray(), logger);
-                    Console.WriteLine("Press any key.");
+                        Console.WriteLine("Press any key.");
-                    Console.ReadKey();
+                        Console.ReadKey();
-                    break;
+                        break;
-                case ConsoleKey.F:
+                    case ConsoleKey.K:
-                    ShowLastLoglines(logger);
+                        PrintTasks(
-                    Console.WriteLine("Press any key.");
+                            taskManager.GetAllTasks().Where(qTask => qTask.state is TrangaTask.ExecutionState.Enqueued)
-                    Console.ReadKey();
+                                .ToArray(), logger);
-                    break;
+                        Console.WriteLine("Press any key.");
+                        Console.ReadKey();
+                        break;
+                    case ConsoleKey.F:
+                        TailLog(logger);
+                        Console.ReadKey();
+                        break;
+                    case ConsoleKey.M:
+                        RemoveTaskFromQueue(taskManager, logger);
+                        Console.WriteLine("Press any key.");
+                        Console.ReadKey();
+                        break;
+                    case ConsoleKey.B:
+                        AddTaskToQueue(taskManager, logger);
+                        Console.WriteLine("Press any key.");
+                        Console.ReadKey();
+                        break;
+                }
+                PrintMenu(taskManager, taskManager.settings.downloadLocation, logger);
             }
-            selection = PrintMenu(taskManager, settings.downloadLocation, logger);
+            Thread.Sleep(200);
         }
 
         logger.WriteLine("Tranga_CLI", "Exiting.");
+        Console.Clear();
+        Console.WriteLine("Exiting.");
         if (taskManager.GetAllTasks().Any(task => task.state == TrangaTask.ExecutionState.Running))
         {
             Console.WriteLine("Force quit (Even with running tasks?) y/N");
@@ -137,7 +174,7 @@ public static class Tranga_Cli
             taskManager.Shutdown(false);
     }
 
-    private static ConsoleKey PrintMenu(TaskManager taskManager, string folderPath, Logger logger)
+    private static void PrintMenu(TaskManager taskManager, string folderPath, Logger logger)
     {
         int taskCount = taskManager.GetAllTasks().Length;
         int taskRunningCount = taskManager.GetAllTasks().Count(task => task.state == TrangaTask.ExecutionState.Running);
@@ -147,16 +184,11 @@ public static class Tranga_Cli
         Console.WriteLine($"Download Folder: {folderPath}");
         Console.WriteLine($"Tasks (Running/Queue/Total)): {taskRunningCount}/{taskEnqueuedCount}/{taskCount}");
         Console.WriteLine();
-        Console.WriteLine($"{"C: Create Task",-30}{"L: List tasks",-30}");
+        Console.WriteLine($"{"C: Create Task",-30}{"L: List tasks",-30}{"B: Enqueue Task", -30}");
-        Console.WriteLine($"{"D: Delete Task",-30}{"R: List Running Tasks", -30}");
+        Console.WriteLine($"{"D: Delete Task",-30}{"S: Search Tasks", -30}{"K: List Task Queue", -30}");
-        Console.WriteLine($"{"E: Execute Task now",-30}{"S: Search Tasks", -30}");
+        Console.WriteLine($"{"E: Execute Task now",-30}{"R: List Running Tasks", -30}{"M: Remove Task from Queue", -30}");
-        Console.WriteLine($"{"",-30}{"K: List Task Queue", -30}");
+        Console.WriteLine();
-        //Console.WriteLine();
+        Console.WriteLine($"{"",-30}{"F: Show Log",-30}{"Q: Exit",-30}");
-        Console.WriteLine($"{"F: Show Log",-30}{"",-30}");
-        Console.WriteLine($"{"U: Update this Screen",-30}{"Q: Exit",-30}");
-        ConsoleKey selection = Console.ReadKey().Key;
-        logger.WriteLine("Tranga_CLI", $"Menu selection: {selection}");
-        return selection;
     }
 
     private static void PrintTasks(TrangaTask[] tasks, Logger logger)
@@ -176,38 +208,96 @@ public static class Tranga_Cli
             Console.WriteLine($"{tIndex++:000}: {trangaTask}");
     }
 
-    private static void ShowLastLoglines(Logger logger)
+    private static TrangaTask? SelectTask(TrangaTask[] tasks, Logger logger)
     {
-        Console.Clear();
+        logger.WriteLine("Tranga_CLI", "Menu: Select task");
-        logger.WriteLine("Tranga_CLI", "Menu: Show Log-lines");
+        if (tasks.Length < 1)
+        {
+            Console.Clear();
+            Console.WriteLine("There are no available Tasks.");
+            logger.WriteLine("Tranga_CLI", "No available Tasks.");
+            return null;
+        }
+        PrintTasks(tasks, logger);
         
+        logger.WriteLine("Tranga_CLI", "Selecting Task to Remove (from queue)");
         Console.WriteLine("Enter q to abort");
-        Console.WriteLine($"Number of lines:");
+        Console.WriteLine($"Select Task (0-{tasks.Length - 1}):");
 
-        string? chosenNumber = Console.ReadLine();
+        string? selectedTask = Console.ReadLine();
-        while(chosenNumber is null || chosenNumber.Length < 1)
+        while(selectedTask is null || selectedTask.Length < 1)
-            chosenNumber = Console.ReadLine();
+            selectedTask = Console.ReadLine();
         
-        if (chosenNumber.Length == 1 && chosenNumber.ToLower() == "q")
+        if (selectedTask.Length == 1 && selectedTask.ToLower() == "q")
         {
             Console.Clear();
             Console.WriteLine("aborted.");
             logger.WriteLine("Tranga_CLI", "aborted");
-            return;
+            return null;
         }
-
+        
         try
         {
-            string[] lines = logger.Tail(Convert.ToUInt32(chosenNumber));
+            int selectedTaskIndex = Convert.ToInt32(selectedTask);
-            Console.Clear();
+            logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-            foreach (string message in lines)
+            return tasks[selectedTaskIndex];
-                Console.Write(message);
         }
         catch (Exception e)
         {
             Console.WriteLine($"Exception: {e.Message}");
             logger.WriteLine("Tranga_CLI", e.Message);
         }
+
+        return null;
+    }
+
+    private static void AddTaskToQueue(TaskManager taskManager, Logger logger)
+    {
+        Console.Clear();
+        logger.WriteLine("Tranga_CLI", "Menu: Add Task to queue");
+
+        TrangaTask[] tasks = taskManager.GetAllTasks().Where(rTask =>
+            rTask.state is not TrangaTask.ExecutionState.Enqueued and not TrangaTask.ExecutionState.Running).ToArray();
+        
+        TrangaTask? selectedTask = SelectTask(tasks, logger);
+        if (selectedTask is null)
+            return;
+        
+        logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
+        taskManager.AddTaskToQueue(selectedTask);
+    }
+
+    private static void RemoveTaskFromQueue(TaskManager taskManager, Logger logger)
+    {
+        Console.Clear();
+        logger.WriteLine("Tranga_CLI", "Menu: Remove Task from queue");
+        
+        TrangaTask[] tasks = taskManager.GetAllTasks().Where(rTask => rTask.state is TrangaTask.ExecutionState.Enqueued).ToArray();
+
+        TrangaTask? selectedTask = SelectTask(tasks, logger);
+        if (selectedTask is null)
+            return;
+        
+        logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
+        taskManager.RemoveTaskFromQueue(selectedTask);
+    }
+
+    private static void TailLog(Logger logger)
+    {
+        logger.WriteLine("Tranga_CLI", "Menu: Show Log-lines");
+        Console.Clear();
+        
+        string[] lines = logger.Tail(20);
+        foreach (string message in lines)
+            Console.Write(message);
+
+        while (!Console.KeyAvailable)
+        {
+            string[] newLines = logger.GetNewLines();
+            foreach(string message in newLines)
+                Console.Write(message);
+            Thread.Sleep(40);
+        }
     }
 
     private static void CreateTask(TaskManager taskManager, TaskManager.SettingsData settings, Logger logger)
@@ -243,86 +333,27 @@ public static class Tranga_Cli
     private static void ExecuteTaskNow(TaskManager taskManager, Logger logger)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Executing Task");
-        TrangaTask[] tasks = taskManager.GetAllTasks();
+        TrangaTask[] tasks = taskManager.GetAllTasks().Where(nTask => nTask.state is not TrangaTask.ExecutionState.Running).ToArray();
-        if (tasks.Length < 1)
+        
-        {
+        TrangaTask? selectedTask = SelectTask(tasks, logger);
-            Console.Clear();
+        if (selectedTask is null)
-            Console.WriteLine("There are no available Tasks.");
-            logger.WriteLine("Tranga_CLI", "No available Tasks.");
             return;
-        }
-        PrintTasks(tasks, logger);
-        
-        logger.WriteLine("Tranga_CLI", "Selecting Task to Execute");
-        Console.WriteLine("Enter q to abort");
-        Console.WriteLine($"Select Task (0-{tasks.Length - 1}):");
-
-        string? selectedTask = Console.ReadLine();
-        while(selectedTask is null || selectedTask.Length < 1)
-            selectedTask = Console.ReadLine();
-        
-        if (selectedTask.Length == 1 && selectedTask.ToLower() == "q")
-        {
-            Console.Clear();
-            Console.WriteLine("aborted.");
-            logger.WriteLine("Tranga_CLI", "aborted");
-            return;
-        }
-        
-        try
-        {
-            int selectedTaskIndex = Convert.ToInt32(selectedTask);
-            logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-            taskManager.ExecuteTaskNow(tasks[selectedTaskIndex]);
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine($"Exception: {e.Message}");
-            logger.WriteLine("Tranga_CLI", e.Message);
-        }
         
+        logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
+        taskManager.ExecuteTaskNow(selectedTask);
     }
 
-    private static void RemoveTask(TaskManager taskManager, Logger logger)
+    private static void DeleteTask(TaskManager taskManager, Logger logger)
     {
-        logger.WriteLine("Tranga_CLI", "Menu: Remove Task");
+        logger.WriteLine("Tranga_CLI", "Menu: Delete Task");
         TrangaTask[] tasks = taskManager.GetAllTasks();
-        if (tasks.Length < 1)
-        {
-            Console.Clear();
-            Console.WriteLine("There are no available Tasks.");
-            logger.WriteLine("Tranga_CLI", "No available Tasks");
-            return;
-        }
-        PrintTasks(tasks, logger);
         
-        logger.WriteLine("Tranga_CLI", "Selecting Task");
+        TrangaTask? selectedTask = SelectTask(tasks, logger);
-        Console.WriteLine("Enter q to abort");
+        if (selectedTask is null)
-        Console.WriteLine($"Select Task (0-{tasks.Length - 1}):");
-
-        string? selectedTask = Console.ReadLine();
-        while(selectedTask is null || selectedTask.Length < 1)
-            selectedTask = Console.ReadLine();
-
-        if (selectedTask.Length == 1 && selectedTask.ToLower() == "q")
-        {
-            Console.Clear();
-            Console.WriteLine("aborted.");
-            logger.WriteLine("Tranga_CLI", "aborted.");
             return;
-        }
         
-        try
+        logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-        {
+        taskManager.DeleteTask(selectedTask.task, selectedTask.connectorName, selectedTask.publication);
-            int selectedTaskIndex = Convert.ToInt32(selectedTask);
-            logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-            taskManager.RemoveTask(tasks[selectedTaskIndex].task, tasks[selectedTaskIndex].connectorName, tasks[selectedTaskIndex].publication);
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine($"Exception: {e.Message}");
-            logger.WriteLine("Tranga_CLI", e.Message);
-        }
     }
 
     private static TrangaTask.Task? SelectTaskType(Logger logger)

Tranga.sln

@@ -4,10 +4,10 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga", ".\Tranga\Tranga.c
 EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga-CLI", "Tranga-CLI\Tranga-CLI.csproj", "{4899E3B2-B259-479A-B43E-042D043E9501}"
 EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga-API", "Tranga-API\Tranga-API.csproj", "{6284C936-4E90-486B-BC46-0AFAD85AD8EE}"
-EndProject
 Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Logging", "Logging\Logging.csproj", "{415BE889-BB7D-426F-976F-8D977876A462}"
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Tranga-API", "Tranga-API\Tranga-API.csproj", "{48F4E495-75BC-4402-8E03-DEC5B79D7E83}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -22,13 +22,13 @@ Global
 		{4899E3B2-B259-479A-B43E-042D043E9501}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{4899E3B2-B259-479A-B43E-042D043E9501}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{4899E3B2-B259-479A-B43E-042D043E9501}.Release|Any CPU.Build.0 = Release|Any CPU
-		{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{6284C936-4E90-486B-BC46-0AFAD85AD8EE}.Release|Any CPU.Build.0 = Release|Any CPU
 		{415BE889-BB7D-426F-976F-8D977876A462}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{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
+		{48F4E495-75BC-4402-8E03-DEC5B79D7E83}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{48F4E495-75BC-4402-8E03-DEC5B79D7E83}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{48F4E495-75BC-4402-8E03-DEC5B79D7E83}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{48F4E495-75BC-4402-8E03-DEC5B79D7E83}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 EndGlobal

Tranga/Connector.cs

@@ -80,7 +80,7 @@ public abstract class Connector
     /// <returns>XML-string</returns>
     protected static string CreateComicInfo(Publication publication, Chapter chapter, Logger? logger)
     {
-        logger?.WriteLine("Connector", $"Creating ComicInfo.Xml for {publication.sortName} Chapter {chapter.sortNumber}");
+        logger?.WriteLine("Connector", $"Creating ComicInfo.Xml for {publication.sortName} Chapter {chapter.volumeNumber} {chapter.chapterNumber}");
         XElement comicInfo = new XElement("ComicInfo",
             new XElement("Tags", string.Join(',',publication.tags)),
             new XElement("LanguageISO", publication.originalLanguage),

Tranga/Connectors/MangaDex.cs

@@ -58,14 +58,12 @@ public class MangaDex : Connector
                     : null;
 
                 JsonArray altTitlesObject = attributes["altTitles"]!.AsArray();
-                string[,] altTitles = new string[altTitlesObject.Count, 2];
+                Dictionary<string, string> altTitlesDict = new();
-                int titleIndex = 0;
                 foreach (JsonNode? altTitleNode in altTitlesObject)
                 {
                     JsonObject altTitleObject = (JsonObject)altTitleNode!;
                     string key = ((IDictionary<string, JsonNode?>)altTitleObject).Keys.ToArray()[0];
-                    altTitles[titleIndex, 0] = key;
+                    altTitlesDict.TryAdd(key, altTitleObject[key]!.GetValue<string>());
-                    altTitles[titleIndex++, 1] = altTitleObject[key]!.GetValue<string>();
                 }
 
                 JsonArray tagsObject = attributes["tags"]!.AsArray();
@@ -84,16 +82,14 @@ public class MangaDex : Connector
                     poster = relationships.FirstOrDefault(relationship => relationship!["type"]!.GetValue<string>() == "cover_art")!["id"]!.GetValue<string>();
                 }
 
+                Dictionary<string, string> linksDict = new();
                 string[,]? links = null;
                 if (attributes.ContainsKey("links") && attributes["links"] is not null)
                 {
                     JsonObject linksObject = attributes["links"]!.AsObject();
-                    links = new string[linksObject.Count, 2];
-                    int linkIndex = 0;
                     foreach (string key in ((IDictionary<string, JsonNode?>)linksObject).Keys)
                     {
-                        links[linkIndex, 0] = key;
+                        linksDict.Add(key, linksObject[key]!.GetValue<string>());
-                        links[linkIndex++, 1] = linksObject[key]!.GetValue<string>();
                     }
                 }
                 
@@ -110,10 +106,10 @@ public class MangaDex : Connector
                 Publication pub = new Publication(
                     title,
                     description,
-                    altTitles,
+                    altTitlesDict,
                     tags.ToArray(),
                     poster,
-                    links,
+                    linksDict,
                     year,
                     originalLanguage,
                     status,

Tranga/Publication.cs

@@ -9,31 +9,38 @@ public readonly struct Publication
 {
     public string sortName { get; }
     // ReSharper disable UnusedAutoPropertyAccessor.Global we need it, trust
-    [JsonIgnore]public string[,] altTitles { get; }
+    [JsonIgnore]public Dictionary<string,string> altTitles { get; }
     // ReSharper disable trice MemberCanBePrivate.Global, trust
     public string? description { get; }
     public string[] tags { get; }
     public string? posterUrl { get; }
-    [JsonIgnore]public string[,]? links { get; }
+    [JsonIgnore]public Dictionary<string,string> links { get; }
     public int? year { get; }
     public string? originalLanguage { get; }
     public string status { get; }
     public string folderName { get; }
     public string downloadUrl { get; }
+    public string internalId { get; }
 
-    public Publication(string sortName, string? description, string[,] altTitles, string[] tags, string? posterUrl, string[,]? links, int? year, string? originalLanguage, string status, string downloadUrl)
+    public readonly struct ValueTuple
+    {
+        
+    }
+
+    public Publication(string sortName, string? description, Dictionary<string,string> altTitles, string[] tags, string? posterUrl, Dictionary<string,string>? links, int? year, string? originalLanguage, string status, string downloadUrl)
     {
         this.sortName = sortName;
         this.description = description;
         this.altTitles = altTitles;
         this.tags = tags;
         this.posterUrl = posterUrl;
-        this.links = links;
+        this.links = links ?? new Dictionary<string, string>();
         this.year = year;
         this.originalLanguage = originalLanguage;
         this.status = status;
         this.downloadUrl = downloadUrl;
         this.folderName = string.Concat(sortName.Split(Path.GetInvalidPathChars().Concat(Path.GetInvalidFileNameChars()).ToArray()));
+        this.internalId = Guid.NewGuid().ToString();
     }
     
     /// <returns>Serialized JSON String for series.json</returns>

Tranga/TaskExecutor.cs

@@ -17,7 +17,7 @@ public static class TaskExecutor
     /// <param name="chapterCollection">Current chapterCollection to update</param>
     /// <param name="logger"></param>
     /// <exception cref="ArgumentException">Is thrown when there is no Connector available with the name of the TrangaTask.connectorName</exception>
-    public static void Execute(TaskManager taskManager, TrangaTask trangaTask, Dictionary<Publication, List<Chapter>> chapterCollection, Logger? logger)
+    public static void Execute(TaskManager taskManager, TrangaTask trangaTask, Logger? logger)
     {
         //Only execute task if it is not already being executed.
         if (trangaTask.state == TrangaTask.ExecutionState.Running)
@@ -37,13 +37,13 @@ public static class TaskExecutor
         switch (trangaTask.task)
         {
             case TrangaTask.Task.DownloadNewChapters:
-                DownloadNewChapters(connector!, (Publication)trangaTask.publication!, trangaTask.language, chapterCollection);
+                DownloadNewChapters(connector!, (Publication)trangaTask.publication!, trangaTask.language, ref taskManager._chapterCollection);
                 break;
             case TrangaTask.Task.UpdateChapters:
-                UpdateChapters(connector!, (Publication)trangaTask.publication!, trangaTask.language, chapterCollection);
+                UpdateChapters(connector!, (Publication)trangaTask.publication!, trangaTask.language, ref taskManager._chapterCollection);
                 break;
             case TrangaTask.Task.UpdatePublications:
-                UpdatePublications(connector!, chapterCollection);
+                UpdatePublications(connector!, ref taskManager._chapterCollection);
                 break;
             case TrangaTask.Task.UpdateKomgaLibrary:
                 UpdateKomgaLibrary(taskManager);
@@ -75,7 +75,7 @@ public static class TaskExecutor
     /// </summary>
     /// <param name="connector">Connector to receive Publications from</param>
     /// <param name="chapterCollection"></param>
-    private static void UpdatePublications(Connector connector, Dictionary<Publication, List<Chapter>> chapterCollection)
+    private static void UpdatePublications(Connector connector, ref Dictionary<Publication, List<Chapter>> chapterCollection)
     {
         Publication[] publications = connector.GetPublications();
         foreach (Publication publication in publications)
@@ -90,9 +90,9 @@ public static class TaskExecutor
     /// <param name="publication">Publication to check</param>
     /// <param name="language">Language to receive chapters for</param>
     /// <param name="chapterCollection"></param>
-    private static void DownloadNewChapters(Connector connector, Publication publication, string language, Dictionary<Publication, List<Chapter>> chapterCollection)
+    private static void DownloadNewChapters(Connector connector, Publication publication, string language, ref Dictionary<Publication, List<Chapter>> chapterCollection)
     {
-        List<Chapter> newChapters = UpdateChapters(connector, publication, language, chapterCollection);
+        List<Chapter> newChapters = UpdateChapters(connector, publication, language, ref chapterCollection);
         connector.DownloadCover(publication);
         
         //Check if Publication already has a Folder and a series.json
@@ -116,7 +116,7 @@ public static class TaskExecutor
     /// <param name="language">Language to receive chapters for</param>
     /// <param name="chapterCollection"></param>
     /// <returns>List of Chapters that were previously not in collection</returns>
-    private static List<Chapter> UpdateChapters(Connector connector, Publication publication, string language, Dictionary<Publication, List<Chapter>> chapterCollection)
+    private static List<Chapter> UpdateChapters(Connector connector, Publication publication, string language, ref Dictionary<Publication, List<Chapter>> chapterCollection)
     {
         List<Chapter> newChaptersList = new();
         chapterCollection.TryAdd(publication, newChaptersList); //To ensure publication is actually in collection

Tranga/TaskManager.cs

@@ -10,44 +10,57 @@ namespace Tranga;
 /// </summary>
 public class TaskManager
 {
-    private readonly Dictionary<Publication, List<Chapter>> _chapterCollection = new();
+    public Dictionary<Publication, List<Chapter>> _chapterCollection = new();
     private readonly HashSet<TrangaTask> _allTasks;
     private bool _continueRunning = true;
     private readonly Connector[] _connectors;
-    private Dictionary<Connector, List<TrangaTask>> tasksToExecute = new();
+    private readonly Dictionary<Connector, List<TrangaTask>> _taskQueue = new();
-    private string downloadLocation { get; }
+    public SettingsData settings { get; }
     private Logger? logger { get; }
-    
     public Komga? komga { get; }
 
-    /// <param name="folderPath">Local path to save data (Manga) to</param>
+    /// <param name="downloadFolderPath">Local path to save data (Manga) to</param>
+    /// <param name="settingsFilePath">Path to the settings file (data.json)</param>
     /// <param name="komgaBaseUrl">The Url of the Komga-instance that you want to update</param>
     /// <param name="komgaUsername">The Komga username</param>
     /// <param name="komgaPassword">The Komga password</param>
     /// <param name="logger"></param>
-    public TaskManager(string folderPath, string? komgaBaseUrl = null, string? komgaUsername = null, string? komgaPassword = null, Logger? logger = null)
+    public TaskManager(string downloadFolderPath, string? settingsFilePath = null, string? komgaBaseUrl = null, string? komgaUsername = null, string? komgaPassword = null, Logger? logger = null)
     {
         this.logger = logger;
-        this.downloadLocation = folderPath;
+        _allTasks = new HashSet<TrangaTask>();
-
         if (komgaBaseUrl != null && komgaUsername != null && komgaPassword != null)
             this.komga = new Komga(komgaBaseUrl, komgaUsername, komgaPassword, logger);
-        this._connectors = new Connector[]{ new MangaDex(folderPath, logger) };
+        
+        this.settings = new SettingsData(downloadFolderPath, settingsFilePath, this.komga, this._allTasks);
+        ExportData();
+        
+        this._connectors = new Connector[]{ new MangaDex(downloadFolderPath, logger) };
         foreach(Connector cConnector in this._connectors)
-            tasksToExecute.Add(cConnector, new List<TrangaTask>());
+            _taskQueue.Add(cConnector, new List<TrangaTask>());
-        _allTasks = new HashSet<TrangaTask>();
         
         Thread taskChecker = new(TaskCheckerThread);
         taskChecker.Start();
     }
 
+    public void UpdateSettings(string? downloadLocation, string? komgaUrl, string? komgaAuth)
+    {
+        Komga? komga = null;
+        if (komgaUrl is not null && komgaAuth is not null)
+            komga = new Komga(komgaUrl, komgaAuth, null);
+        settings.UpdateSettings(downloadLocation, komga);
+        ExportData();
+    }
+
     public TaskManager(SettingsData settings, Logger? logger = null)
     {
         this.logger = logger;
         this._connectors = new Connector[]{ new MangaDex(settings.downloadLocation, logger) };
+        this.settings = settings;
+        ExportData();
+        
         foreach(Connector cConnector in this._connectors)
-            tasksToExecute.Add(cConnector, new List<TrangaTask>());
+            _taskQueue.Add(cConnector, new List<TrangaTask>());
-        this.downloadLocation = settings.downloadLocation;
         this.komga = settings.komga;
         _allTasks = settings.allTasks;
         Thread taskChecker = new(TaskCheckerThread);
@@ -64,10 +77,10 @@ public class TaskManager
         while (_continueRunning)
         {
             //Check if previous tasks have finished and execute new tasks
-            foreach (KeyValuePair<Connector, List<TrangaTask>> connectorTaskQueue in tasksToExecute)
+            foreach (KeyValuePair<Connector, List<TrangaTask>> connectorTaskQueue in _taskQueue)
             {
                 if(connectorTaskQueue.Value.RemoveAll(task => task.state == TrangaTask.ExecutionState.Waiting) > 0)
-                    ExportData(Directory.GetCurrentDirectory());
+                    ExportData();
                 
                 if (connectorTaskQueue.Value.Count > 0 && connectorTaskQueue.Value.All(task => task.state is TrangaTask.ExecutionState.Enqueued))
                     ExecuteTaskNow(connectorTaskQueue.Value.First());
@@ -83,7 +96,7 @@ public class TaskManager
                 else
                 {
                     logger?.WriteLine(this.GetType().ToString(), $"Task due: {task}");
-                    tasksToExecute[GetConnector(task.connectorName!)].Add(task);
+                    _taskQueue[GetConnector(task.connectorName!)].Add(task);
                 }
             }
             Thread.Sleep(1000);
@@ -102,7 +115,7 @@ public class TaskManager
         logger?.WriteLine(this.GetType().ToString(), $"Forcing Execution: {task}");
         Task t = new Task(() =>
         {
-            TaskExecutor.Execute(this, task, this._chapterCollection, logger);
+            TaskExecutor.Execute(this, task, logger);
         });
         t.Start();
     }
@@ -120,8 +133,6 @@ public class TaskManager
         string language = "")
     {
         logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {task} {connectorName} {publication?.sortName}");
-        if (task != TrangaTask.Task.UpdateKomgaLibrary && connectorName is null)
-            throw new ArgumentException($"connectorName can not be null for task {task}");
 
         TrangaTask newTask;
         if (task == TrangaTask.Task.UpdateKomgaLibrary)
@@ -137,6 +148,9 @@ public class TaskManager
         }
         else
         {
+            if(connectorName is null)
+                throw new ArgumentException($"connectorName can not be null for task {task}");
+            
             //Get appropriate Connector from available Connectors for TrangaTask
             Connector? connector = _connectors.FirstOrDefault(c => c.name == connectorName);
             if (connector is null)
@@ -149,12 +163,12 @@ public class TaskManager
                                              trangaTask.publication?.downloadUrl == publication?.downloadUrl))
             {
                 if(task != TrangaTask.Task.UpdatePublications)
-                    _chapterCollection.Add((Publication)publication!, new List<Chapter>());
+                    _chapterCollection.TryAdd((Publication)publication!, new List<Chapter>());
                 _allTasks.Add(newTask);
             }
         }
         logger?.WriteLine(this.GetType().ToString(), $"Added new Task {newTask.ToString()}");
-        ExportData(Directory.GetCurrentDirectory());
+        ExportData();
         
         return newTask;
     }
@@ -165,7 +179,7 @@ public class TaskManager
     /// <param name="task">TrangaTask.Task type</param>
     /// <param name="connectorName">Name of Connector that was used</param>
     /// <param name="publication">Publication that was used</param>
-    public void RemoveTask(TrangaTask.Task task, string? connectorName, Publication? publication)
+    public void DeleteTask(TrangaTask.Task task, string? connectorName, Publication? publication)
     {
         logger?.WriteLine(this.GetType().ToString(), $"Removing Task {task} {publication?.sortName}");
         if (task == TrangaTask.Task.UpdateKomgaLibrary)
@@ -184,7 +198,29 @@ public class TaskManager
             else
                 logger?.WriteLine(this.GetType().ToString(), $"No Task {task} {publication?.sortName} {publication?.downloadUrl} could be found.");
         }
-        ExportData(Directory.GetCurrentDirectory());
+        ExportData();
+    }
+
+    /// <summary>
+    /// Removes a Task from the queue
+    /// </summary>
+    /// <param name="task"></param>
+    public void RemoveTaskFromQueue(TrangaTask task)
+    {
+        task.lastExecuted = DateTime.Now;
+        foreach (List<TrangaTask> taskList in this._taskQueue.Values)
+            taskList.Remove(task);
+        task.state = TrangaTask.ExecutionState.Waiting;
+    }
+
+    /// <summary>
+    /// Sets last execution time to start of time
+    /// Let taskManager handle enqueuing
+    /// </summary>
+    /// <param name="task"></param>
+    public void AddTaskToQueue(TrangaTask task)
+    {
+        task.lastExecuted = DateTime.UnixEpoch;
     }
     
     /// <returns>All available Connectors</returns>
@@ -200,6 +236,17 @@ public class TaskManager
         _allTasks.CopyTo(ret);
         return ret;
     }
+
+    public Publication[] GetPublicationsFromConnector(Connector connector, string? title = null)
+    {
+        Publication[] ret = connector.GetPublications(title ?? "");
+        foreach (Publication publication in ret)
+        {
+            if(!_chapterCollection.Any(pub => pub.Key.sortName == publication.sortName))
+                this._chapterCollection.TryAdd(publication, new List<Chapter>());
+        }
+        return ret;
+    }
     
     /// <returns>All added Publications</returns>
     public Publication[] GetAllPublications()
@@ -230,7 +277,7 @@ public class TaskManager
     {
         logger?.WriteLine(this.GetType().ToString(), $"Shutting down (forced={force})");
         _continueRunning = false;
-        ExportData(Directory.GetCurrentDirectory());
+        ExportData();
         
         if(force)
             Environment.Exit(_allTasks.Count(task => task.state is TrangaTask.ExecutionState.Enqueued or TrangaTask.ExecutionState.Running));
@@ -245,14 +292,13 @@ public class TaskManager
     /// <summary>
     /// Loads stored data (settings, tasks) from file
     /// </summary>
-    /// <param name="importFolderPath">working directory, filename has to be data.json</param>
+    /// <param name="importFilePath">working directory, filename has to be data.json</param>
-    public static SettingsData LoadData(string importFolderPath)
+    public static SettingsData LoadData(string importFilePath)
     {
-        string importPath = Path.Join(importFolderPath, "data.json");
+        if (!File.Exists(importFilePath))
-        if (!File.Exists(importPath))
+            return new SettingsData(Directory.GetCurrentDirectory(), null, null, new HashSet<TrangaTask>());
-            return new SettingsData("", null, new HashSet<TrangaTask>());
 
-        string toRead = File.ReadAllText(importPath);
+        string toRead = File.ReadAllText(importFilePath);
         SettingsData data = JsonConvert.DeserializeObject<SettingsData>(toRead)!;
 
         return data;
@@ -261,29 +307,40 @@ public class TaskManager
     /// <summary>
     /// Exports data (settings, tasks) to file
     /// </summary>
-    /// <param name="exportFolderPath">Folder path, filename will be data.json</param>
+    private void ExportData()
-    private void ExportData(string exportFolderPath)
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Exporting data to data.json");
+        logger?.WriteLine(this.GetType().ToString(), $"Exporting data to {settings.settingsFilePath}");
-        SettingsData data = new SettingsData(this.downloadLocation, this.komga, this._allTasks);
+        
+        
 
-        string exportPath = Path.Join(exportFolderPath, "data.json");
+        string serializedData = JsonConvert.SerializeObject(settings);
-        string serializedData = JsonConvert.SerializeObject(data);
+
-        File.Delete(exportPath);
+        File.WriteAllText(settings.settingsFilePath, serializedData);
-        File.WriteAllText(exportPath, serializedData);
     }
 
     public class SettingsData
     {
-        public string downloadLocation { get; set; }
+        public string downloadLocation { get; private set; }
-        public Komga? komga { get; set; }
+        public string settingsFilePath { get; }
+        public Komga? komga { get; private set; }
         public HashSet<TrangaTask> allTasks { get; }
 
-        public SettingsData(string downloadLocation, Komga? komga, HashSet<TrangaTask> allTasks)
+        public SettingsData(string downloadLocation, string? settingsFilePath, Komga? komga, HashSet<TrangaTask> allTasks)
         {
+            this.settingsFilePath = settingsFilePath ??
+                                    Path.Join(Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData),
+                                        "Tranga", "data.json");
             this.downloadLocation = downloadLocation;
             this.komga = komga;
             this.allTasks = allTasks;
         }
+
+        public void UpdateSettings(string? pDownloadLocation, Komga? pKomga)
+        {
+            if(pDownloadLocation is not null)
+                this.downloadLocation = pDownloadLocation;
+            if(pKomga is not null)
+                this.komga = pKomga;
+        }
     }
 }