string

Added statement "Exiting." when exiting for feedback to userinput.

Logging/FileLogger.cs

@@ -6,14 +6,27 @@ 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)
     {
-        File.AppendAllText(logFilePath, logMessage.ToString());
+        try
+        {
+            File.AppendAllText(logFilePath, logMessage.ToString());
+        }
+        catch (Exception e)
+        {
+            stdOut?.WriteLine(e);
+        }
     }
 }

Logging/Logger.cs

@@ -9,13 +9,12 @@ public class Logger : TextWriter
     public enum LoggerType
     {
         FileLogger,
-        ConsoleLogger,
+        ConsoleLogger
-        MemoryLogger
     }
 
     private FileLogger? _fileLogger;
     private FormattedConsoleLogger? _formattedConsoleLogger;
-    private MemoryLogger? _memoryLogger;
+    private MemoryLogger _memoryLogger;
     private TextWriter? stdOut;
 
     public Logger(LoggerType[] enabledLoggers, TextWriter? stdOut, Encoding? encoding, string? logFilePath)
@@ -30,7 +29,7 @@ public class Logger : TextWriter
             throw new ArgumentException($"logFilePath can not be null for LoggerType {LoggerType.FileLogger}");
         }
         _formattedConsoleLogger = enabledLoggers.Contains(LoggerType.ConsoleLogger) ? new FormattedConsoleLogger(null, encoding) : null;
-        _memoryLogger = enabledLoggers.Contains(LoggerType.MemoryLogger) ? new MemoryLogger(null, encoding) : null;
+        _memoryLogger = new MemoryLogger(null, encoding);
     }
 
     public void WriteLine(string caller, string? value)
@@ -46,9 +45,19 @@ public class Logger : TextWriter
             return;
         
         _fileLogger?.Write(caller, value);
-        _memoryLogger?.Write(caller, value);
         _formattedConsoleLogger?.Write(caller, value);
         
+        _memoryLogger.Write(caller, value);
         stdOut?.Write(value);
     }
+
+    public string[] Tail(uint? lines)
+    {
+        return _memoryLogger.Tail(lines);
+    }
+
+    public string[] GetNewLines()
+    {
+        return _memoryLogger.GetNewLines();
+    }
 }

Logging/LoggerBase.cs

@@ -5,7 +5,7 @@ namespace Logging;
 public abstract class LoggerBase : TextWriter
 {
     public override Encoding Encoding { get; }
-    private TextWriter? stdOut { get; }
+    protected TextWriter? stdOut { get; }
 
     public LoggerBase(TextWriter? stdOut, Encoding? encoding = null)
     {
@@ -52,7 +52,7 @@ public abstract class LoggerBase : TextWriter
         public override string ToString()
         {
             string dateTimeString = $"{logTime.ToShortDateString()} {logTime.ToLongTimeString()}";
-            return $"[{dateTimeString}] {caller,-30} | {value}";
+            return $"[{dateTimeString}] {caller,30} | {value}";
         }
     }
 }

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,30 +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()
     {
-        string[] ret = new string[logMessages.Count];
+        return Tail(Convert.ToUInt32(_logMessages.Count));
-        for (int logMessageIndex = 0; logMessageIndex < ret.Length; logMessageIndex++)
+    }
+
+    public string[] Tail(uint? length)
+    {
+        int retLength;
+        if (length is null || length > _logMessages.Count)
+            retLength = _logMessages.Count;
+        else
+            retLength = (int)length;
+        
+        string[] ret = new string[retLength];
+
+        for (int retIndex = 0; retIndex < ret.Length; retIndex++)
         {
-            DateTime logTime = logMessages.GetValueAtIndex(logMessageIndex).logTime;
+            ret[retIndex] = _logMessages.GetValueAtIndex(_logMessages.Count - retLength + retIndex).ToString();
-            string dateTimeString = $"{logTime.ToShortDateString()} {logTime.ToShortTimeString()}";
-            string callerString = logMessages.GetValueAtIndex(logMessageIndex).caller.ToString();
-            string value = $"[{dateTimeString}] {callerString} | {logMessages.GetValueAtIndex(logMessageIndex).value}";
-            ret[logMessageIndex] = value;
         }
 
+        _lastLogMessageIndex = _logMessages.Count - 1;
         return ret;
     }
 
-    public string[] Tail(uint length)
+    public string[] GetNewLines()
     {
-        string[] ret = new string[length];
+        int logMessageCount = _logMessages.Count;
-        for (int logMessageIndex = logMessages.Count - 1; logMessageIndex > logMessageIndex - length; logMessageIndex--)
+        string[] ret = new string[logMessageCount - _lastLogMessageIndex];
-            ret[logMessageIndex] = logMessages.GetValueAtIndex(logMessageIndex).ToString();
 
-        return ret.Reverse().ToArray();
+        for (int retIndex = 0; retIndex < ret.Length; retIndex++)
+        {
+            ret[retIndex] = _logMessages.GetValueAtIndex(_lastLogMessageIndex + retIndex).ToString();
+        }
+
+        _lastLogMessageIndex = logMessageCount;
+        return ret;
     }
 }

Tranga-API/Program.cs

@@ -63,15 +63,14 @@ app.MapGet("/RemoveTask", (TrangaTask.Task task, string? connectorName, string?
     switch (task)
     {
         case TrangaTask.Task.UpdateKomgaLibrary:
-            taskManager.RemoveTask(TrangaTask.Task.UpdateKomgaLibrary, null, null);
+            taskManager.DeleteTask(TrangaTask.Task.UpdateKomgaLibrary, null, null);
             return JsonSerializer.Serialize("Success");
-            break;
         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);
+            taskManager.DeleteTask(TrangaTask.Task.DownloadNewChapters, connectorName, publication);
             
             return JsonSerializer.Serialize("Success");
         

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, Logger.LoggerType.MemoryLogger }, 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");
@@ -75,46 +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(
+                            taskManager.GetAllTasks().Where(eTask => eTask.state == TrangaTask.ExecutionState.Running)
+                                .ToArray(), logger);
+                        Console.WriteLine("Press any key.");
+                        Console.ReadKey();
+                        break;
+                    case ConsoleKey.K:
+                        PrintTasks(
+                            taskManager.GetAllTasks().Where(qTask => qTask.state is TrangaTask.ExecutionState.Enqueued)
+                                .ToArray(), logger);
+                        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");
@@ -127,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);
@@ -135,16 +182,13 @@ public static class Tranga_Cli
             taskManager.GetAllTasks().Count(task => task.state == TrangaTask.ExecutionState.Enqueued);
         Console.Clear();
         Console.WriteLine($"Download Folder: {folderPath}");
-        Console.WriteLine($"Tasks (Running/Queue/Total));: {taskRunningCount}/{taskEnqueuedCount}/{taskCount}");
+        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();
-        Console.WriteLine($"{"U: Update this Screen",-30}{"Q: Exit",-30}");
+        Console.WriteLine($"{"",-30}{"F: Show Log",-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)
@@ -164,6 +208,98 @@ public static class Tranga_Cli
             Console.WriteLine($"{tIndex++:000}: {trangaTask}");
     }
 
+    private static TrangaTask? SelectTask(TrangaTask[] tasks, Logger logger)
+    {
+        logger.WriteLine("Tranga_CLI", "Menu: Select task");
+        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($"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 null;
+        }
+        
+        try
+        {
+            int selectedTaskIndex = Convert.ToInt32(selectedTask);
+            logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
+            return tasks[selectedTaskIndex];
+        }
+        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)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Creating Task");
@@ -197,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)
@@ -414,8 +491,10 @@ public static class Tranga_Cli
     private static void SearchTasks(TaskManager taskManager, Logger logger)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Search task");
+        Console.Clear();
+        Console.WriteLine("Enter search query:");
         string? query = Console.ReadLine();
-        while (query is null || query.Length < 1)
+        while (query is null || query.Length < 4)
             query = Console.ReadLine();
         PrintTasks(taskManager.GetAllTasks().Where(qTask =>
             qTask.ToString().ToLower().Contains(query, StringComparison.OrdinalIgnoreCase)).ToArray(), logger);

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

@@ -21,7 +21,7 @@ public class MangaDex : Connector
 
     public override Publication[] GetPublications(string publicationTitle = "")
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Getting Publications");
+        logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
         const int limit = 100; //How many values we want returned at once
         int offset = 0; //"Page"
         int total = int.MaxValue; //How many total results are there, is updated on first request
@@ -128,7 +128,7 @@ public class MangaDex : Connector
 
     public override Chapter[] GetChapters(Publication publication, string language = "")
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters");
+        logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters {publication.sortName} (language={language})");
         const int limit = 100; //How many values we want returned at once
         int offset = 0; //"Page"
         int total = int.MaxValue; //How many total results are there, is updated on first request
@@ -183,7 +183,7 @@ public class MangaDex : Connector
 
     public override void DownloadChapter(Publication publication, Chapter chapter)
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Download Chapter {publication.sortName} {chapter.sortNumber}");
+        logger?.WriteLine(this.GetType().ToString(), $"Download Chapter {publication.sortName} {chapter.volumeNumber}-{chapter.chapterNumber}");
         //Request URLs for Chapter-Images
         DownloadClient.RequestResult requestResult =
             downloadClient.MakeRequest($"https://api.mangadex.org/at-home/server/{chapter.url}?forcePort443=false'");

Tranga/TaskExecutor.cs

@@ -15,6 +15,7 @@ public static class TaskExecutor
     /// <param name="taskManager">Parent</param>
     /// <param name="trangaTask">Task to execute</param>
     /// <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)
     {
@@ -25,7 +26,7 @@ public static class TaskExecutor
             return;
         }
         trangaTask.state = TrangaTask.ExecutionState.Running;
-        logger?.WriteLine("TaskExecutor", $"Executing Task {trangaTask}");
+        logger?.WriteLine("TaskExecutor", $"Starting Task {trangaTask}");
         
         //Connector is not needed for all tasks
         Connector? connector = null;
@@ -49,9 +50,9 @@ public static class TaskExecutor
                 break;
         }
         
-        logger?.WriteLine("TaskExecutor", $"Task executed! {trangaTask}");
+        logger?.WriteLine("TaskExecutor", $"Task finished! {trangaTask}");
-        trangaTask.state = TrangaTask.ExecutionState.Waiting;
         trangaTask.lastExecuted = DateTime.Now;
+        trangaTask.state = TrangaTask.ExecutionState.Waiting;
     }
 
     /// <summary>

Tranga/TaskManager.cs

@@ -14,28 +14,31 @@ public class TaskManager
     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();
@@ -45,9 +48,11 @@ public class TaskManager
     {
         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);
@@ -60,13 +65,16 @@ public class TaskManager
     /// </summary>
     private void TaskCheckerThread()
     {
+        logger?.WriteLine(this.GetType().ToString(), "Starting TaskCheckerThread.");
         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)
             {
-                connectorTaskQueue.Value.RemoveAll(task => task.state == TrangaTask.ExecutionState.Waiting);
+                if(connectorTaskQueue.Value.RemoveAll(task => task.state == TrangaTask.ExecutionState.Waiting) > 0)
-                if (connectorTaskQueue.Value.Count > 0 && !connectorTaskQueue.Value.All(task => task.state is TrangaTask.ExecutionState.Running or TrangaTask.ExecutionState.Enqueued))
+                    ExportData();
+                
+                if (connectorTaskQueue.Value.Count > 0 && connectorTaskQueue.Value.All(task => task.state is TrangaTask.ExecutionState.Enqueued))
                     ExecuteTaskNow(connectorTaskQueue.Value.First());
             }
             
@@ -80,7 +88,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);
@@ -116,7 +124,7 @@ public class TaskManager
     public TrangaTask AddTask(TrangaTask.Task task, string? connectorName, Publication? publication, TimeSpan reoccurrence,
         string language = "")
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Adding new Task");
+        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}");
 
@@ -150,8 +158,8 @@ public class TaskManager
                 _allTasks.Add(newTask);
             }
         }
-        logger?.WriteLine(this.GetType().ToString(), newTask.ToString());
+        logger?.WriteLine(this.GetType().ToString(), $"Added new Task {newTask.ToString()}");
-        ExportData(Directory.GetCurrentDirectory());
+        ExportData();
         
         return newTask;
     }
@@ -162,18 +170,48 @@ 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}");
+        logger?.WriteLine(this.GetType().ToString(), $"Removing Task {task} {publication?.sortName}");
         if (task == TrangaTask.Task.UpdateKomgaLibrary)
+        {
             _allTasks.RemoveWhere(uTask => uTask.task == TrangaTask.Task.UpdateKomgaLibrary);
+            logger?.WriteLine(this.GetType().ToString(), $"Removed Task {task}");
+        }
         else if (connectorName is null)
             throw new ArgumentException($"connectorName can not be null for Task {task}");
         else
-            _allTasks.RemoveWhere(trangaTask =>
+        {
+            if(_allTasks.RemoveWhere(trangaTask =>
                 trangaTask.task == task && trangaTask.connectorName == connectorName &&
-                trangaTask.publication?.downloadUrl == publication?.downloadUrl);
+                trangaTask.publication?.downloadUrl == publication?.downloadUrl) > 0)
-        ExportData(Directory.GetCurrentDirectory());
+                logger?.WriteLine(this.GetType().ToString(), $"Removed Task {task} {publication?.sortName} {publication?.downloadUrl}.");
+            else
+                logger?.WriteLine(this.GetType().ToString(), $"No Task {task} {publication?.sortName} {publication?.downloadUrl} could be found.");
+        }
+        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>
@@ -201,7 +239,7 @@ public class TaskManager
     /// </summary>
     /// <param name="connectorName">Connector-name (exact)</param>
     /// <exception cref="Exception">If Connector is not available</exception>
-    public Connector GetConnector(string connectorName)
+    public Connector GetConnector(string? connectorName)
     {
         if(connectorName is null)
             throw new Exception($"connectorName can not be null");
@@ -219,7 +257,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));
@@ -227,20 +265,20 @@ public class TaskManager
         //Wait for tasks to finish
         while(_allTasks.Any(task => task.state is TrangaTask.ExecutionState.Running or TrangaTask.ExecutionState.Enqueued))
             Thread.Sleep(10);
+        logger?.WriteLine(this.GetType().ToString(), "Tasks finished. Bye!");
         Environment.Exit(0);
     }
 
     /// <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;
@@ -249,25 +287,26 @@ 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.WriteAllText(settings.settingsFilePath, serializedData);
-        File.WriteAllText(exportPath, serializedData);
     }
 
     public class SettingsData
     {
         public string downloadLocation { get; set; }
+        public string settingsFilePath { get; }
         public Komga? komga { get; 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;