Update readme HtmlAgilityPack

executionStarted,
executionApproximatelyFinished,
executionApproximatelyRemaining
to track progress

Dockerfile

@@ -10,4 +10,5 @@ FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
 WORKDIR /publish
 COPY --from=build-env /publish .
 EXPOSE 80
+RUN apt-get update && apt-get install -y libx11-6 libx11-xcb1 libatk1.0-0 libgtk-3-0 libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libxshmfence1 libnss3
 ENTRYPOINT ["dotnet", "/publish/Tranga-API.dll"]

README.md

@@ -55,8 +55,9 @@ Tranga can download Chapters and Metadata from Scanlation sites such as
 
 - [MangaDex.org](https://mangadex.org/)
 - [Manganato.com](https://manganato.com/)
+- [Mangasee](https://mangasee123.com/)
 
-and automatically start updates in [Komga](https://komga.org/) to import them.
+and automatically start updates in [Komga](https://komga.org/) and [Kavita](https://www.kavitareader.com/) to import them.
 
 ### Inspiration:
 
@@ -72,6 +73,8 @@ That is why I wanted to create my own project, in a language I understand, and t
 
 - .NET-Core
 - Newtonsoft.JSON
+- [PuppeteerSharp](https://www.puppeteersharp.com/)
+- [Html Agility Pack (HAP)](https://html-agility-pack.net/)
 - Love <3 Blåhaj 🦈
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
@@ -108,14 +111,12 @@ Wherever you are mounting `/usr/share/Tranga-API` you also need to mount that sa
 
 ### Prerequisites
 
-[.NET-Core 7.0](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
+[.NET-Core 7.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
 
 <!-- ROADMAP -->
 ## Roadmap
 
-- [x] Web-UI #1
-- [ ] More Connectors
-  - [x] Manganato #2
+- [ ] Docker ARM support
 - [ ] ? 
 
 See the [open issues](https://git.bernloehr.eu/glax/Tranga/issues) for a full list of proposed features (and known issues).

Tranga-API/Program.cs

@@ -73,16 +73,14 @@ 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??"");
+    taskManager.AddTask(task, connectorName, publicationId, TimeSpan.Parse(reoccurrenceTime), language??"");
 });
 
 app.MapDelete("/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);
+    taskManager.DeleteTask(task, connectorName, publicationId);
 });
 
 app.MapGet("/Tasks/Get", (string taskType, string? connectorName, string? searchString) =>
@@ -90,12 +88,7 @@ app.MapGet("/Tasks/Get", (string taskType, string? connectorName, string? search
     try
     {
         TrangaTask.Task task = Enum.Parse<TrangaTask.Task>(taskType);
-        if (searchString is null || connectorName is null)
-            return taskManager.GetAllTasks().Where(tTask => tTask.task == task);
-        else
-            return taskManager.GetAllTasks().Where(tTask =>
-                tTask.task == task && tTask.connectorName == connectorName && tTask.ToString()
-                    .Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
+        return taskManager.GetTasksMatching(task, connectorName:connectorName, searchString:searchString);
     }
     catch (ArgumentException)
     {
@@ -108,15 +101,9 @@ app.MapGet("/Tasks/GetTaskProgress", (string taskType, string? connectorName, st
     try
     {
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
-        TrangaTask? task = null;
-        if (connectorName is null || publicationId is null)
-            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
-                tTask.task == pTask);
-        else
-            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
-                tTask.task == pTask && tTask.publication?.internalId == publicationId &&
-                tTask.connectorName == connectorName);
-            
+        TrangaTask? task = taskManager
+            .GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId)?.First();
+
         if (task is null)
             return -1f;
 
@@ -128,19 +115,13 @@ app.MapGet("/Tasks/GetTaskProgress", (string taskType, string? connectorName, st
     }
 });
 
-app.MapPost("/Tasks/Start", (string taskType, string? connectorName, string? publicationId) =>
+app.MapPost("/Tasks/Start", (string taskType, string? connectorName, string? internalId) =>
 {
     try
     {
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
-        TrangaTask? task = null;
-        if (connectorName is null || publicationId is null)
-            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
-                tTask.task == pTask);
-        else
-            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
-                tTask.task == pTask && tTask.publication?.internalId == publicationId &&
-                tTask.connectorName == connectorName);
+        TrangaTask? task = taskManager
+            .GetTasksMatching(pTask, connectorName: connectorName, internalId: internalId)?.FirstOrDefault();
             
         if (task is null)
             return;
@@ -164,14 +145,8 @@ app.MapPost("/Queue/Enqueue", (string taskType, string? connectorName, string? p
     try
     {
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
-        TrangaTask? task = null;
-        if (connectorName is null || publicationId is null)
-            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
-                tTask.task == pTask);
-        else
-            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
-                tTask.task == pTask && tTask.publication?.internalId == publicationId &&
-                tTask.connectorName == connectorName);
+        TrangaTask? task = taskManager
+            .GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId)?.First();
             
         if (task is null)
             return;
@@ -188,14 +163,8 @@ app.MapDelete("/Queue/Dequeue", (string taskType, string? connectorName, string?
     try
     {
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
-        TrangaTask? task = null;
-        if (connectorName is null || publicationId is null)
-            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
-                tTask.task == pTask);
-        else
-            task = taskManager.GetAllTasks().FirstOrDefault(tTask =>
-                tTask.task == pTask && tTask.publication?.internalId == publicationId &&
-                tTask.connectorName == connectorName);
+        TrangaTask? task = taskManager
+            .GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId)?.First();
             
         if (task is null)
             return;
@@ -210,7 +179,7 @@ app.MapDelete("/Queue/Dequeue", (string taskType, string? connectorName, string?
 app.MapGet("/Settings/Get", () => taskManager.settings);
 
 app.MapPost("/Settings/Update",
-    (string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaApiKey) =>
-        taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaApiKey));
+    (string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaUsername, string? kavitaPassword) =>
+        taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaUsername, kavitaPassword));
 
 app.Run();

Tranga-CLI/Tranga_Cli.cs

@@ -2,6 +2,7 @@
 using Logging;
 using Tranga;
 using Tranga.LibraryManagers;
+using Tranga.TrangaTasks;
 
 namespace Tranga_CLI;
 
@@ -47,32 +48,32 @@ public static class Tranga_Cli
         if (tmpUrlKomga.Length > 0)
         {
             Console.WriteLine("Username:");
-            string? tmpUser = Console.ReadLine();
-            while (tmpUser is null || tmpUser.Length < 1)
-                tmpUser = Console.ReadLine();
+            string? tmpKomgaUser = Console.ReadLine();
+            while (tmpKomgaUser is null || tmpKomgaUser.Length < 1)
+                tmpKomgaUser = Console.ReadLine();
             
             Console.WriteLine("Password:");
-            string tmpPass = string.Empty;
+            string tmpKomgaPass = string.Empty;
             ConsoleKey key;
             do
             {
                 var keyInfo = Console.ReadKey(intercept: true);
                 key = keyInfo.Key;
 
-                if (key == ConsoleKey.Backspace && tmpPass.Length > 0)
+                if (key == ConsoleKey.Backspace && tmpKomgaPass.Length > 0)
                 {
                     Console.Write("\b \b");
-                    tmpPass = tmpPass[0..^1];
+                    tmpKomgaPass = tmpKomgaPass[0..^1];
                 }
                 else if (!char.IsControl(keyInfo.KeyChar))
                 {
                     Console.Write("*");
-                    tmpPass += keyInfo.KeyChar;
+                    tmpKomgaPass += keyInfo.KeyChar;
                 }
             } while (key != ConsoleKey.Enter);
 
             settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
-            settings.libraryManagers.Add(new Komga(tmpUrlKomga, tmpUser, tmpPass, logger));
+            settings.libraryManagers.Add(new Komga(tmpUrlKomga, tmpKomgaUser, tmpKomgaPass, logger));
         }
         
         Console.WriteLine($"Kavita BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Kavita))?.baseUrl}]:");
@@ -82,12 +83,32 @@ public static class Tranga_Cli
         if (tmpUrlKavita.Length > 0)
         {
             Console.WriteLine("Username:");
-            string? tmpApiKey = Console.ReadLine();
-            while (tmpApiKey is null || tmpApiKey.Length < 1)
-                tmpApiKey = Console.ReadLine();
+            string? tmpKavitaUser = Console.ReadLine();
+            while (tmpKavitaUser is null || tmpKavitaUser.Length < 1)
+                tmpKavitaUser = Console.ReadLine();
+            
+            Console.WriteLine("Password:");
+            string tmpKavitaPass = string.Empty;
+            ConsoleKey key;
+            do
+            {
+                var keyInfo = Console.ReadKey(intercept: true);
+                key = keyInfo.Key;
+
+                if (key == ConsoleKey.Backspace && tmpKavitaPass.Length > 0)
+                {
+                    Console.Write("\b \b");
+                    tmpKavitaPass = tmpKavitaPass[0..^1];
+                }
+                else if (!char.IsControl(keyInfo.KeyChar))
+                {
+                    Console.Write("*");
+                    tmpKavitaPass += keyInfo.KeyChar;
+                }
+            } while (key != ConsoleKey.Enter);
 
             settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
-            settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpApiKey, logger));
+            settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpKavitaUser, tmpKavitaPass, logger));
         }
         
         logger.WriteLine("Tranga_CLI", "Loaded.");
@@ -114,8 +135,12 @@ public static class Tranga_Cli
                 switch (selection)
                 {
                     case ConsoleKey.L:
-                        PrintTasks(taskManager.GetAllTasks(), logger);
-                        Console.WriteLine("Press any key.");
+                        while (!Console.KeyAvailable)
+                        {
+                            PrintTasks(taskManager.GetAllTasks(), logger);
+                            Console.WriteLine("Press any key.");
+                            Thread.Sleep(500);
+                        }
                         Console.ReadKey();
                         break;
                     case ConsoleKey.C:
@@ -139,17 +164,26 @@ public static class Tranga_Cli
                         Console.ReadKey();
                         break;
                     case ConsoleKey.R:
-                        PrintTasks(
-                            taskManager.GetAllTasks().Where(eTask => eTask.state == TrangaTask.ExecutionState.Running)
-                                .ToArray(), logger);
-                        Console.WriteLine("Press any key.");
+                        while (!Console.KeyAvailable)
+                        {
+                            PrintTasks(
+                                taskManager.GetAllTasks().Where(eTask => eTask.state == TrangaTask.ExecutionState.Running)
+                                    .ToArray(), logger);
+                            Console.WriteLine("Press any key.");
+                            Thread.Sleep(500);
+                        }
                         Console.ReadKey();
                         break;
                     case ConsoleKey.K:
-                        PrintTasks(
-                            taskManager.GetAllTasks().Where(qTask => qTask.state is TrangaTask.ExecutionState.Enqueued)
-                                .ToArray(), logger);
-                        Console.WriteLine("Press any key.");
+                        while (!Console.KeyAvailable)
+                        {
+                            PrintTasks(
+                                taskManager.GetAllTasks()
+                                    .Where(qTask => qTask.state is TrangaTask.ExecutionState.Enqueued)
+                                    .ToArray(), logger);
+                            Console.WriteLine("Press any key.");
+                            Thread.Sleep(500);
+                        }
                         Console.ReadKey();
                         break;
                     case ConsoleKey.F:
@@ -219,18 +253,18 @@ public static class Tranga_Cli
         int tIndex = 0;
         Console.WriteLine($"Tasks (Running/Queue/Total): {taskRunningCount}/{taskEnqueuedCount}/{taskCount}");
         string header =
-            $"{"",-5}{"Task",-20} | {"Last Executed",-20} | {"Reoccurrence",-12} | {"State",-10} | {"Connector",-15} | {"Progress",-9} | Publication/Manga";
+            $"{"",-5}{"Task",-20} | {"Last Executed",-20} | {"Reoccurrence",-12} | {"State",-10} | {"Progress",-9} | {"Finished",-20} | {"Remaining",-12} | {"Connector",-15} | Publication/Manga ";
         Console.WriteLine(header);
         Console.WriteLine(new string('-', header.Length));
         foreach (TrangaTask trangaTask in tasks)
         {
             string[] taskSplit = trangaTask.ToString().Split(", ");
-            Console.WriteLine($"{tIndex++:000}: {taskSplit[0],-20} | {taskSplit[1],-20} | {taskSplit[2],-12} | {taskSplit[3],-10} | {(taskSplit.Length > 4 ? taskSplit[4] : ""),-15} | {(taskSplit.Length > 5 ? taskSplit[5] : ""),-9} |{(taskSplit.Length > 6 ? taskSplit[6] : "")}");
+            Console.WriteLine($"{tIndex++:000}: {taskSplit[0],-20} | {taskSplit[1],-20} | {taskSplit[2],-12} | {taskSplit[3],-10} | {taskSplit[4],-9} | {taskSplit[5],-20} | {taskSplit[6][..12],-12} | {(taskSplit.Length > 7 ? taskSplit[7] : ""),-15} | {(taskSplit.Length > 8 ? taskSplit[8] : "")} {(taskSplit.Length > 9 ? taskSplit[9] : "")} {(taskSplit.Length > 10 ? taskSplit[10] : "")}");
         }
             
     }
 
-    private static TrangaTask? SelectTask(TrangaTask[] tasks, Logger logger)
+    private static TrangaTask[] SelectTasks(TrangaTask[] tasks, Logger logger)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Select task");
         if (tasks.Length < 1)
@@ -238,13 +272,13 @@ public static class Tranga_Cli
             Console.Clear();
             Console.WriteLine("There are no available Tasks.");
             logger.WriteLine("Tranga_CLI", "No available Tasks.");
-            return null;
+            return Array.Empty<TrangaTask>();
         }
         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}):");
+        Console.WriteLine($"Select Task(s) (0-{tasks.Length - 1}):");
 
         string? selectedTask = Console.ReadLine();
         while(selectedTask is null || selectedTask.Length < 1)
@@ -255,21 +289,20 @@ public static class Tranga_Cli
             Console.Clear();
             Console.WriteLine("aborted.");
             logger.WriteLine("Tranga_CLI", "aborted");
-            return null;
-        }
-        
-        try
-        {
-            int selectedTaskIndex = Convert.ToInt32(selectedTask);
-            return tasks[selectedTaskIndex];
-        }
-        catch (Exception e)
-        {
-            Console.WriteLine($"Exception: {e.Message}");
-            logger.WriteLine("Tranga_CLI", e.Message);
+            return Array.Empty<TrangaTask>();
         }
 
-        return null;
+        if (selectedTask.Contains('-'))
+        {
+            int start = Convert.ToInt32(selectedTask.Split('-')[0]);
+            int end = Convert.ToInt32(selectedTask.Split('-')[1]);
+            return tasks[start..end];
+        }
+        else
+        {
+            int selectedTaskIndex = Convert.ToInt32(selectedTask);
+            return new[] { tasks[selectedTaskIndex] };
+        }
     }
     
     private static void AddMangaTaskToQueue(TaskManager taskManager, Logger logger)
@@ -287,7 +320,7 @@ public static class Tranga_Cli
         
         TimeSpan reoccurrence = SelectReoccurrence(logger);
         logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-        TrangaTask newTask = taskManager.AddTask(TrangaTask.Task.DownloadNewChapters, connector.name, publication, reoccurrence, "en");
+        TrangaTask? newTask = taskManager.AddTask(TrangaTask.Task.DownloadNewChapters, connector.name, publication.Value.publicationId, reoccurrence, "en");
         Console.WriteLine(newTask);
     }
 
@@ -299,12 +332,10 @@ public static class Tranga_Cli
         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);
+        TrangaTask[] selectedTasks = SelectTasks(tasks, logger);
+        logger.WriteLine("Tranga_CLI", $"Sending {selectedTasks.Length} Tasks to TaskManager");
+        foreach(TrangaTask task in selectedTasks)
+            taskManager.AddTaskToQueue(task);
     }
 
     private static void RemoveTaskFromQueue(TaskManager taskManager, Logger logger)
@@ -314,12 +345,10 @@ public static class Tranga_Cli
         
         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);
+        TrangaTask[] selectedTasks = SelectTasks(tasks, logger);
+        logger.WriteLine("Tranga_CLI", $"Sending {selectedTasks.Length} Tasks to TaskManager");
+        foreach(TrangaTask task in selectedTasks)
+            taskManager.RemoveTaskFromQueue(task);
     }
 
     private static void TailLog(Logger logger)
@@ -347,7 +376,7 @@ public static class Tranga_Cli
         if (tmpTask is null)
             return;
         TrangaTask.Task task = (TrangaTask.Task)tmpTask;
-                    
+        
         Connector? connector = null;
         if (task != TrangaTask.Task.UpdateLibraries)
         {
@@ -363,11 +392,25 @@ public static class Tranga_Cli
             if (publication is null)
                 return;
         }
-        
-        TimeSpan reoccurrence = SelectReoccurrence(logger);
-        logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-        TrangaTask newTask = taskManager.AddTask(task, connector?.name, publication, reoccurrence, "en");
-        Console.WriteLine(newTask);
+
+        if (task is TrangaTask.Task.DownloadNewChapters)
+        {
+            TimeSpan reoccurrence = SelectReoccurrence(logger);
+            logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
+
+            TrangaTask newTask = new DownloadNewChaptersTask(TrangaTask.Task.DownloadNewChapters, connector!.name, (Publication)publication!, reoccurrence, "en");
+            taskManager.AddTask(newTask);
+            Console.WriteLine(newTask);
+        }else if (task is TrangaTask.Task.DownloadChapter)
+        {
+            foreach (Chapter chapter in SelectChapters(connector!, (Publication)publication!, logger))
+            {
+                TrangaTask newTask = new DownloadChapterTask(TrangaTask.Task.DownloadChapter, connector!.name,
+                    (Publication)publication!, chapter, "en");
+                taskManager.AddTask(newTask);
+                Console.WriteLine(newTask);
+            }
+        }
     }
 
     private static void ExecuteTaskNow(TaskManager taskManager, Logger logger)
@@ -375,12 +418,10 @@ public static class Tranga_Cli
         logger.WriteLine("Tranga_CLI", "Menu: Executing Task");
         TrangaTask[] tasks = taskManager.GetAllTasks().Where(nTask => nTask.state is not TrangaTask.ExecutionState.Running).ToArray();
         
-        TrangaTask? selectedTask = SelectTask(tasks, logger);
-        if (selectedTask is null)
-            return;
-        
-        logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-        taskManager.ExecuteTaskNow(selectedTask);
+        TrangaTask[] selectedTasks = SelectTasks(tasks, logger);
+        logger.WriteLine("Tranga_CLI", $"Sending {selectedTasks.Length} Tasks to TaskManager");
+        foreach(TrangaTask task in selectedTasks)
+            taskManager.ExecuteTaskNow(task);
     }
 
     private static void DeleteTask(TaskManager taskManager, Logger logger)
@@ -388,12 +429,10 @@ public static class Tranga_Cli
         logger.WriteLine("Tranga_CLI", "Menu: Delete Task");
         TrangaTask[] tasks = taskManager.GetAllTasks();
         
-        TrangaTask? selectedTask = SelectTask(tasks, logger);
-        if (selectedTask is null)
-            return;
-        
-        logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-        taskManager.DeleteTask(selectedTask.task, selectedTask.connectorName, selectedTask.publication);
+        TrangaTask[] selectedTasks = SelectTasks(tasks, logger);
+        logger.WriteLine("Tranga_CLI", $"Sending {selectedTasks.Length} Tasks to TaskManager");
+        foreach(TrangaTask task in selectedTasks)
+            taskManager.DeleteTask(task);
     }
 
     private static TrangaTask.Task? SelectTaskType(Logger logger)
@@ -444,6 +483,40 @@ public static class Tranga_Cli
         return TimeSpan.Parse(Console.ReadLine()!, new CultureInfo("en-US"));
     }
 
+    private static Chapter[] SelectChapters(Connector connector, Publication publication, Logger logger)
+    {
+        logger.WriteLine("Tranga_CLI", "Menu: Select Chapters");
+        Chapter[] availableChapters = connector.GetChapters(publication, "en");
+        int cIndex = 0;
+        Console.WriteLine("Chapters:");
+        foreach(Chapter chapter in availableChapters)
+            Console.WriteLine($"{cIndex++}: Vol.{chapter.volumeNumber} Ch.{chapter.chapterNumber} - {chapter.name}");
+        
+        Console.WriteLine("Enter q to abort");
+        Console.WriteLine($"Select Chapter(s):");
+
+        string? selectedChapters = Console.ReadLine();
+        while(selectedChapters is null || selectedChapters.Length < 1)
+            selectedChapters = Console.ReadLine();
+
+        if (selectedChapters.Length == 1 && selectedChapters.ToLower() == "q")
+        {
+            Console.Clear();
+            Console.WriteLine("aborted.");
+            logger.WriteLine("Tranga_CLI", "aborted.");
+            return Array.Empty<Chapter>();
+        }
+        
+        if (selectedChapters.Contains('-'))
+        {
+            int start = Convert.ToInt32(selectedChapters.Split('-')[0]);
+            int end = Convert.ToInt32(selectedChapters.Split('-')[1]);
+            return availableChapters[start..end];
+        }
+        else
+            return new Chapter[] { availableChapters[Convert.ToInt32(selectedChapters)] };
+    }
+
     private static Connector? SelectConnector(Connector[] connectors, Logger logger)
     {
         logger.WriteLine("Tranga_CLI", "Menu: Select Connector");

Tranga.sln.DotSettings

@@ -1,5 +1,6 @@
 <wpf:ResourceDictionary xml:space="preserve" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" xmlns:s="clr-namespace:System;assembly=mscorlib" xmlns:ss="urn:shemas-jetbrains-com:settings-storage-xaml" xmlns:wpf="http://schemas.microsoft.com/winfx/2006/xaml/presentation">
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Komga/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Manganato/@EntryIndexedValue">True</s:Boolean>
+	<s:Boolean x:Key="/Default/UserDictionary/Words/=Mangasee/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Taskmanager/@EntryIndexedValue">True</s:Boolean>
 	<s:Boolean x:Key="/Default/UserDictionary/Words/=Tranga/@EntryIndexedValue">True</s:Boolean></wpf:ResourceDictionary>

Tranga/Chapter.cs

@@ -20,16 +20,21 @@ public struct Chapter
     public Chapter(string? name, string? volumeNumber, string? chapterNumber, string url)
     {
         this.name = name;
-        this.volumeNumber = volumeNumber is { Length: > 0 } ? volumeNumber : "1";
+        this.volumeNumber = volumeNumber;
         this.chapterNumber = chapterNumber;
         this.url = url;
-        string chapterName = string.Concat(LegalCharacters.Matches(name ?? ""));
         NumberFormatInfo nfi = new NumberFormatInfo()
         {
             NumberDecimalSeparator = "."
         };
-        sortNumber = decimal.Round(Convert.ToDecimal(this.volumeNumber) * Convert.ToDecimal(this.chapterNumber, nfi), 1)
+        sortNumber = decimal.Round(Convert.ToDecimal(this.volumeNumber ?? "1") * Convert.ToDecimal(this.chapterNumber, nfi), 1)
             .ToString(nfi);
-        this.fileName = $"{chapterName} - V{volumeNumber}C{chapterNumber} - {sortNumber}";
+
+        string chapterName = string.Concat(LegalCharacters.Matches(name ?? ""));
+        string volStr = this.volumeNumber is not null ? $"Vol.{this.volumeNumber} " : "";
+        string chNumberStr = this.chapterNumber is not null ? $"Ch.{chapterNumber} " : "";
+        string chNameStr = chapterName.Length > 0 ? $"- {chapterName}" : "";
+        chNameStr = chNameStr.Replace("Volume", "").Replace("volume", "");
+        this.fileName = $"{volStr}{chNumberStr}{chNameStr}";
     }
 }

Tranga/Connector.cs

@@ -1,8 +1,10 @@
 using System.IO.Compression;
 using System.Net;
 using System.Runtime.InteropServices;
+using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using Logging;
+using Tranga.TrangaTasks;
 using static System.IO.UnixFileMode;
 
 namespace Tranga;
@@ -59,7 +61,7 @@ public abstract class Connector
     /// <param name="publication">Publication that contains Chapter</param>
     /// <param name="chapter">Chapter with Images to retrieve</param>
     /// <param name="parentTask">Will be used for progress-tracking</param>
-    public abstract void DownloadChapter(Publication publication, Chapter chapter, TrangaTask parentTask);
+    public abstract void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask);
 
     /// <summary>
     /// Copies the already downloaded cover from cache to downloadLocation
@@ -111,7 +113,15 @@ public abstract class Connector
     /// <returns>true if chapter is present</returns>
     public bool CheckChapterIsDownloaded(Publication publication, Chapter chapter)
     {
-        return File.Exists(GetArchiveFilePath(publication, chapter));
+        Regex legalCharacters = new Regex(@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*");
+        string oldFilePath = Path.Join(downloadLocation, publication.folderName, $"{string.Concat(legalCharacters.Matches(chapter.name ?? ""))} - V{chapter.volumeNumber}C{chapter.chapterNumber} - {chapter.sortNumber}.cbz");
+        string oldFilePath2 = Path.Join(downloadLocation, publication.folderName, $"{string.Concat(legalCharacters.Matches(chapter.name ?? ""))} - VC{chapter.chapterNumber} - {chapter.chapterNumber}.cbz");
+        string newFilePath = GetArchiveFilePath(publication, chapter);
+        if (File.Exists(oldFilePath))
+            File.Move(oldFilePath, newFilePath);
+        else if (File.Exists(oldFilePath2))
+            File.Move(oldFilePath2, newFilePath);
+        return File.Exists(newFilePath);
     }
 
     /// <summary>
@@ -120,7 +130,7 @@ public abstract class Connector
     /// <returns>Filepath</returns>
     protected string GetArchiveFilePath(Publication publication, Chapter chapter)
     {
-        return Path.Join(downloadLocation, publication.folderName, $"{chapter.fileName}.cbz");
+        return Path.Join(downloadLocation, publication.folderName, $"{publication.folderName} - {chapter.fileName}.cbz");
     }
 
     /// <summary>
@@ -151,7 +161,7 @@ public abstract class Connector
     /// <param name="comicInfoPath">Path of the generate Chapter ComicInfo.xml, if it was generated</param>
     /// <param name="requestType">RequestType for RateLimits</param>
     /// <param name="referrer">Used in http request header</param>
-    protected void DownloadChapterImages(string[] imageUrls, string saveArchiveFilePath, byte requestType, TrangaTask parentTask, string? comicInfoPath = null, string? referrer = null)
+    protected void DownloadChapterImages(string[] imageUrls, string saveArchiveFilePath, byte requestType, DownloadChapterTask parentTask, string? comicInfoPath = null, string? referrer = null)
     {
         logger?.WriteLine("Connector", $"Downloading Images for {saveArchiveFilePath}");
         //Check if Publication Directory already exists
@@ -171,9 +181,9 @@ public abstract class Connector
         {
             string[] split = imageUrl.Split('.');
             string extension = split[^1];
-            logger?.WriteLine("Connector", $"Downloading Image {chapter + 1:000}/{imageUrls.Length:000} {(parentTask.publication?.sortName)![..(int)(parentTask.publication?.sortName.Length > 25 ? 25 : parentTask.publication?.sortName.Length)!],-25} {(parentTask.publication?.internalId)![..(int)(parentTask.publication?.internalId.Length > 25 ? 25 : parentTask.publication?.internalId.Length)!],-25} Total Task Progress: {parentTask.progress:00.0}%");
+            logger?.WriteLine("Connector", $"Downloading Image {chapter + 1:000}/{imageUrls.Length:000} {parentTask.publication.sortName} {parentTask.publication.internalId} Vol.{parentTask.chapter.volumeNumber} Ch.{parentTask.chapter.chapterNumber} {parentTask.progress:P2}");
             DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer);
-            parentTask.tasksFinished++;
+            parentTask.IncrementProgress(1f / imageUrls.Length);
         }
         
         if(comicInfoPath is not null)

Tranga/Connectors/MangaDex.cs

@@ -3,6 +3,7 @@ using System.Net;
 using System.Text.Json;
 using System.Text.Json.Nodes;
 using Logging;
+using Tranga.TrangaTasks;
 
 namespace Tranga.Connectors;
 public class MangaDex : Connector
@@ -204,7 +205,7 @@ public class MangaDex : Connector
         return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
     }
 
-    public override void DownloadChapter(Publication publication, Chapter chapter, TrangaTask parentTask)
+    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask)
     {
         logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
         //Request URLs for Chapter-Images

Tranga/Connectors/Manganato.cs

@@ -2,6 +2,7 @@
 using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 using Logging;
+using Tranga.TrangaTasks;
 
 namespace Tranga.Connectors;
 
@@ -22,7 +23,6 @@ public class Manganato : Connector
     {
         logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
         string sanitizedTitle = string.Concat(Regex.Matches(publicationTitle, "[A-z]* *")).ToLower().Replace(' ', '_');
-        logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={sanitizedTitle})");
         string requestUrl = $"https://manganato.com/search/story/{sanitizedTitle}";
         DownloadClient.RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, (byte)1);
@@ -157,11 +157,11 @@ public class Manganato : Connector
                 .GetAttributeValue("href", "");
             ret.Add(new Chapter(chapterName, volumeNumber, chapterNumber, url));
         }
-
+        ret.Reverse();
         return ret.ToArray();
     }
 
-    public override void DownloadChapter(Publication publication, Chapter chapter, TrangaTask parentTask)
+    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask)
     {
         logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
         string requestUrl = chapter.url;

Tranga/Connectors/Mangasee.cs

@@ -0,0 +1,235 @@
+using System.Net;
+using System.Text.RegularExpressions;
+using System.Xml.Linq;
+using HtmlAgilityPack;
+using Logging;
+using Newtonsoft.Json;
+using PuppeteerSharp;
+using Tranga.TrangaTasks;
+
+namespace Tranga.Connectors;
+
+public class Mangasee : Connector
+{
+    public override string name { get; }
+    private IBrowser? _browser = null;
+    private const string ChromiumVersion = "1153303";
+
+    public Mangasee(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation,
+        imageCachePath, logger)
+    {
+        this.name = "Mangasee";
+        this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
+        {
+            { (byte)1, 60 }
+        }, logger);
+
+        Task d = new Task(DownloadBrowser);
+        d.Start();
+    }
+
+    private async void DownloadBrowser()
+    {
+        BrowserFetcher browserFetcher = new BrowserFetcher();
+        foreach(string rev in browserFetcher.LocalRevisions().Where(rev => rev != ChromiumVersion))
+            browserFetcher.Remove(rev);
+        if (!browserFetcher.LocalRevisions().Contains(ChromiumVersion))
+        {
+            logger?.WriteLine(this.GetType().ToString(), "Downloading headless browser");
+            DateTime last = DateTime.Now.Subtract(TimeSpan.FromSeconds(5));
+            browserFetcher.DownloadProgressChanged += (sender, args) =>
+            {
+                double currentBytes = Convert.ToDouble(args.BytesReceived) / Convert.ToDouble(args.TotalBytesToReceive);
+                if (args.TotalBytesToReceive == args.BytesReceived)
+                {
+                    logger?.WriteLine(this.GetType().ToString(), "Browser downloaded.");
+                }
+                else if (DateTime.Now > last.AddSeconds(5))
+                {
+                    logger?.WriteLine(this.GetType().ToString(), $"Browser download progress: {currentBytes:P2}");
+                    last = DateTime.Now;
+                }
+
+            };
+            if (!browserFetcher.CanDownloadAsync(ChromiumVersion).Result)
+            {
+                logger?.WriteLine(this.GetType().ToString(), $"Can't download browser version {ChromiumVersion}");
+                return;
+            }
+            await browserFetcher.DownloadAsync(ChromiumVersion);
+        }
+        
+        logger?.WriteLine(this.GetType().ToString(), "Starting browser.");
+        this._browser = await Puppeteer.LaunchAsync(new LaunchOptions
+        {
+            Headless = true,
+            ExecutablePath = browserFetcher.GetExecutablePath(ChromiumVersion),
+            Args = new [] {
+                "--disable-gpu",
+                "--disable-dev-shm-usage",
+                "--disable-setuid-sandbox",
+                "--no-sandbox"}
+        });
+    }
+
+    public override Publication[] GetPublications(string publicationTitle = "")
+    {
+        logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
+        string sanitizedTitle = string.Concat(Regex.Matches(publicationTitle, "[A-z]* *")).ToLower().Replace(' ', '+');
+        string requestUrl = $"https://mangasee123.com/_search.php";
+        DownloadClient.RequestResult requestResult =
+            downloadClient.MakeRequest(requestUrl, (byte)1);
+        if (requestResult.statusCode != HttpStatusCode.OK)
+            return Array.Empty<Publication>();
+
+        return ParsePublicationsFromHtml(requestResult.result, publicationTitle);
+    }
+
+    private Publication[] ParsePublicationsFromHtml(Stream html, string publicationTitle)
+    {
+        string jsonString = new StreamReader(html).ReadToEnd();
+        List<SearchResultItem> result = JsonConvert.DeserializeObject<List<SearchResultItem>>(jsonString)!;
+        Dictionary<SearchResultItem, int> queryFiltered = new();
+        foreach (SearchResultItem resultItem in result)
+        {
+            foreach (string term in publicationTitle.Split(' '))
+                if (resultItem.i.Contains(term, StringComparison.CurrentCultureIgnoreCase))
+                    if (!queryFiltered.TryAdd(resultItem, 0))
+                        queryFiltered[resultItem]++;
+        }
+
+        queryFiltered = queryFiltered.Where(item => item.Value >= publicationTitle.Split(' ').Length - 1)
+            .ToDictionary(item => item.Key, item => item.Value);
+
+        HashSet<Publication> ret = new();
+        List<SearchResultItem> orderedFiltered =
+            queryFiltered.OrderBy(item => item.Value).ToDictionary(item => item.Key, item => item.Value).Keys.ToList();
+
+        foreach (SearchResultItem orderedItem in orderedFiltered)
+        {
+            DownloadClient.RequestResult requestResult =
+                downloadClient.MakeRequest($"https://mangasee123.com/manga/{orderedItem.i}", (byte)1);
+            if (requestResult.statusCode != HttpStatusCode.OK)
+                return Array.Empty<Publication>();
+            ret.Add(ParseSinglePublicationFromHtml(requestResult.result, orderedItem.s, orderedItem.i, orderedItem.a));
+        }
+        return ret.ToArray();
+    }
+
+    
+    private Publication ParseSinglePublicationFromHtml(Stream html, string sortName, string publicationId, string[] a)
+    {
+        StreamReader reader = new (html);
+        string htmlString = reader.ReadToEnd();
+        HtmlDocument document = new ();
+        document.LoadHtml(htmlString);
+
+        string originalLanguage = "", status = "";
+        Dictionary<string, string> altTitles = new(), links = new();
+        HashSet<string> tags = new();
+
+        HtmlNode posterNode =
+            document.DocumentNode.Descendants("img").First(img => img.HasClass("img-fluid") && img.HasClass("bottom-5"));
+        string posterUrl = posterNode.GetAttributeValue("src", "");
+        string coverFileNameInCache = SaveCoverImageToCache(posterUrl, 1);
+
+        HtmlNode attributes = document.DocumentNode.Descendants("div")
+            .First(div => div.HasClass("col-md-9") && div.HasClass("col-sm-8") && div.HasClass("top-5"))
+            .Descendants("ul").First();
+
+        HtmlNode[] authorsNodes = attributes.Descendants("li")
+            .First(node => node.InnerText.Contains("author(s):", StringComparison.CurrentCultureIgnoreCase))
+            .Descendants("a").ToArray();
+        string[] authors = new string[authorsNodes.Length];
+        for (int j = 0; j < authors.Length; j++)
+            authors[j] = authorsNodes[j].InnerText;
+        string author = string.Join(" - ", authors);
+
+        HtmlNode[] genreNodes = attributes.Descendants("li")
+            .First(node => node.InnerText.Contains("genre(s):", StringComparison.CurrentCultureIgnoreCase))
+            .Descendants("a").ToArray();
+        foreach (HtmlNode genreNode in genreNodes)
+            tags.Add(genreNode.InnerText);
+
+        HtmlNode yearNode = attributes.Descendants("li")
+            .First(node => node.InnerText.Contains("released:", StringComparison.CurrentCultureIgnoreCase))
+            .Descendants("a").First();
+        int year = Convert.ToInt32(yearNode.InnerText);
+
+        HtmlNode[] statusNodes = attributes.Descendants("li")
+            .First(node => node.InnerText.Contains("status:", StringComparison.CurrentCultureIgnoreCase))
+            .Descendants("a").ToArray();
+        foreach(HtmlNode statusNode in statusNodes)
+            if (statusNode.InnerText.Contains("publish", StringComparison.CurrentCultureIgnoreCase))
+                status = statusNode.InnerText.Split(' ')[0];
+        
+        HtmlNode descriptionNode = attributes.Descendants("li").First(node => node.InnerText.Contains("description:", StringComparison.CurrentCultureIgnoreCase)).Descendants("div").First();
+        string description = descriptionNode.InnerText;
+        
+        int i = 0;
+        foreach(string at in a)
+            altTitles.Add((i++).ToString(), at);
+        
+        return new Publication(sortName, author, description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
+            year, originalLanguage, status, publicationId);
+    }
+    
+    // ReSharper disable once ClassNeverInstantiated.Local Will be instantiated during deserialization
+    private class SearchResultItem
+    {
+#pragma warning disable CS8618 //Will always be set
+        public string i { get; set; }
+        public string s { get; set; }
+        public string[] a { get; set; }
+#pragma warning restore CS8618
+    }
+
+    public override Chapter[] GetChapters(Publication publication, string language = "")
+    {
+        XDocument doc = XDocument.Load($"https://mangasee123.com/rss/{publication.publicationId}.xml");
+        XElement[] chapterItems = doc.Descendants("item").ToArray();
+        List<Chapter> ret = new();
+        foreach (XElement chapter in chapterItems)
+        {
+            string? volumeNumber = "1";
+            string chapterName = chapter.Descendants("title").First().Value;
+            string chapterNumber = Regex.Matches(chapterName, "[0-9]+")[^1].ToString();
+
+            string url = chapter.Descendants("link").First().Value;
+            url = url.Replace(Regex.Matches(url,"(-page-[0-9])")[0].ToString(),"");
+            ret.Add(new Chapter("", volumeNumber, chapterNumber, url));
+        }
+
+        ret.Reverse();
+        return ret.ToArray();
+    }
+
+    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask)
+    {
+        while (this._browser is null)
+        {
+            logger?.WriteLine(this.GetType().ToString(), "Waiting for headless browser to download...");
+            Thread.Sleep(1000);
+        }
+        
+        logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
+        IPage page = _browser.NewPageAsync().Result;
+        IResponse response = page.GoToAsync(chapter.url).Result;
+        if (response.Ok)
+        {
+            HtmlDocument document = new ();
+            document.LoadHtml(page.GetContentAsync().Result);
+
+            HtmlNode gallery = document.DocumentNode.Descendants("div").First(div => div.HasClass("ImageGallery"));
+            HtmlNode[] images = gallery.Descendants("img").Where(img => img.HasClass("img-fluid")).ToArray();
+            List<string> urls = new();
+            foreach(HtmlNode galleryImage in images)
+                urls.Add(galleryImage.GetAttributeValue("src", ""));
+            
+            string comicInfoPath = Path.GetTempFileName();
+            File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
+        
+            DownloadChapterImages(urls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath);
+        }
+    }
+}

Tranga/LibraryManager.cs

@@ -17,7 +17,7 @@ public abstract class LibraryManager
 
     public LibraryType libraryType { get; }
     public string baseUrl { get; }
-    protected string auth { get; } //Base64 encoded, if you use your password everywhere, you have problems
+    public string auth { get; } //Base64 encoded, if you use your password everywhere, you have problems
     protected Logger? logger;
     
     /// <param name="baseUrl">Base-URL of Komga instance, no trailing slashes(/)</param>
@@ -39,11 +39,10 @@ public abstract class LibraryManager
 
     protected static class NetClient
     {
-        public static Stream MakeRequest(string url, string auth, Logger? logger)
+        public static Stream MakeRequest(string url, string authScheme, string auth, Logger? logger)
         {
-            HttpClientHandler clientHandler = new ();
-            HttpClient client = new(clientHandler);
-            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue("Basic", auth);
+            HttpClient client = new();
+            client.DefaultRequestHeaders.Authorization = new AuthenticationHeaderValue(authScheme, auth);
             
             HttpRequestMessage requestMessage = new ()
             {
@@ -55,22 +54,21 @@ public abstract class LibraryManager
             logger?.WriteLine("LibraryManager", $"{(int)response.StatusCode} {response.StatusCode}: {response.ReasonPhrase}");
             
             if(response.StatusCode is HttpStatusCode.Unauthorized && response.RequestMessage!.RequestUri!.AbsoluteUri != url)
-                return MakeRequest(response.RequestMessage!.RequestUri!.AbsoluteUri, auth, logger);
+                return MakeRequest(response.RequestMessage!.RequestUri!.AbsoluteUri, authScheme, auth, logger);
             else if (response.IsSuccessStatusCode)
                 return response.Content.ReadAsStream();
             else
                 return Stream.Null;
         }
 
-        public static bool MakePost(string url, string auth, Logger? logger)
+        public static bool MakePost(string url, string authScheme, string auth, Logger? logger)
         {
-            HttpClientHandler clientHandler = new ();
-            HttpClient client = new(clientHandler)
+            HttpClient client = new()
             {
                 DefaultRequestHeaders =
                 {
                     { "Accept", "application/json" },
-                    { "Authorization", new AuthenticationHeaderValue("Basic", auth).ToString() }
+                    { "Authorization", new AuthenticationHeaderValue(authScheme, auth).ToString() }
                 }
             };
             HttpRequestMessage requestMessage = new ()
@@ -83,7 +81,7 @@ public abstract class LibraryManager
             logger?.WriteLine("LibraryManager", $"{(int)response.StatusCode} {response.StatusCode}: {response.ReasonPhrase}");
             
             if(response.StatusCode is HttpStatusCode.Unauthorized && response.RequestMessage!.RequestUri!.AbsoluteUri != url)
-                return MakePost(response.RequestMessage!.RequestUri!.AbsoluteUri, auth, logger);
+                return MakePost(response.RequestMessage!.RequestUri!.AbsoluteUri, authScheme, auth, logger);
             else if (response.IsSuccessStatusCode)
                 return true;
             else 

Tranga/LibraryManagers/Kavita.cs

@@ -1,20 +1,50 @@
-using System.Text.Json;
-using System.Text.Json.Nodes;
+using System.Text.Json.Nodes;
 using Logging;
+using Newtonsoft.Json;
+using JsonSerializer = System.Text.Json.JsonSerializer;
 
 namespace Tranga.LibraryManagers;
 
 public class Kavita : LibraryManager
 {
-    public Kavita(string baseUrl, string apiKey, Logger? logger) : base(baseUrl, apiKey, logger, LibraryType.Kavita)
+
+    public Kavita(string baseUrl, string username, string password, Logger? logger) : base(baseUrl, GetToken(baseUrl, username, password), logger, LibraryType.Kavita)
     {
     }
+    
+    [JsonConstructor]
+    public Kavita(string baseUrl, string auth, Logger? logger) : base(baseUrl, auth, logger, LibraryType.Kavita)
+    {
+    }
+
+    private static string GetToken(string baseUrl, string username, string password)
+    {
+        HttpClient client = new()
+        {
+            DefaultRequestHeaders =
+            {
+                { "Accept", "application/json" }
+            }
+        };
+        HttpRequestMessage requestMessage = new ()
+        {
+            Method = HttpMethod.Post,
+            RequestUri = new Uri($"{baseUrl}/api/Account/login"),
+            Content = new StringContent($"{{\"username\":\"{username}\",\"password\":\"{password}\"}}", System.Text.Encoding.UTF8, "application/json")
+        };
+        
+        HttpResponseMessage response = client.Send(requestMessage);
+        JsonObject? result = JsonSerializer.Deserialize<JsonObject>(response.Content.ReadAsStream());
+        if (result is not null)
+            return result!["token"]!.GetValue<string>();
+        else return "";
+    }
 
     public override void UpdateLibrary()
     {
         logger?.WriteLine(this.GetType().ToString(), $"Updating Libraries");
         foreach (KavitaLibrary lib in GetLibraries())
-            NetClient.MakePost($"{baseUrl}/api/Library/scan?libraryId={lib.id}", auth, logger);
+            NetClient.MakePost($"{baseUrl}/api/Library/scan?libraryId={lib.id}", "Bearer", auth, logger);
     }
     
     /// <summary>
@@ -24,7 +54,7 @@ public class Kavita : LibraryManager
     private IEnumerable<KavitaLibrary> GetLibraries()
     {
         logger?.WriteLine(this.GetType().ToString(), $"Getting Libraries");
-        Stream data = NetClient.MakeRequest($"{baseUrl}/api/Library", auth, logger);
+        Stream data = NetClient.MakeRequest($"{baseUrl}/api/Library", "Bearer", auth, logger);
         if (data == Stream.Null)
         {
             logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");
@@ -42,7 +72,7 @@ public class Kavita : LibraryManager
         foreach (JsonNode? jsonNode in result)
         {
             var jObject = (JsonObject?)jsonNode;
-            string libraryId = jObject!["id"]!.GetValue<string>();
+            int libraryId = jObject!["id"]!.GetValue<int>();
             string libraryName = jObject!["name"]!.GetValue<string>();
             ret.Add(new KavitaLibrary(libraryId, libraryName));
         }
@@ -52,10 +82,10 @@ public class Kavita : LibraryManager
     
     private struct KavitaLibrary
     {
-        public string id { get; }
+        public int id { get; }
         public string name { get; }
 
-        public KavitaLibrary(string id, string name)
+        public KavitaLibrary(int id, string name)
         {
             this.id = id;
             this.name = name;

Tranga/LibraryManagers/Komga.cs

@@ -25,7 +25,7 @@ public class Komga : LibraryManager
     {
         logger?.WriteLine(this.GetType().ToString(), $"Updating Libraries");
         foreach (KomgaLibrary lib in GetLibraries())
-            NetClient.MakePost($"{baseUrl}/api/v1/libraries/{lib.id}/scan", auth, logger);
+            NetClient.MakePost($"{baseUrl}/api/v1/libraries/{lib.id}/scan", "Basic", auth, logger);
     }
 
     /// <summary>
@@ -35,7 +35,7 @@ public class Komga : LibraryManager
     private IEnumerable<KomgaLibrary> GetLibraries()
     {
         logger?.WriteLine(this.GetType().ToString(), $"Getting Libraries");
-        Stream data = NetClient.MakeRequest($"{baseUrl}/api/v1/libraries", auth, logger);
+        Stream data = NetClient.MakeRequest($"{baseUrl}/api/v1/libraries", "Basic", auth, logger);
         if (data == Stream.Null)
         {
             logger?.WriteLine(this.GetType().ToString(), $"No libraries returned");

Tranga/Publication.cs

@@ -27,7 +27,7 @@ public readonly struct Publication
     public string publicationId { get; }
     public string internalId { get; }
 
-    private static readonly Regex LegalCharacters = new Regex(@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*");
+    private static readonly Regex LegalCharacters = new Regex(@"[A-Z]*[a-z]*[0-9]* *\.*-*,*'*\'*\)*\(*~*!*");
 
     public Publication(string sortName, string? author, string? description, Dictionary<string,string> altTitles, string[] tags, string? posterUrl, string? coverFileNameInCache, Dictionary<string,string>? links, int? year, string? originalLanguage, string status, string publicationId)
     {
@@ -109,7 +109,7 @@ public readonly struct Publication
             this.year = year;
             if(status.ToLower() == "ongoing" || status.ToLower() == "hiatus")
                 this.status = "Continuing";
-            else if (status.ToLower() == "completed" || status.ToLower() == "cancelled")
+            else if (status.ToLower() == "completed" || status.ToLower() == "cancelled" || status.ToLower() == "discontinued")
                 this.status = "Ended";
             else
                 this.status = status;

Tranga/TaskManager.cs

@@ -13,24 +13,20 @@ namespace Tranga;
 public class TaskManager
 {
     public Dictionary<Publication, List<Chapter>> chapterCollection = new();
-    private HashSet<TrangaTask> _allTasks;
+    private HashSet<TrangaTask> _allTasks = new HashSet<TrangaTask>();
     private bool _continueRunning = true;
     private readonly Connector[] _connectors;
-    private readonly Dictionary<Connector, List<TrangaTask>> _taskQueue = new();
     public TrangaSettings settings { get; }
     private Logger? logger { get; }
 
     /// <param name="downloadFolderPath">Local path to save data (Manga) to</param>
     /// <param name="workingDirectory">Path to the working directory</param>
     /// <param name="imageCachePath">Path to the cover-image cache</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="libraryManagers"></param>
     /// <param name="logger"></param>
     public TaskManager(string downloadFolderPath, string workingDirectory, string imageCachePath, HashSet<LibraryManager> libraryManagers, Logger? logger = null)
     {
         this.logger = logger;
-        _allTasks = new HashSet<TrangaTask>();
 
         this.settings = new TrangaSettings(downloadFolderPath, workingDirectory, libraryManagers);
         ExportDataAndSettings();
@@ -38,26 +34,25 @@ public class TaskManager
         this._connectors = new Connector[]
         {
             new MangaDex(downloadFolderPath, imageCachePath, logger),
-            new Manganato(downloadFolderPath, imageCachePath, logger)
+            new Manganato(downloadFolderPath, imageCachePath, logger),
+            new Mangasee(downloadFolderPath, imageCachePath, logger)
         };
-        foreach(Connector cConnector in this._connectors)
-            _taskQueue.Add(cConnector, new List<TrangaTask>());
         
         Thread taskChecker = new(TaskCheckerThread);
         taskChecker.Start();
     }
 
-    public void UpdateSettings(string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaApiKey)
+    public void UpdateSettings(string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaUsername, string? kavitaPassword)
     {
         if (komgaUrl is not null && komgaAuth is not null && komgaUrl.Length > 0 && komgaAuth.Length > 0)
         {
             settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
             settings.libraryManagers.Add(new Komga(komgaUrl, komgaAuth, logger));
         }
-        if (kavitaUrl is not null && kavitaApiKey is not null && kavitaUrl.Length > 0 && kavitaApiKey.Length > 0)
+        if (kavitaUrl is not null && kavitaUsername is not null && kavitaPassword is not null && kavitaUrl.Length > 0 && kavitaUsername.Length > 0 && kavitaPassword.Length > 0)
         {
             settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
-            settings.libraryManagers.Add(new Kavita(kavitaUrl, kavitaApiKey, logger));
+            settings.libraryManagers.Add(new Kavita(kavitaUrl, kavitaUsername, kavitaPassword, logger));
         }
         if (downloadLocation is not null && downloadLocation.Length > 0)
             settings.downloadLocation = downloadLocation;
@@ -70,11 +65,9 @@ public class TaskManager
         this._connectors = new Connector[]
         {
             new MangaDex(settings.downloadLocation, settings.coverImageCache, logger),
-            new Manganato(settings.downloadLocation, settings.coverImageCache, logger)
+            new Manganato(settings.downloadLocation, settings.coverImageCache, logger),
+            new Mangasee(settings.downloadLocation, settings.coverImageCache, logger)
         };
-        foreach(Connector cConnector in this._connectors)
-            _taskQueue.Add(cConnector, new List<TrangaTask>());
-        _allTasks = new HashSet<TrangaTask>();
         
         this.settings = settings;
         ImportData();
@@ -90,31 +83,43 @@ public class TaskManager
     private void TaskCheckerThread()
     {
         logger?.WriteLine(this.GetType().ToString(), "Starting TaskCheckerThread.");
+        int allTasksWaitingLength = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
         while (_continueRunning)
         {
-            //Check if previous tasks have finished and execute new tasks
-            foreach (KeyValuePair<Connector, List<TrangaTask>> connectorTaskQueue in _taskQueue)
-            {
-                if(connectorTaskQueue.Value.RemoveAll(task => task.state == TrangaTask.ExecutionState.Waiting) > 0)
-                    ExportDataAndSettings();
-                
-                if (connectorTaskQueue.Value.Count > 0 && connectorTaskQueue.Value.All(task => task.state is TrangaTask.ExecutionState.Enqueued))
-                    ExecuteTaskNow(connectorTaskQueue.Value.First());
-            }
-            
-            //Check if task should be executed
-            //Depending on type execute immediately or enqueue
-            foreach (TrangaTask task in _allTasks.Where(aTask => aTask.ShouldExecute()))
+            TrangaTask[] tmp = _allTasks.Where(taskQuery =>
+                taskQuery.nextExecution < DateTime.Now &&
+                taskQuery.state is TrangaTask.ExecutionState.Waiting or TrangaTask.ExecutionState.Enqueued).ToArray();
+            foreach (TrangaTask task in tmp)
             {
                 task.state = TrangaTask.ExecutionState.Enqueued;
-                if(task.task == TrangaTask.Task.UpdateLibraries)
-                    ExecuteTaskNow(task);
-                else
+                switch (task.task)
                 {
-                    logger?.WriteLine(this.GetType().ToString(), $"Task due: {task}");
-                    _taskQueue[GetConnector(task.connectorName!)].Add(task);
+                    case TrangaTask.Task.DownloadNewChapters:
+                        if (!_allTasks.Any(taskQuery => taskQuery.task == TrangaTask.Task.DownloadNewChapters &&
+                                                        taskQuery.state is TrangaTask.ExecutionState.Running &&
+                                                        ((DownloadNewChaptersTask)taskQuery).connectorName == ((DownloadNewChaptersTask)task).connectorName))
+                        {
+                            ExecuteTaskNow(task);
+                        }
+                        break;
+                    case TrangaTask.Task.DownloadChapter:
+                        if (!_allTasks.Any(taskQuery =>
+                                taskQuery.task == TrangaTask.Task.DownloadChapter &&
+                                taskQuery.state is TrangaTask.ExecutionState.Running &&
+                                ((DownloadChapterTask)taskQuery).connectorName ==
+                                ((DownloadChapterTask)task).connectorName))
+                        {
+                            ExecuteTaskNow(task);
+                        }
+                        break;
+                    case TrangaTask.Task.UpdateLibraries:
+                        ExecuteTaskNow(task);
+                        break;
                 }
             }
+            if(allTasksWaitingLength != _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting))
+                ExportDataAndSettings();
+            allTasksWaitingLength = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
             Thread.Sleep(1000);
         }
     }
@@ -125,9 +130,7 @@ public class TaskManager
     /// <param name="task">Task to execute</param>
     public void ExecuteTaskNow(TrangaTask task)
     {
-        if (!this._allTasks.Contains(task))
-            return;
-        
+        task.state = TrangaTask.ExecutionState.Running;
         Task t = new(() =>
         {
             task.Execute(this, this.logger);
@@ -135,55 +138,67 @@ public class TaskManager
         t.Start();
     }
 
-    /// <summary>
-    /// Creates and adds a new Task to the task-Collection
-    /// </summary>
-    /// <param name="task">TrangaTask.Task to later execute</param>
-    /// <param name="connectorName">Name of the connector to use</param>
-    /// <param name="publication">Publication to execute Task on, can be null in case of unrelated Task</param>
-    /// <param name="reoccurrence">Time-Interval between Executions</param>
-    /// <param name="language">language, should Task require parameter. Can be empty</param>
-    /// <exception cref="ArgumentException">Is thrown when connectorName is not a available Connector</exception>
-    public TrangaTask AddTask(TrangaTask.Task task, string? connectorName, Publication? publication, TimeSpan reoccurrence,
-        string language = "")
+    public void AddTask(TrangaTask newTask)
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {task} {connectorName} {publication?.sortName}");
+        logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
 
-        TrangaTask? newTask = null;
-        if (task == TrangaTask.Task.UpdateLibraries)
+        switch (newTask.task)
         {
-            newTask = new UpdateLibrariesTask(task, reoccurrence);
-            logger?.WriteLine(this.GetType().ToString(), $"Removing old {task}-Task.");
-            //Only one UpdateKomgaLibrary Task
-            _allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries);
-            _allTasks.Add(newTask);
-            logger?.WriteLine(this.GetType().ToString(), $"Added new Task {newTask}");
-        }else if (task == TrangaTask.Task.DownloadNewChapters)
-        {
-            //Get appropriate Connector from available Connectors for TrangaTask
-            Connector? connector = _connectors.FirstOrDefault(c => c.name == connectorName);
-            if (connectorName is null)
-                throw new ArgumentException($"connectorName can not be null for task {task}");
-
-            if (publication is null)
-                throw new ArgumentException($"publication can not be null for task {task}");
-            Publication pub = (Publication)publication;
-            newTask = new DownloadNewChaptersTask(task, connector!.name, pub, reoccurrence, language);
-
-            if (!_allTasks.Any(trangaTask =>
-                    trangaTask.task == task && trangaTask.publication?.internalId == pub.internalId &&
-                    trangaTask.connectorName == connector.name))
-            {
-                _allTasks.Add(newTask);
-                logger?.WriteLine(this.GetType().ToString(), $"Added new Task {newTask}");
-            }
-            else
-                logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
+            case TrangaTask.Task.UpdateLibraries:
+                //Only one UpdateKomgaLibrary Task
+                logger?.WriteLine(this.GetType().ToString(), $"Removing old {newTask.task}-Task.");
+                _allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries);
+                break;
+            case TrangaTask.Task.DownloadNewChapters:
+                IEnumerable<TrangaTask> matchingdnc =
+                    _allTasks.Where(mTask => mTask.GetType() == typeof(DownloadNewChaptersTask));
+                if (matchingdnc.All(mTask =>
+                        ((DownloadNewChaptersTask)mTask).publication.internalId != ((DownloadNewChaptersTask)newTask).publication.publicationId &&
+                        ((DownloadNewChaptersTask)mTask).connectorName != ((DownloadNewChaptersTask)newTask).connectorName))
+                    _allTasks.Add(newTask);
+                else
+                    logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
+                break;
+            case TrangaTask.Task.DownloadChapter:
+                IEnumerable<TrangaTask> matchingdc =
+                    _allTasks.Where(mTask => mTask.GetType() == typeof(DownloadChapterTask));
+                if (!matchingdc.Any(mTask =>
+                        ((DownloadChapterTask)mTask).publication.internalId == ((DownloadChapterTask)newTask).publication.internalId &&
+                        ((DownloadChapterTask)mTask).connectorName == ((DownloadChapterTask)newTask).connectorName &&
+                        ((DownloadChapterTask)mTask).chapter.sortNumber == ((DownloadChapterTask)newTask).chapter.sortNumber))
+                    _allTasks.Add(newTask);
+                else
+                    logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
+                break;
         }
         ExportDataAndSettings();
+    }
 
-        if (newTask is null)
-            throw new Exception("Invalid path");
+    public void DeleteTask(TrangaTask removeTask)
+    {
+        logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
+        _allTasks.Remove(removeTask);
+    }
+
+    public TrangaTask? AddTask(TrangaTask.Task taskType, string? connectorName, string? publicationId,
+        TimeSpan reoccurrenceTime, string? language = "en")
+    {
+        TrangaTask? newTask = null;
+        switch (taskType)
+        {
+            case TrangaTask.Task.UpdateLibraries:
+                newTask = new UpdateLibrariesTask(taskType, reoccurrenceTime);
+                break;
+            case TrangaTask.Task.DownloadNewChapters:
+                if(connectorName is null || publicationId is null || language is null)
+                    logger?.WriteLine(this.GetType().ToString(), $"Values connectorName, publicationName and language can not be null.");
+                GetConnector(connectorName); //Check if connectorName is valid
+                Publication publication = GetAllPublications().First(pub => pub.internalId == publicationId);
+                newTask = new DownloadNewChaptersTask(taskType, connectorName!, publication, reoccurrenceTime, language!);
+                break;
+        }
+        if(newTask is not null)
+            AddTask(newTask);
         return newTask;
     }
 
@@ -192,36 +207,92 @@ public class TaskManager
     /// </summary>
     /// <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 DeleteTask(TrangaTask.Task task, string? connectorName, Publication? publication)
+    /// <param name="publicationId">Publication that was used</param>
+    public void DeleteTask(TrangaTask.Task task, string? connectorName, string? publicationId)
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Removing Task {task} {publication?.sortName}");
-        if (task == TrangaTask.Task.UpdateLibraries)
+        logger?.WriteLine(this.GetType().ToString(), $"Removing Task {task} {publicationId}");
+        
+        switch (task)
         {
-            _allTasks.RemoveWhere(uTask => uTask.task == TrangaTask.Task.UpdateLibraries);
-            logger?.WriteLine(this.GetType().ToString(), $"Removed Task {task} from all Tasks.");
-        }
-        else if (connectorName is null)
-            throw new ArgumentException($"connectorName can not be null for Task {task}");
-        else
-        {
-            foreach (List<TrangaTask> taskQueue in this._taskQueue.Values)
-                if(taskQueue.RemoveAll(trangaTask =>
-                       trangaTask.task == task && trangaTask.connectorName == connectorName &&
-                       trangaTask.publication?.internalId == publication?.internalId) > 0)
-                    logger?.WriteLine(this.GetType().ToString(), $"Removed Task {task} {publication?.sortName} {publication?.internalId} from Queue.");
+            case TrangaTask.Task.UpdateLibraries:
+                //Only one UpdateKomgaLibrary Task
+                logger?.WriteLine(this.GetType().ToString(), $"Removing old {task}-Task.");
+                _allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries);
+                break;
+            case TrangaTask.Task.DownloadNewChapters:
+                if (connectorName is null || publicationId is null)
+                    logger?.WriteLine(this.GetType().ToString(), "connectorName and publication can not be null");
                 else
-                    logger?.WriteLine(this.GetType().ToString(), $"Task {task} {publication?.sortName} {publication?.internalId} was not in Queue.");
-            if(_allTasks.RemoveWhere(trangaTask =>
-                trangaTask.task == task && trangaTask.connectorName == connectorName &&
-                trangaTask.publication?.internalId == publication?.internalId) > 0)
-                logger?.WriteLine(this.GetType().ToString(), $"Removed Task {task} {publication?.sortName} {publication?.internalId} from all Tasks.");
-            else
-                logger?.WriteLine(this.GetType().ToString(), $"No Task {task} {publication?.sortName} {publication?.internalId} could be found.");
+                {
+                    _allTasks.RemoveWhere(mTask =>
+                        mTask.GetType() == typeof(DownloadNewChaptersTask) &&
+                        ((DownloadNewChaptersTask)mTask).publication.internalId == publicationId &&
+                        ((DownloadNewChaptersTask)mTask).connectorName == connectorName!);
+                    _allTasks.RemoveWhere(mTask =>
+                        mTask.GetType() == typeof(DownloadChapterTask) &&
+                        ((DownloadChapterTask)mTask).publication.internalId == publicationId &&
+                        ((DownloadChapterTask)mTask).connectorName == connectorName!);
+                }
+                break;
         }
         ExportDataAndSettings();
     }
 
+    public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null)
+    {
+        switch (taskType)
+        {
+            case TrangaTask.Task.UpdateLibraries:
+                return _allTasks.Where(tTask => tTask.task == TrangaTask.Task.UpdateLibraries);
+            case TrangaTask.Task.DownloadNewChapters:
+                if(connectorName is null)
+                    return _allTasks.Where(tTask => tTask.task == taskType);
+                GetConnector(connectorName);//Name check
+                IEnumerable<TrangaTask> matchingdnc = _allTasks.Where(tTask => tTask.GetType() == typeof(DownloadNewChaptersTask));
+                if (searchString is not null)
+                {
+                    return matchingdnc.Where(mTask =>
+                        ((DownloadNewChaptersTask)mTask).connectorName == connectorName &&
+                        ((DownloadNewChaptersTask)mTask).ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
+                }
+                else if (internalId is not null)
+                {
+                    return matchingdnc.Where(mTask =>
+                        ((DownloadNewChaptersTask)mTask).connectorName == connectorName &&
+                        ((DownloadNewChaptersTask)mTask).publication.internalId == internalId);
+                }
+                else
+                    return _allTasks.Where(tTask =>
+                        tTask.GetType() == typeof(DownloadNewChaptersTask) &&
+                        ((DownloadNewChaptersTask)tTask).connectorName == connectorName);
+                
+            case TrangaTask.Task.DownloadChapter:
+                if(connectorName is null)
+                    return _allTasks.Where(tTask => tTask.task == taskType);
+                GetConnector(connectorName);//Name check
+                IEnumerable<TrangaTask> matchingdc = _allTasks.Where(tTask => tTask.GetType() == typeof(DownloadChapterTask));
+                if (searchString is not null)
+                {
+                    return matchingdc.Where(mTask =>
+                        ((DownloadChapterTask)mTask).connectorName == connectorName &&
+                        ((DownloadChapterTask)mTask).ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
+                }
+                else if (internalId is not null)
+                {
+                    return matchingdc.Where(mTask =>
+                        ((DownloadChapterTask)mTask).connectorName == connectorName &&
+                        ((DownloadChapterTask)mTask).publication.publicationId == internalId);
+                }
+                else
+                    return _allTasks.Where(tTask =>
+                        tTask.GetType() == typeof(DownloadChapterTask) &&
+                        ((DownloadChapterTask)tTask).connectorName == connectorName);
+                
+            default:
+                return Array.Empty<TrangaTask>();
+        }
+    }
+
     /// <summary>
     /// Removes a Task from the queue
     /// </summary>
@@ -229,8 +300,6 @@ public class TaskManager
     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;
     }
 
@@ -263,7 +332,7 @@ public class TaskManager
         Publication[] ret = connector.GetPublications(title ?? "");
         foreach (Publication publication in ret)
         {
-            if(!chapterCollection.Any(pub => pub.Key.sortName == publication.sortName))
+            if(chapterCollection.All(pub => pub.Key.internalId != publication.internalId))
                 this.chapterCollection.TryAdd(publication, new List<Chapter>());
         }
         return ret;
@@ -337,14 +406,34 @@ public class TaskManager
     private void ExportDataAndSettings()
     {
         logger?.WriteLine(this.GetType().ToString(), $"Exporting settings to {settings.settingsFilePath}");
+        while(IsFileInUse(settings.settingsFilePath))
+            Thread.Sleep(50);
         File.WriteAllText(settings.settingsFilePath, JsonConvert.SerializeObject(settings));
         
         logger?.WriteLine(this.GetType().ToString(), $"Exporting tasks to {settings.tasksFilePath}");
+        while(IsFileInUse(settings.tasksFilePath))
+            Thread.Sleep(50);
         File.WriteAllText(settings.tasksFilePath, JsonConvert.SerializeObject(this._allTasks));
         
         logger?.WriteLine(this.GetType().ToString(), $"Exporting known publications to {settings.knownPublicationsPath}");
+        while(IsFileInUse(settings.knownPublicationsPath))
+            Thread.Sleep(50);
         File.WriteAllText(settings.knownPublicationsPath, JsonConvert.SerializeObject(this.chapterCollection.Keys.ToArray()));
     }
 
-    
+    private bool IsFileInUse(string path)
+    {
+        if (!File.Exists(path))
+            return false;
+        try
+        {
+            using FileStream stream = new (path, FileMode.Open, FileAccess.Read, FileShare.None);
+            stream.Close();
+        }
+        catch (IOException)
+        {
+            return true;
+        }
+        return false;
+    }
 }

Tranga/Tranga.csproj

@@ -9,6 +9,7 @@
     <ItemGroup>
       <PackageReference Include="HtmlAgilityPack" Version="1.11.46" />
       <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
+      <PackageReference Include="PuppeteerSharp" Version="10.0.0" />
     </ItemGroup>
 
     <ItemGroup>

Tranga/TrangaTask.cs

@@ -1,27 +1,37 @@
-using Logging;
+using System.Text.Json.Serialization;
+using Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 using Tranga.TrangaTasks;
+using JsonConverter = Newtonsoft.Json.JsonConverter;
 
 namespace Tranga;
 
 /// <summary>
 /// Stores information on Task, when implementing new Tasks also update the serializer
 /// </summary>
+[JsonDerivedType(typeof(DownloadNewChaptersTask), 2)]
+[JsonDerivedType(typeof(UpdateLibrariesTask), 3)]
+[JsonDerivedType(typeof(DownloadChapterTask), 4)]
 public abstract class TrangaTask
 {
     // ReSharper disable once CommentTypo ...Tell me why!
     // ReSharper disable once MemberCanBePrivate.Global I want it thaaat way
     public TimeSpan reoccurrence { get; }
     public DateTime lastExecuted { get; set; }
-    public string? connectorName { get; }
     public Task task { get; }
-    public Publication? publication { get; }
-    public string? language { get; }
-    [JsonIgnore]public ExecutionState state { get; set; }
-    [JsonIgnore] public float progress => (tasksFinished != 0f ? tasksFinished / tasksCount : 0f);
-    [JsonIgnore]public float tasksCount { get; set; }
-    [JsonIgnore]public float tasksFinished { get; set; }
+    [Newtonsoft.Json.JsonIgnore]public ExecutionState state { get; set; }
+    [Newtonsoft.Json.JsonIgnore]public float progress { get; protected set; }
+    [Newtonsoft.Json.JsonIgnore]public DateTime nextExecution => lastExecuted.Add(reoccurrence);
+    [Newtonsoft.Json.JsonIgnore]public DateTime executionStarted { get; protected set; }
+
+    [Newtonsoft.Json.JsonIgnore]
+    public DateTime executionApproximatelyFinished => this.progress != 0
+        ? this.executionStarted.Add(DateTime.Now.Subtract(this.executionStarted) / this.progress)
+        : DateTime.MaxValue;
+    
+    [Newtonsoft.Json.JsonIgnore]
+    public TimeSpan executionApproximatelyRemaining => this.executionApproximatelyFinished.Subtract(DateTime.Now);
 
     public enum ExecutionState
     {
@@ -30,16 +40,19 @@ public abstract class TrangaTask
         Running
     };
 
-    protected TrangaTask(Task task, string? connectorName, Publication? publication, TimeSpan reoccurrence, string? language = null)
+    protected TrangaTask(Task task, TimeSpan reoccurrence)
     {
-        this.publication = publication;
         this.reoccurrence = reoccurrence;
         this.lastExecuted = DateTime.Now.Subtract(reoccurrence);
-        this.connectorName = connectorName;
         this.task = task;
-        this.language = language;
-        this.tasksCount = 1;
-        this.tasksFinished = 0;
+        this.progress = 0f;
+        this.executionStarted = DateTime.Now;
+    }
+
+    public float IncrementProgress(float amount)
+    {
+        this.progress += amount;
+        return this.progress;
     }
     
     /// <summary>
@@ -58,28 +71,29 @@ public abstract class TrangaTask
     {
         logger?.WriteLine(this.GetType().ToString(), $"Executing Task {this}");
         this.state = ExecutionState.Running;
+        this.executionStarted = DateTime.Now;
         ExecuteTask(taskManager, logger);
         this.lastExecuted = DateTime.Now;
         this.state = ExecutionState.Waiting;
         logger?.WriteLine(this.GetType().ToString(), $"Finished Executing Task {this}");
-        
     }
 
     /// <returns>True if elapsed time since last execution is greater than set interval</returns>
     public bool ShouldExecute()
     {
-        return DateTime.Now.Subtract(this.lastExecuted) > reoccurrence && state is ExecutionState.Waiting;
+        return nextExecution < DateTime.Now && state is ExecutionState.Waiting;
     }
 
     public enum Task : byte
     {
         DownloadNewChapters = 2,
-        UpdateLibraries = 3
+        UpdateLibraries = 3,
+        DownloadChapter = 4
     }
 
     public override string ToString()
     {
-        return $"{task}, {lastExecuted}, {reoccurrence}, {state} {(connectorName is not null ? $", {connectorName}" : "" )} {(publication is not null ? $", {progress:00.00}%" : "")} {(publication is not null ? $", {publication?.sortName}" : "")}";
+        return $"{task}, {lastExecuted}, {reoccurrence}, {state}, {progress:P2}, {executionApproximatelyFinished}, {executionApproximatelyRemaining}";
     }
     
     public class TrangaTaskJsonConverter : JsonConverter
@@ -97,6 +111,9 @@ public abstract class TrangaTask
 
             if (jo["task"]!.Value<Int64>() == (Int64)Task.UpdateLibraries)
                 return jo.ToObject<UpdateLibrariesTask>(serializer)!;
+            
+            if (jo["task"]!.Value<Int64>() == (Int64)Task.DownloadChapter)
+                return jo.ToObject<DownloadChapterTask>(serializer)!;
 
             throw new Exception();
         }

Tranga/TrangaTasks/DownloadChapterTask.cs

@@ -0,0 +1,42 @@
+using Logging;
+using Newtonsoft.Json;
+
+namespace Tranga.TrangaTasks;
+
+public class DownloadChapterTask : TrangaTask
+{
+    public string connectorName { get; }
+    public Publication publication { get; }
+    public string language { get; }
+    public Chapter chapter { get; }
+    [JsonIgnore]private DownloadNewChaptersTask? parentTask { get; init; }
+    
+    public DownloadChapterTask(Task task, string connectorName, Publication publication, Chapter chapter, string language = "en", DownloadNewChaptersTask? parentTask = null) : base(task, TimeSpan.Zero)
+    {
+        this.chapter = chapter;
+        this.connectorName = connectorName;
+        this.publication = publication;
+        this.language = language;
+        this.parentTask = parentTask;
+    }
+
+    protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
+    {
+        Publication pub = (Publication)this.publication!;
+        Connector connector = taskManager.GetConnector(this.connectorName);
+        connector.DownloadChapter(pub, this.chapter, this);
+        taskManager.DeleteTask(this);
+    }
+    
+    public new float IncrementProgress(float amount)
+    {
+        this.progress += amount;
+        parentTask?.IncrementProgress(amount);
+        return this.progress;
+    }
+
+    public override string ToString()
+    {
+        return $"{base.ToString()}, {connectorName}, {publication.sortName} {publication.internalId}, Vol.{chapter.volumeNumber} Ch.{chapter.chapterNumber}";
+    }
+}

Tranga/TrangaTasks/DownloadNewChaptersTask.cs

@@ -1,29 +1,45 @@
 using Logging;
+using Newtonsoft.Json;
 
 namespace Tranga.TrangaTasks;
 
 public class DownloadNewChaptersTask : TrangaTask
 {
-    public DownloadNewChaptersTask(Task task, string connectorName, Publication publication, TimeSpan reoccurrence, string language = "en") : base(task, connectorName, publication, reoccurrence, language)
+    public string connectorName { get; }
+    public Publication publication { get; }
+    public string language { get; }
+    [JsonIgnore]private int childTaskAmount { get; set; }
+    
+    public DownloadNewChaptersTask(Task task, string connectorName, Publication publication, TimeSpan reoccurrence, string language = "en") : base(task, reoccurrence)
     {
+        this.connectorName = connectorName;
+        this.publication = publication;
+        this.language = language;
+        childTaskAmount = 0;
+    }
+    
+    public new float IncrementProgress(float amount)
+    {
+        this.progress += amount / this.childTaskAmount;
+        return this.progress;
     }
 
     protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
     {
-        Publication pub = (Publication)this.publication!;
+        Publication pub = publication!;
         Connector connector = taskManager.GetConnector(this.connectorName);
-
+        
         //Check if Publication already has a Folder
         pub.CreatePublicationFolder(taskManager.settings.downloadLocation);
-        List<Chapter> newChapters = UpdateChapters(connector, pub, language!, ref taskManager.chapterCollection);
-        this.tasksCount = newChapters.Count;
+        List<Chapter> newChapters = GetNewChaptersList(connector, pub, language!, ref taskManager.chapterCollection);
+        this.childTaskAmount = newChapters.Count;
 
         connector.CopyCoverFromCacheToDownloadLocation(pub, taskManager.settings);
         
         pub.SaveSeriesInfoJson(connector.downloadLocation);
 
-        foreach(Chapter newChapter in newChapters)
-            connector.DownloadChapter(pub, newChapter, this);
+        foreach (Chapter newChapter in newChapters)
+            taskManager.AddTask(new DownloadChapterTask(Task.DownloadChapter, this.connectorName!, pub, newChapter, this.language, this));
     }
     
     /// <summary>
@@ -34,7 +50,7 @@ public class DownloadNewChaptersTask : TrangaTask
     /// <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, ref Dictionary<Publication, List<Chapter>> chapterCollection)
+    private static List<Chapter> GetNewChaptersList(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
@@ -44,4 +60,9 @@ public class DownloadNewChaptersTask : TrangaTask
         
         return newChaptersList;
     }
+
+    public override string ToString()
+    {
+        return $"{base.ToString()}, {connectorName}, {publication.sortName} {publication.internalId}";
+    }
 }

Tranga/TrangaTasks/UpdateLibrariesTask.cs

@@ -4,7 +4,7 @@ namespace Tranga.TrangaTasks;
 
 public class UpdateLibrariesTask : TrangaTask
 {
-    public UpdateLibrariesTask(Task task, TimeSpan reoccurrence) : base(task, null, null, reoccurrence)
+    public UpdateLibrariesTask(Task task, TimeSpan reoccurrence) : base(task, reoccurrence)
     {
     }
 
@@ -12,5 +12,6 @@ public class UpdateLibrariesTask : TrangaTask
     {
         foreach(LibraryManager lm in taskManager.settings.libraryManagers)
             lm.UpdateLibrary();
+        this.progress = 1f;
     }
 }

Website/apiConnector.js

@@ -94,8 +94,8 @@ function CreateTask(taskType, reoccurrence, connectorName, publicationId, langua
     PostData(uri);
 }
 
-function StartTask(taskType, connectorName, publicationId){
-    var uri = apiUri + `/Tasks/Start?taskType=${taskType}&connectorName=${connectorName}&publicationId=${publicationId}`;
+function StartTask(taskType, connectorName, internalId){
+    var uri = apiUri + `/Tasks/Start?taskType=${taskType}&connectorName=${connectorName}&internalId=${internalId}`;
     PostData(uri);
 }
 
@@ -104,8 +104,17 @@ function EnqueueTask(taskType, connectorName, publicationId){
     PostData(uri);
 }
 
-function UpdateSettings(downloadLocation, komgaUrl, komgaAuth){
-    var uri = apiUri + `/Settings/Update?downloadLocation=${downloadLocation}&komgaUrl=${komgaUrl}&komgaAuth=${komgaAuth}`;
+function UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaUser, kavitaPass){
+    var uri = apiUri + "/Settings/Update?"
+    if(downloadLocation != ""){
+        uri += "&downloadLocation="+downloadLocation;
+    }
+    if(komgaUrl != "" && komgaAuth != ""){
+        uri += `&komgaUrl=${komgaUrl}&komgaAuth=${komgaAuth}`;
+    }
+    if(kavitaUrl != "" && kavitaUser != "" && kavitaPass != ""){
+        uri += `&kavitaUrl=${kavitaUrl}&kavitaUsername=${kavitaUser}&kavitaPassword=${kavitaPass}`;
+    }
     PostData(uri);
 }
 

Website/index.html

@@ -99,7 +99,8 @@
             <span class="title">Kavita</span>
             <div>Configured: <span id="kavitaConfigured">✅❌</span></div>
             <label for="kavitaUrl"></label><input placeholder="URL" id="kavitaUrl" type="text">
-            <label for="kavitaApiKey"></label><input placeholder="API-Key" id="kavitaApiKey" type="text">
+            <label for="kavitaUsername"></label><input placeholder="Username" id="kavitaUsername" type="text">
+            <label for="kavitaPassword"></label><input placeholder="Password" id="kavitaPassword" type="password">
           </kavita-settings>
           <div>
             <label for="libraryUpdateTime" style="margin-right: 5px;">Update Time</label><input id="libraryUpdateTime" type="time" value="00:01:00" step="10">

Website/interaction.js

@@ -27,7 +27,8 @@ const settingKomgaUrl = document.querySelector("#komgaUrl");
 const settingKomgaUser = document.querySelector("#komgaUsername");
 const settingKomgaPass = document.querySelector("#komgaPassword");
 const settingKavitaUrl = document.querySelector("#kavitaUrl");
-const settingKavitaApi = document.querySelector("#kavitaApiKey");
+const settingKavitaUser = document.querySelector("#kavitaUsername");
+const settingKavitaPass = document.querySelector("#kavitaPassword");
 const libraryUpdateTime = document.querySelector("#libraryUpdateTime");
 const settingKomgaConfigured = document.querySelector("#komgaConfigured");
 const settingKavitaConfigured = document.querySelector("#kavitaConfigured");
@@ -243,7 +244,8 @@ function GetSettingsClick(){
     settingKomgaUser.value = "";
     settingKomgaPass.value = "";
     settingKavitaUrl.value = "";
-    settingKavitaApi.value = "";
+    settingKavitaUser.value = "";
+    settingKavitaPass.value = "";
     settingKomgaConfigured.innerText = "❌";
     settingKavitaConfigured.innerText = "❌";
     
@@ -254,12 +256,13 @@ function GetSettingsClick(){
         json.libraryManagers.forEach(lm => {
            if(lm.libraryType == 0){
                settingKomgaUrl.placeholder = lm.baseUrl;
-               settingKomgaUser.placeholder = "Configured";
+               settingKomgaUser.placeholder = "User";
                settingKomgaPass.placeholder = "***";
                settingKomgaConfigured.innerText = "✅";
-           } else if(libraryType == 1){
+           } else if(lm.libraryType == 1){
                settingKavitaUrl.placeholder = lm.baseUrl;
-               settingKavitaApi.placeholder = "***";
+               settingKavitaUser.placeholder = "User";
+               settingKavitaPass.placeholder = "***";
                settingKavitaConfigured.innerText = "✅";
            }
         });
@@ -282,11 +285,11 @@ function UpdateLibrarySettings(){
             UpdateSettings("", settingKomgaUrl.placeholder, auth, "", "");
     }
     
-    if(settingKavitaUrl.value != "" && settingKavitaApi != ""){
-        UpdateSettings("", "", "", settingKavitaUrl.value, settingKavitaApi.value);
+    if(settingKavitaUrl.value != "" && settingKavitaUser.value != "" && settingKavitaPass.value != ""){
+        UpdateSettings("", "", "", settingKavitaUrl.value, settingKavitaUser.value, settingKavitaPass.value);
     }
     CreateTask("UpdateLibraries", libraryUpdateTime.value, "","","");
-    setTimeout(() => GetSettingsClick(), 100);
+    setTimeout(() => GetSettingsClick(), 200);
 }
 
 function utf8_to_b64( str ) {
@@ -299,10 +302,12 @@ function ShowRunningTasks(event){
         .then(json => {
             tagTasksPopupContent.replaceChildren();
             json.forEach(task => {
-                console.log(task);
                 if(task.publication != null){
                     var taskname = document.createElement("footer-tag-task-name");
-                    taskname.innerText = task.publication.sortName;
+                    if(task.task == 2)
+                        taskname.innerText = `${task.publication.sortName} - ${task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2})}`;
+                    else if(task.task == 4)
+                        taskname.innerText = `${task.publication.sortName} Vol.${task.chapter.volumeNumber} Ch.${task.chapter.chapterNumber} - ${task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2})}`;
                     tagTasksPopupContent.appendChild(taskname);
                 }
             });
@@ -319,7 +324,10 @@ function ShowQueuedTasks(event){
             tagTasksPopupContent.replaceChildren();
             json.forEach(task => {
                 var taskname = document.createElement("footer-tag-task-name");
-                taskname.innerText = task.publication.sortName;
+                if(task.task == 2)
+                    taskname.innerText = `${task.publication.sortName}`;
+                else if(task.task == 4)
+                    taskname.innerText = `${task.publication.sortName} Vol.${task.chapter.volumeNumber} Ch.${task.chapter.chapterNumber}`;
                 tagTasksPopupContent.appendChild(taskname);
             });
             if(json.length > 0){

Website/style.css

@@ -500,7 +500,7 @@ footer-tag-content{
 }
 
 footer-tag-content > * {
-    margin: 2px 0;
+    margin: 2px 5px;
 }
 
 footer-tag-popup::before{