website fix taskSelectOutput overflow issue

Added Update Method for TrangaSettings for LunaSea
#21

README.md

@@ -36,6 +36,7 @@
     <li>
       <a href="#getting-started">Getting Started</a>
       <ul>
+        <li><a href="#prerequisites">Usage</a></li>
         <li><a href="#prerequisites">Prerequisites</a></li>
       </ul>
     </li>
@@ -109,6 +110,28 @@ Download [docker-compose.yaml](https://git.bernloehr.eu/glax/Tranga/src/branch/m
 
 Wherever you are mounting `/usr/share/Tranga-API` you also need to mount that same path + `/imageCache` in the webserver container.
 
+### Usage
+
+There is two ways to download Mangas:
+- Downloading everything and monitor for new Chapters
+- Selecting specific Volumes/Chapters
+
+On the website you add new tasks, by selecting the blue '+' field. Next select the connector/site you want to use, and enter a search term.
+After pressing 'Search', the results will be presented below - this might, depending on the result-size, take a while.
+Next select the publication and a new popup will open with two options:
+- "Monitor" - Download all chapters and monitor for new ones
+- "Download Chapter" - Download specific chapters only
+
+When selecting `Monitor` you will be presented with a new window and the selection of the interval you want to check for new chapters.
+When selecting `Download Chapter` a list will open with all available chapters from which you can then select a range.
+
+The syntax for selecting chapters is as follows:
+- To download a single Chapter enter either the index number (the number at the very start of the line) or its absolute number like so: `c(h)(apter)[number]`, spaces are allowed.
+- To download a range of chapters enter either a range of index numbers (`3-6`) or chapters (`ch 12-23`).
+- For volumes the syntax is as follows: `v(ol)[number](-[number])`, again spaces allowed.
+
+Examples: `2-12`, `c1`, `ch 2`, `chapter 3`, `v 2`, `vol3-4`, `v2c4` (note: you can only specify a single chapter with this syntax).
+
 ### Prerequisites
 
 [.NET-Core 7.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)

Tranga-API/Program.cs

@@ -18,7 +18,7 @@ TrangaSettings settings;
 if (File.Exists(settingsFilePath))
     settings = TrangaSettings.LoadSettings(settingsFilePath, logger);
 else
-    settings = new TrangaSettings(downloadFolderPath, applicationFolderPath, new HashSet<LibraryManager>());
+    settings = new TrangaSettings(downloadFolderPath, applicationFolderPath, new HashSet<LibraryManager>(), new HashSet<NotificationManager>());
 
 Directory.CreateDirectory(settings.workingDirectory);
 Directory.CreateDirectory(settings.downloadLocation);
@@ -75,15 +75,26 @@ app.MapGet("/Publications/GetFromConnector", (string connectorName, string title
     return taskManager.GetPublicationsFromConnector(connector, title);
 });
 
-app.MapGet("/Publications/GetChapters", (string connectorName, string internalId, string? language) =>
-{
-    Connector? connector = taskManager.GetAvailableConnectors().FirstOrDefault(con => con.Key == connectorName).Value;
-    if (connector is null)
-        return Array.Empty<Chapter>();
-    Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId);
-    if (publication is null)
-        return Array.Empty<Chapter>();
-    return connector.GetChapters((Publication)publication, language??"en");
+app.MapGet("/Publications/GetChapters",
+    (string connectorName, string internalId, string? onlyNew, string? onlyExisting, string? language) =>
+    { 
+        string[] yes = { "true", "yes", "1", "y" };
+        bool newOnly = onlyNew is not null && yes.Contains(onlyNew);
+        bool existingOnly = onlyExisting is not null && yes.Contains(onlyExisting);
+        
+        Connector? connector = taskManager.GetAvailableConnectors().FirstOrDefault(con => con.Key == connectorName).Value;
+        if (connector is null)
+            return Array.Empty<Chapter>();
+        Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId);
+        if (publication is null)
+            return Array.Empty<Chapter>();
+        
+        if(newOnly)
+            return taskManager.GetNewChaptersList(connector, (Publication)publication, language??"en").ToArray();
+        else if (existingOnly)
+            return taskManager.GetExistingChaptersList(connector, (Publication)publication, language ?? "en").ToArray();
+        else
+            return connector.GetChapters((Publication)publication, language??"en");
 });
 
 app.MapGet("/Tasks/GetTypes", () => Enum.GetNames(typeof(TrangaTask.Task)));
@@ -119,21 +130,10 @@ app.MapPost("/Tasks/CreateDownloadChaptersTask", (string connectorName, string i
     if (publication is null)
         return;
     
-    Chapter[] availableChapters = connector.GetChapters((Publication)publication, language??"en");;
-    
-    if (chapters.Contains('-'))
-    {
-        int start = Convert.ToInt32(chapters.Split('-')[0]);
-        int end = Convert.ToInt32(chapters.Split('-')[1]) + 1;
-        foreach (Chapter chapter in availableChapters[start..end])
-        {
-            taskManager.AddTask(new DownloadChapterTask(TrangaTask.Task.DownloadChapter, connectorName,
-                (Publication)publication, chapter, "en"));
-        }
-    }
-    else
+    IEnumerable<Chapter> toDownload = connector.SearchChapters((Publication)publication, chapters, language ?? "en");
+    foreach(Chapter chapter in toDownload)
         taskManager.AddTask(new DownloadChapterTask(TrangaTask.Task.DownloadChapter, connectorName,
-            (Publication)publication, availableChapters[Convert.ToInt32(chapters)], "en"));
+            (Publication)publication, chapter, "en"));
 });
 
 app.MapDelete("/Tasks/Delete", (string taskType, string? connectorName, string? publicationId) =>
@@ -155,14 +155,24 @@ app.MapGet("/Tasks/Get", (string taskType, string? connectorName, string? search
     }
 });
 
-app.MapGet("/Tasks/GetProgress", (string taskType, string? connectorName, string? publicationId) =>
+app.MapGet("/Tasks/GetProgress", (string taskType, string connectorName, string publicationId, string? chapterSortNumber) =>
 {
+    Connector? connector =
+        taskManager.GetAvailableConnectors().FirstOrDefault(con => con.Key == connectorName).Value;
+    if (connector is null)
+        return -1f;
     try
     {
+        TrangaTask? task = null;
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
-        TrangaTask? task = taskManager
-            .GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId)?.First();
-
+        if (pTask is TrangaTask.Task.DownloadNewChapters)
+        {
+            task = taskManager.GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId).FirstOrDefault();
+        }else if (pTask is TrangaTask.Task.DownloadChapter && chapterSortNumber is not null)
+        {
+            task = taskManager.GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId,
+                chapterSortNumber: chapterSortNumber).FirstOrDefault();
+        }
         if (task is null)
             return -1f;
 
@@ -197,7 +207,7 @@ app.MapGet("/Tasks/GetRunningTasks",
     () => taskManager.GetAllTasks().Where(task => task.state is TrangaTask.ExecutionState.Running));
 
 app.MapGet("/Queue/GetList",
-    () => taskManager.GetAllTasks().Where(task => task.state is TrangaTask.ExecutionState.Enqueued));
+    () => taskManager.GetAllTasks().Where(task => task.state is TrangaTask.ExecutionState.Enqueued).OrderBy(task => task.nextExecution));
 
 app.MapPost("/Queue/Enqueue", (string taskType, string? connectorName, string? publicationId) =>
 {
@@ -238,7 +248,21 @@ 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? kavitaUsername, string? kavitaPassword) =>
-        taskManager.UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaUsername, kavitaPassword));
+    (string? downloadLocation, string? komgaUrl, string? komgaAuth, string? kavitaUrl, string? kavitaUsername,
+        string? kavitaPassword, string? gotifyUrl, string? gotifyAppToken, string? lunaseaWebhook) =>
+    {
+        if (downloadLocation is not null && downloadLocation.Length > 0)
+            taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.DownloadLocation, logger, downloadLocation);
+        if (komgaUrl is not null && komgaAuth is not null && komgaUrl.Length > 5 && komgaAuth.Length > 0)
+            taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.Komga, logger, komgaUrl, komgaAuth);
+        if (kavitaUrl is not null && kavitaPassword is not null && kavitaUsername is not null && kavitaUrl.Length > 5 &&
+            kavitaUsername.Length > 0 && kavitaPassword.Length > 0)
+            taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.Kavita, logger, kavitaUrl, kavitaUsername,
+                kavitaPassword);
+        if (gotifyUrl is not null && gotifyAppToken is not null && gotifyUrl.Length > 5 && gotifyAppToken.Length > 0)
+            taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.Gotify, logger, gotifyUrl, gotifyAppToken);
+        if(lunaseaWebhook is not null && lunaseaWebhook.Length > 5)
+            taskManager.settings.UpdateSettings(TrangaSettings.UpdateField.LunaSea, logger, lunaseaWebhook);
+    });
 
 app.Run();

Tranga-CLI/Tranga_Cli.cs

@@ -2,6 +2,7 @@
 using Logging;
 using Tranga;
 using Tranga.LibraryManagers;
+using Tranga.NotificationManagers;
 using Tranga.TrangaTasks;
 
 namespace Tranga_CLI;
@@ -30,7 +31,7 @@ public static class Tranga_Cli
         Logger logger = new(new[] { Logger.LoggerType.FileLogger }, null, Console.Out.Encoding, logFilePath);
         
         logger.WriteLine("Tranga_CLI", "Loading Taskmanager.");
-        TrangaSettings settings = File.Exists(settingsFilePath) ? TrangaSettings.LoadSettings(settingsFilePath, logger) : new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, new HashSet<LibraryManager>());
+        TrangaSettings settings = File.Exists(settingsFilePath) ? TrangaSettings.LoadSettings(settingsFilePath, logger) : new TrangaSettings(Directory.GetCurrentDirectory(), applicationFolderPath, new HashSet<LibraryManager>(), new HashSet<NotificationManager>());
 
             
         logger.WriteLine("Tranga_CLI", "User Input");
@@ -39,7 +40,7 @@ public static class Tranga_Cli
         while(tmpPath is null)
             tmpPath = Console.ReadLine();
         if (tmpPath.Length > 0)
-            settings.downloadLocation = tmpPath;
+            settings.UpdateSettings(TrangaSettings.UpdateField.DownloadLocation, logger, tmpPath);
 
         Console.WriteLine($"Komga BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Komga))?.baseUrl}]:");
         string? tmpUrlKomga = Console.ReadLine();
@@ -72,8 +73,7 @@ public static class Tranga_Cli
                 }
             } while (key != ConsoleKey.Enter);
 
-            settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
-            settings.libraryManagers.Add(new Komga(tmpUrlKomga, tmpKomgaUser, tmpKomgaPass, logger));
+            settings.UpdateSettings(TrangaSettings.UpdateField.Komga, logger, tmpUrlKomga, tmpKomgaUser, tmpKomgaPass);
         }
         
         Console.WriteLine($"Kavita BaseURL [{settings.libraryManagers.FirstOrDefault(lm => lm.GetType() == typeof(Kavita))?.baseUrl}]:");
@@ -107,11 +107,26 @@ public static class Tranga_Cli
                 }
             } while (key != ConsoleKey.Enter);
 
-            settings.libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
-            settings.libraryManagers.Add(new Kavita(tmpUrlKavita, tmpKavitaUser, tmpKavitaPass, logger));
+            settings.UpdateSettings(TrangaSettings.UpdateField.Kavita, logger, tmpUrlKavita, tmpKavitaUser, tmpKavitaPass);
+        }
+        
+        Console.WriteLine($"Gotify BaseURL [{((Gotify?)settings.notificationManagers.FirstOrDefault(lm => lm.GetType() == typeof(Gotify)))?.endpoint}]:");
+        string? tmpGotifyUrl = Console.ReadLine();
+        while (tmpGotifyUrl is null)
+            tmpGotifyUrl = Console.ReadLine();
+        if (tmpGotifyUrl.Length > 0)
+        {
+            Console.WriteLine("AppToken:");
+            string? tmpGotifyAppToken = Console.ReadLine();
+            while (tmpGotifyAppToken is null || tmpGotifyAppToken.Length < 1)
+                tmpGotifyAppToken = Console.ReadLine();
+
+            settings.UpdateSettings(TrangaSettings.UpdateField.Gotify, logger, tmpGotifyUrl, tmpGotifyAppToken);
         }
         
         logger.WriteLine("Tranga_CLI", "Loaded.");
+        foreach(NotificationManager nm in settings.notificationManagers)
+            nm.SendNotification("Tranga", "Loaded.");
         TaskMode(settings, logger);
     }
 
@@ -499,22 +514,7 @@ public static class Tranga_Cli
         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]) + 1;
-            return availableChapters[start..end];
-        }
-        else
-            return new Chapter[] { availableChapters[Convert.ToInt32(selectedChapters)] };
+        return connector.SearchChapters(publication, selectedChapters);
     }
 
     private static Connector? SelectConnector(Connector[] connectors, Logger logger)

Tranga.sln.DotSettings

@@ -1,4 +1,5 @@
 <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/=Gotify/@EntryIndexedValue">True</s:Boolean>
 	<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>

Tranga/Connector.cs

@@ -53,6 +53,78 @@ public abstract class Connector
     /// <param name="language">Language of the Chapters</param>
     /// <returns>Array of Chapters matching Publication and Language</returns>
     public abstract Chapter[] GetChapters(Publication publication, string language = "");
+
+    public Chapter[] SearchChapters(Publication publication, string searchTerm, string? language = null)
+    {
+        Chapter[] availableChapters = this.GetChapters(publication, language??"en");
+        Regex volumeRegex = new ("((v(ol)*(olume)*)+ *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
+        Regex chapterRegex = new ("((c(h)*(hapter)*)+ *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
+        Regex singleResultRegex = new("([0-9]+)", RegexOptions.IgnoreCase);
+        Regex rangeResultRegex = new("([0-9]+(-[0-9]+))", RegexOptions.IgnoreCase);
+        if (volumeRegex.IsMatch(searchTerm) && chapterRegex.IsMatch(searchTerm))
+        {
+            string volume = singleResultRegex.Match(volumeRegex.Match(searchTerm).Value).Value;
+            string chapter = singleResultRegex.Match(chapterRegex.Match(searchTerm).Value).Value;
+            return availableChapters.Where(aCh => aCh.volumeNumber is not null && aCh.chapterNumber is not null &&
+                aCh.volumeNumber.Equals(volume, StringComparison.InvariantCultureIgnoreCase) &&
+                aCh.chapterNumber.Equals(chapter, StringComparison.InvariantCultureIgnoreCase))
+                .ToArray();
+        }
+        else if (volumeRegex.IsMatch(searchTerm))
+        {
+            string volume = volumeRegex.Match(searchTerm).Value;
+            if (rangeResultRegex.IsMatch(volume))
+            {
+                string range = rangeResultRegex.Match(volume).Value;
+                int start = Convert.ToInt32(range.Split('-')[0]);
+                int end = Convert.ToInt32(range.Split('-')[1]);
+                return availableChapters.Where(aCh => aCh.volumeNumber is not null &&
+                                                      Convert.ToInt32(aCh.volumeNumber) >= start &&
+                                                      Convert.ToInt32(aCh.volumeNumber) <= end).ToArray();
+            }
+            else if (singleResultRegex.IsMatch(volume))
+            {
+                string volumeNumber = singleResultRegex.Match(volume).Value;
+                return availableChapters.Where(aCh =>
+                    aCh.volumeNumber is not null &&
+                    aCh.volumeNumber.Equals(volumeNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
+            }
+
+        }
+        else if (chapterRegex.IsMatch(searchTerm))
+        {
+            string chapter = volumeRegex.Match(searchTerm).Value;
+            if (rangeResultRegex.IsMatch(chapter))
+            {
+                string range = rangeResultRegex.Match(chapter).Value;
+                int start = Convert.ToInt32(range.Split('-')[0]);
+                int end = Convert.ToInt32(range.Split('-')[1]);
+                return availableChapters.Where(aCh => aCh.chapterNumber is not null &&
+                                                      Convert.ToInt32(aCh.chapterNumber) >= start &&
+                                                      Convert.ToInt32(aCh.chapterNumber) <= end).ToArray();
+            }
+            else if (singleResultRegex.IsMatch(chapter))
+            {
+                string chapterNumber = singleResultRegex.Match(chapter).Value;
+                return availableChapters.Where(aCh =>
+                    aCh.chapterNumber is not null &&
+                    aCh.chapterNumber.Equals(chapterNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
+            }
+        }
+        else
+        {
+            if (rangeResultRegex.IsMatch(searchTerm))
+            {
+                int start = Convert.ToInt32(searchTerm.Split('-')[0]);
+                int end = Convert.ToInt32(searchTerm.Split('-')[1]);
+                return availableChapters[start..(end + 1)];
+            }
+            else if(singleResultRegex.IsMatch(searchTerm))
+                return new [] { availableChapters[Convert.ToInt32(searchTerm)] };
+        }
+
+        return Array.Empty<Chapter>();
+    }
     
     /// <summary>
     /// Retrieves the Chapter (+Images) from the website.
@@ -61,7 +133,8 @@ 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, DownloadChapterTask parentTask);
+    /// <param name="cancellationToken"></param>
+    public abstract void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null);
 
     /// <summary>
     /// Copies the already downloaded cover from cache to downloadLocation
@@ -70,11 +143,11 @@ public abstract class Connector
     /// <param name="settings">TrangaSettings</param>
     public void CopyCoverFromCacheToDownloadLocation(Publication publication, TrangaSettings settings)
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} {publication.internalId}");
+        logger?.WriteLine(this.GetType().ToString(), $"Cloning cover {publication.sortName} -> {publication.internalId}");
         //Check if Publication already has a Folder and cover
         string publicationFolder = publication.CreatePublicationFolder(downloadLocation);
         DirectoryInfo dirInfo = new (publicationFolder);
-        if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover.")))
+        if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
         {
             logger?.WriteLine(this.GetType().ToString(), $"Cover exists {publication.sortName}");
             return;
@@ -100,7 +173,7 @@ public abstract class Connector
             new XElement("Tags", string.Join(',',publication.tags)),
             new XElement("LanguageISO", publication.originalLanguage),
             new XElement("Title", chapter.name),
-            new XElement("Writer", publication.author),
+            new XElement("Writer", string.Join(',', publication.authors)),
             new XElement("Volume", chapter.volumeNumber),
             new XElement("Number", chapter.chapterNumber)
         );
@@ -161,8 +234,10 @@ 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, DownloadChapterTask parentTask, string? comicInfoPath = null, string? referrer = null)
+    protected void DownloadChapterImages(string[] imageUrls, string saveArchiveFilePath, byte requestType, DownloadChapterTask parentTask, string? comicInfoPath = null, string? referrer = null, CancellationToken? cancellationToken = null)
     {
+        if (cancellationToken?.IsCancellationRequested??false)
+            return;
         logger?.WriteLine("Connector", $"Downloading Images for {saveArchiveFilePath}");
         //Check if Publication Directory already exists
         string directoryPath = Path.GetDirectoryName(saveArchiveFilePath)!;
@@ -183,7 +258,9 @@ public abstract class Connector
             string extension = split[^1];
             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.IncrementProgress(1f / imageUrls.Length);
+            parentTask.IncrementProgress(1.0 / imageUrls.Length);
+            if (cancellationToken?.IsCancellationRequested??false)
+                return;
         }
         
         if(comicInfoPath is not null)

Tranga/Connectors/MangaDex.cs

@@ -93,19 +93,21 @@ public class MangaDex : Connector
                 }
 
                 string? posterId = null;
-                string? authorId = null;
+                HashSet<string> authorIds = new();
                 if (manga.ContainsKey("relationships") && manga["relationships"] is not null)
                 {
                     JsonArray relationships = manga["relationships"]!.AsArray();
                     posterId = relationships.FirstOrDefault(relationship => relationship!["type"]!.GetValue<string>() == "cover_art")!["id"]!.GetValue<string>();
-                    authorId = relationships.FirstOrDefault(relationship => relationship!["type"]!.GetValue<string>() == "author")!["id"]!.GetValue<string>();
+                    foreach (JsonNode? node in relationships.Where(relationship =>
+                                 relationship!["type"]!.GetValue<string>() == "author"))
+                        authorIds.Add(node!["id"]!.GetValue<string>());
                 }
                 string? coverUrl = GetCoverUrl(publicationId, posterId);
                 string? coverCacheName = null;
                 if (coverUrl is not null)
                     coverCacheName = SaveCoverImageToCache(coverUrl, (byte)RequestType.AtHomeServer);
-                
-                string? author = GetAuthor(authorId);
+
+                List<string> authors = GetAuthors(authorIds);
 
                 Dictionary<string, string> linksDict = new();
                 if (attributes.ContainsKey("links") && attributes["links"] is not null)
@@ -129,7 +131,7 @@ public class MangaDex : Connector
 
                 Publication pub = new (
                     title,
-                    author,
+                    authors,
                     description,
                     altTitlesDict,
                     tags.ToArray(),
@@ -205,8 +207,10 @@ public class MangaDex : Connector
         return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
     }
 
-    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask)
+    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
     {
+        if (cancellationToken?.IsCancellationRequested??false)
+            return;
         logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
         //Request URLs for Chapter-Images
         DownloadClient.RequestResult requestResult =
@@ -229,7 +233,7 @@ public class MangaDex : Connector
         File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
         
         //Download Chapter-Images
-        DownloadChapterImages(imageUrls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)RequestType.AtHomeServer, parentTask, comicInfoPath);
+        DownloadChapterImages(imageUrls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)RequestType.AtHomeServer, parentTask, comicInfoPath, cancellationToken:cancellationToken);
     }
 
     private string? GetCoverUrl(string publicationId, string? posterId)
@@ -257,21 +261,23 @@ public class MangaDex : Connector
         return coverUrl;
     }
 
-    private string? GetAuthor(string? authorId)
+    private List<string> GetAuthors(IEnumerable<string> authorIds)
     {
-        if (authorId is null)
-            return null;
-        
-        DownloadClient.RequestResult requestResult =
-            downloadClient.MakeRequest($"https://api.mangadex.org/author/{authorId}", (byte)RequestType.Author);
-        if (requestResult.statusCode != HttpStatusCode.OK)
-            return null;
-        JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
-        if (result is null)
-            return null;
+        List<string> ret = new();
+        foreach (string authorId in authorIds)
+        {
+            DownloadClient.RequestResult requestResult =
+                downloadClient.MakeRequest($"https://api.mangadex.org/author/{authorId}", (byte)RequestType.Author);
+            if (requestResult.statusCode != HttpStatusCode.OK)
+                return ret;
+            JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
+            if (result is null)
+                return ret;
 
-        string author = result["data"]!["attributes"]!["name"]!.GetValue<string>();
-        logger?.WriteLine(this.GetType().ToString(), $"Got author {authorId} -> {author}");
-        return author;
+            string authorName = result["data"]!["attributes"]!["name"]!.GetValue<string>();
+            ret.Add(authorName);
+            logger?.WriteLine(this.GetType().ToString(), $"Got author {authorId} -> {authorName}");
+        }
+        return ret;
     }
 }

Tranga/Connectors/Manganato.cs

@@ -1,4 +1,5 @@
-using System.Net;
+using System.Globalization;
+using System.Net;
 using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 using Logging;
@@ -70,8 +71,8 @@ public class Manganato : Connector
         Dictionary<string, string> altTitles = new();
         Dictionary<string, string>? links = null;
         HashSet<string> tags = new();
-        string? author = null, originalLanguage = null;
-        int? year = DateTime.Now.Year;
+        string[] authors = Array.Empty<string>();
+        string originalLanguage = "";
 
         HtmlNode infoNode = document.DocumentNode.Descendants("div").First(d => d.HasClass("story-info-right"));
 
@@ -93,7 +94,7 @@ public class Manganato : Connector
                         altTitles.Add(i.ToString(), alts[i]);
                     break;
                 case "authors":
-                    author = value;
+                    authors = value.Split('-');
                     break;
                 case "status":
                     status = value;
@@ -118,9 +119,9 @@ public class Manganato : Connector
 
         string yearString = document.DocumentNode.Descendants("li").Last(li => li.HasClass("a-h")).Descendants("span")
             .First(s => s.HasClass("chapter-time")).InnerText;
-        year = Convert.ToInt32(yearString.Split(',')[^1]) + 2000;
+        int year = Convert.ToInt32(yearString.Split(',')[^1]) + 2000;
         
-        return new Publication(sortName, author, description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
+        return new Publication(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
             year, originalLanguage, status, publicationId);
     }
 
@@ -132,11 +133,18 @@ public class Manganato : Connector
             downloadClient.MakeRequest(requestUrl, (byte)1);
         if (requestResult.statusCode != HttpStatusCode.OK)
             return Array.Empty<Chapter>();
-
-        return ParseChaptersFromHtml(requestResult.result);
+        
+        //Return Chapters ordered by Chapter-Number
+        NumberFormatInfo chapterNumberFormatInfo = new()
+        {
+            NumberDecimalSeparator = "."
+        };
+        List<Chapter> chapters = ParseChaptersFromHtml(requestResult.result);
+        logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
+        return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
     }
 
-    private Chapter[] ParseChaptersFromHtml(Stream html)
+    private List<Chapter> ParseChaptersFromHtml(Stream html)
     {
         StreamReader reader = new (html);
         string htmlString = reader.ReadToEnd();
@@ -158,11 +166,13 @@ public class Manganato : Connector
             ret.Add(new Chapter(chapterName, volumeNumber, chapterNumber, url));
         }
         ret.Reverse();
-        return ret.ToArray();
+        return ret;
     }
 
-    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask)
+    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
     {
+        if (cancellationToken?.IsCancellationRequested??false)
+            return;
         logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
         string requestUrl = chapter.url;
         DownloadClient.RequestResult requestResult =
@@ -175,7 +185,7 @@ public class Manganato : Connector
         string comicInfoPath = Path.GetTempFileName();
         File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
         
-        DownloadChapterImages(imageUrls, GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, "https://chapmanganato.com/");
+        DownloadChapterImages(imageUrls, GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, "https://chapmanganato.com/", cancellationToken);
     }
 
     private string[] ParseImageUrlsFromHtml(Stream html)

Tranga/Connectors/Mangasee.cs

@@ -1,4 +1,5 @@
-using System.Net;
+using System.Globalization;
+using System.Net;
 using System.Text.RegularExpressions;
 using System.Xml.Linq;
 using HtmlAgilityPack;
@@ -13,7 +14,7 @@ public class Mangasee : Connector
 {
     public override string name { get; }
     private IBrowser? _browser = null;
-    private const string ChromiumVersion = "1153303";
+    private const string ChromiumVersion = "1154303";
 
     public Mangasee(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation,
         imageCachePath, logger)
@@ -140,10 +141,9 @@ public class Mangasee : Connector
         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);
+        List<string> authors = new();
+        foreach(HtmlNode authorNode in authorsNodes)
+            authors.Add(authorNode.InnerText);
 
         HtmlNode[] genreNodes = attributes.Descendants("li")
             .First(node => node.InnerText.Contains("genre(s):", StringComparison.CurrentCultureIgnoreCase))
@@ -170,7 +170,7 @@ public class Mangasee : Connector
         foreach(string at in a)
             altTitles.Add((i++).ToString(), at);
         
-        return new Publication(sortName, author, description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
+        return new Publication(sortName, authors, description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
             year, originalLanguage, status, publicationId);
     }
     
@@ -200,20 +200,29 @@ public class Mangasee : Connector
             ret.Add(new Chapter("", volumeNumber, chapterNumber, url));
         }
 
-        ret.Reverse();
-        return ret.ToArray();
+        //Return Chapters ordered by Chapter-Number
+        NumberFormatInfo chapterNumberFormatInfo = new()
+        {
+            NumberDecimalSeparator = "."
+        };
+        logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
+        return ret.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
     }
 
-    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask)
+    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
     {
-        while (this._browser is null)
+        if (cancellationToken?.IsCancellationRequested??false)
+            return;
+        while (this._browser is null && !(cancellationToken?.IsCancellationRequested??false))
         {
             logger?.WriteLine(this.GetType().ToString(), "Waiting for headless browser to download...");
             Thread.Sleep(1000);
         }
+        if (cancellationToken?.IsCancellationRequested??false)
+            return;
         
         logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
-        IPage page = _browser.NewPageAsync().Result;
+        IPage page = _browser!.NewPageAsync().Result;
         IResponse response = page.GoToAsync(chapter.url).Result;
         if (response.Ok)
         {
@@ -229,7 +238,7 @@ public class Mangasee : Connector
             string comicInfoPath = Path.GetTempFileName();
             File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
         
-            DownloadChapterImages(urls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath);
+            DownloadChapterImages(urls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, cancellationToken:cancellationToken);
         }
     }
 }

Tranga/NotificationManager.cs

@@ -0,0 +1,49 @@
+using Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Tranga.NotificationManagers;
+
+namespace Tranga;
+
+public abstract class NotificationManager
+{
+    protected Logger? logger;
+    public NotificationManagerType notificationManagerType { get; }
+
+    protected NotificationManager(NotificationManagerType notificationManagerType, Logger? logger = null)
+    {
+        this.notificationManagerType = notificationManagerType;
+        this.logger = logger;
+    }
+    
+    public enum NotificationManagerType : byte { Gotify = 0, LunaSea = 1 }
+    
+    public abstract void SendNotification(string title, string notificationText);
+    
+    public class NotificationManagerJsonConverter : JsonConverter
+    {
+        public override bool CanConvert(Type objectType)
+        {
+            return (objectType == typeof(NotificationManager));
+        }
+
+        public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
+        {
+            JObject jo = JObject.Load(reader);
+            if (jo["notificationManagerType"]!.Value<byte>() == (byte)NotificationManagerType.Gotify)
+                return jo.ToObject<Gotify>(serializer)!;
+
+            throw new Exception();
+        }
+
+        public override bool CanWrite => false;
+
+        /// <summary>
+        /// Don't call this
+        /// </summary>
+        public override void WriteJson(JsonWriter writer, object? value, JsonSerializer serializer)
+        {
+            throw new Exception("Dont call this");
+        }
+    }
+}

Tranga/NotificationManagers/Gotify.cs

@@ -0,0 +1,49 @@
+using System.Text;
+using Logging;
+using Newtonsoft.Json;
+
+namespace Tranga.NotificationManagers;
+
+public class Gotify : NotificationManager
+{
+    public string endpoint { get; }
+    public string appToken { get; }
+    private readonly HttpClient _client = new();
+    
+    public Gotify(string endpoint, string appToken, Logger? logger = null) : base(NotificationManagerType.Gotify, logger)
+    {
+        this.endpoint = endpoint;
+        this.appToken = appToken;
+    }
+    
+    public override void SendNotification(string title, string notificationText)
+    {
+        logger?.WriteLine(this.GetType().ToString(), $"Sending notification: {title} - {notificationText}");
+        MessageData message = new(title, notificationText);
+        HttpRequestMessage request = new(HttpMethod.Post, $"{endpoint}/message");
+        request.Headers.Add("X-Gotify-Key", this.appToken);
+        request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
+        HttpResponseMessage response = _client.Send(request);
+        if (!response.IsSuccessStatusCode)
+        {
+            StreamReader sr = new (response.Content.ReadAsStream());
+            logger?.WriteLine(this.GetType().ToString(), $"{response.StatusCode}: {sr.ReadToEnd()}");
+        }
+    }
+
+    private class MessageData
+    {
+        public string message { get; }
+        public long priority { get; }
+        public string title { get; }
+        public Dictionary<string, object> extras { get; }
+
+        public MessageData(string title, string message)
+        {
+            this.title = title;
+            this.message = message;
+            this.extras = new();
+            this.priority = 2;
+        }
+    }
+}

Tranga/NotificationManagers/LunaSea.cs

@@ -0,0 +1,43 @@
+using System.Text;
+using Logging;
+using Newtonsoft.Json;
+
+namespace Tranga.NotificationManagers;
+
+public class LunaSea : NotificationManager
+{
+    public string webhook { get; }
+    private readonly HttpClient _client = new();
+    public LunaSea(string webhook, Logger? logger = null) : base(NotificationManagerType.LunaSea, logger)
+    {
+        this.webhook = webhook;
+    }
+
+    public override void SendNotification(string title, string notificationText)
+    {
+        logger?.WriteLine(this.GetType().ToString(), $"Sending notification: {title} - {notificationText}");
+        MessageData message = new(title, notificationText);
+        HttpRequestMessage request = new(HttpMethod.Post, webhook);
+        request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
+        HttpResponseMessage response = _client.Send(request);
+        if (!response.IsSuccessStatusCode)
+        {
+            StreamReader sr = new (response.Content.ReadAsStream());
+            logger?.WriteLine(this.GetType().ToString(), $"{response.StatusCode}: {sr.ReadToEnd()}");
+        }
+    }
+
+    private class MessageData
+    {
+        public string title { get; }
+        public string body { get; }
+        public string image { get; }
+
+        public MessageData(string title, string body)
+        {
+            this.title = title;
+            this.body = body;
+            this.image = "";
+        }
+    }
+}

Tranga/Publication.cs

@@ -12,7 +12,7 @@ namespace Tranga;
 public readonly struct Publication
 {
     public string sortName { get; }
-    public string? author { get; }
+    public List<string> authors { get; }
     public Dictionary<string,string> altTitles { get; }
     // ReSharper disable trice MemberCanBePrivate.Global, trust
     public string? description { get; }
@@ -29,10 +29,22 @@ public readonly struct Publication
 
     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)
+    [JsonConstructor] //Legacy
+    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)
+    {
+        List<string> pAuthors = new();
+        if(author is not null)
+            pAuthors.Add(author);
+        this = new Publication(sortName, pAuthors, description, altTitles, tags, posterUrl,
+            coverFileNameInCache, links, year, originalLanguage, status, publicationId);
+    }
+
+    public Publication(string sortName, List<string> authors, string? description, Dictionary<string,string> altTitles, string[] tags, string? posterUrl, string? coverFileNameInCache, Dictionary<string,string>? links, int? year, string? originalLanguage, string status, string publicationId)
     {
         this.sortName = sortName;
-        this.author = author;
+        this.authors = authors;
         this.description = description;
         this.altTitles = altTitles;
         this.tags = tags;

Tranga/TaskManager.cs

@@ -1,7 +1,6 @@
 using Logging;
 using Newtonsoft.Json;
 using Tranga.Connectors;
-using Tranga.LibraryManagers;
 using Tranga.TrangaTasks;
 
 namespace Tranga;
@@ -19,46 +18,17 @@ public class TaskManager
     public TrangaSettings settings { get; }
     private Logger? logger { get; }
 
-    private readonly Dictionary<DownloadChapterTask, Task> _runningDownloadChapterTasks = new();
+    private readonly Dictionary<DownloadChapterTask, CancellationTokenSource> _runningDownloadChapterTasks = new();
 
     /// <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="libraryManagers"></param>
+    /// <param name="notificationManagers"></param>
     /// <param name="logger"></param>
-    public TaskManager(string downloadFolderPath, string workingDirectory, string imageCachePath, HashSet<LibraryManager> libraryManagers, Logger? logger = null)
+    public TaskManager(string downloadFolderPath, string workingDirectory, string imageCachePath, HashSet<LibraryManager> libraryManagers, HashSet<NotificationManager> notificationManagers, Logger? logger = null) : this(new TrangaSettings(downloadFolderPath, workingDirectory, libraryManagers, notificationManagers), logger)
     {
-        this.logger = logger;
-
-        this.settings = new TrangaSettings(downloadFolderPath, workingDirectory, libraryManagers);
-        ExportDataAndSettings();
         
-        this._connectors = new Connector[]
-        {
-            new MangaDex(downloadFolderPath, imageCachePath, logger),
-            new Manganato(downloadFolderPath, imageCachePath, logger),
-            new Mangasee(downloadFolderPath, imageCachePath, logger)
-        };
-        
-        Thread taskChecker = new(TaskCheckerThread);
-        taskChecker.Start();
-    }
-
-    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 && 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, kavitaUsername, kavitaPassword, logger));
-        }
-        if (downloadLocation is not null && downloadLocation.Length > 0)
-            settings.downloadLocation = downloadLocation;
-        ExportDataAndSettings();
     }
 
     public TaskManager(TrangaSettings settings, Logger? logger = null)
@@ -89,8 +59,9 @@ public class TaskManager
         while (_continueRunning)
         {
             TrangaTask[] tmp = _allTasks.Where(taskQuery =>
-                taskQuery.nextExecution < DateTime.Now &&
-                taskQuery.state is TrangaTask.ExecutionState.Waiting or TrangaTask.ExecutionState.Enqueued).ToArray();
+                    taskQuery.nextExecution < DateTime.Now &&
+                    taskQuery.state is TrangaTask.ExecutionState.Waiting or TrangaTask.ExecutionState.Enqueued)
+                .OrderBy(tmpTask => tmpTask.nextExecution).ToArray();
             foreach (TrangaTask task in tmp)
             {
                 task.state = TrangaTask.ExecutionState.Enqueued;
@@ -121,22 +92,24 @@ public class TaskManager
             }
 
             HashSet<DownloadChapterTask> toRemove = new();
-            foreach (KeyValuePair<DownloadChapterTask,Task> removeTask in _runningDownloadChapterTasks)
+            foreach (KeyValuePair<DownloadChapterTask, CancellationTokenSource> removeTask in _runningDownloadChapterTasks)
             {
                 if (removeTask.Key.GetType() == typeof(DownloadChapterTask) &&
                     DateTime.Now.Subtract(removeTask.Key.lastChange) > TimeSpan.FromMinutes(3))//3 Minutes since last update to task -> remove
                 {
                     logger?.WriteLine(this.GetType().ToString(), $"Disposing failed task {removeTask.Key}.");
-                    removeTask.Value.Dispose();;
+                    removeTask.Value.Cancel();
                     toRemove.Add(removeTask.Key);
                 }
             }
             foreach (DownloadChapterTask taskToRemove in toRemove)
             {
                 DeleteTask(taskToRemove);
-                AddTask(new DownloadChapterTask(taskToRemove.task, taskToRemove.connectorName,
+                DownloadChapterTask newTask = new (taskToRemove.task, taskToRemove.connectorName,
                     taskToRemove.publication, taskToRemove.chapter, taskToRemove.language,
-                    taskToRemove.parentTask));
+                    (DownloadNewChaptersTask?)taskToRemove.parentTask);
+                AddTask(newTask);
+                taskToRemove.parentTask?.ReplaceFailedChildTask(taskToRemove, newTask);
             }
             
             if(allTasksWaitingLength != _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting))
@@ -153,12 +126,13 @@ public class TaskManager
     public void ExecuteTaskNow(TrangaTask task)
     {
         task.state = TrangaTask.ExecutionState.Running;
+        CancellationTokenSource cToken = new ();
         Task t = new(() =>
         {
-            task.Execute(this, this.logger);
-        });
+            task.Execute(this, this.logger, cToken.Token);
+        }, cToken.Token);
         if(task.GetType() == typeof(DownloadChapterTask))
-            _runningDownloadChapterTasks.Add((DownloadChapterTask)task, t);
+            _runningDownloadChapterTasks.Add((DownloadChapterTask)task, cToken);
         t.Start();
     }
 
@@ -202,8 +176,13 @@ public class TaskManager
     {
         logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
         _allTasks.Remove(removeTask);
-        if (removeTask.GetType() == typeof(DownloadChapterTask))
+        if (removeTask.parentTask is not null)
+            removeTask.parentTask.RemoveChildTask(removeTask);
+        if (removeTask.GetType() == typeof(DownloadChapterTask) && _runningDownloadChapterTasks.ContainsKey((DownloadChapterTask)removeTask))
+        {
+            _runningDownloadChapterTasks[(DownloadChapterTask)removeTask].Cancel();
             _runningDownloadChapterTasks.Remove((DownloadChapterTask)removeTask);
+        }
     }
 
     public TrangaTask? AddTask(TrangaTask.Task taskType, string? connectorName, string? internalId,
@@ -259,18 +238,19 @@ public class TaskManager
                     _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!);
+                        ((DownloadNewChaptersTask)mTask).connectorName == connectorName);
+                    foreach(TrangaTask rTask in _allTasks.Where(mTask =>
+                                mTask.GetType() == typeof(DownloadChapterTask) &&
+                                ((DownloadChapterTask)mTask).publication.internalId == publicationId &&
+                                ((DownloadChapterTask)mTask).connectorName == connectorName))
+                        DeleteTask(rTask);
                 }
                 break;
         }
         ExportDataAndSettings();
     }
 
-    public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null)
+    public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterSortNumber = null)
     {
         switch (taskType)
         {
@@ -309,11 +289,12 @@ public class TaskManager
                         ((DownloadChapterTask)mTask).connectorName == connectorName &&
                         ((DownloadChapterTask)mTask).ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
                 }
-                else if (internalId is not null)
+                else if (internalId is not null && chapterSortNumber is not null)
                 {
                     return matchingdc.Where(mTask =>
                         ((DownloadChapterTask)mTask).connectorName == connectorName &&
-                        ((DownloadChapterTask)mTask).publication.publicationId == internalId);
+                        ((DownloadChapterTask)mTask).publication.publicationId == internalId &&
+                        ((DownloadChapterTask)mTask).chapter.sortNumber == chapterSortNumber);
                 }
                 else
                     return _allTasks.Where(tTask =>
@@ -375,6 +356,31 @@ public class TaskManager
     {
         return this.chapterCollection.Keys.ToArray();
     }
+    
+    
+    /// <summary>
+    /// Updates the available Chapters of a Publication
+    /// </summary>
+    /// <param name="connector">Connector to use</param>
+    /// <param name="publication">Publication to check</param>
+    /// <param name="language">Language to receive chapters for</param>
+    /// <returns>List of Chapters that were previously not in collection</returns>
+    public List<Chapter> GetNewChaptersList(Connector connector, Publication publication, string language)
+    {
+        List<Chapter> newChaptersList = new();
+        chapterCollection.TryAdd(publication, newChaptersList); //To ensure publication is actually in collection
+        
+        Chapter[] newChapters = connector.GetChapters(publication, language);
+        newChaptersList = newChapters.Where(nChapter => !connector.CheckChapterIsDownloaded(publication, nChapter)).ToList();
+        
+        return newChaptersList;
+    }
+
+    public List<Chapter> GetExistingChaptersList(Connector connector, Publication publication, string language)
+    {
+        Chapter[] newChapters = connector.GetChapters(publication, language);
+        return newChapters.Where(nChapter => connector.CheckChapterIsDownloaded(publication, nChapter)).ToList();
+    }
 
     /// <summary>
     /// Return Connector with given Name
@@ -422,6 +428,17 @@ public class TaskManager
             this._allTasks = JsonConvert.DeserializeObject<HashSet<TrangaTask>>(buffer, new JsonSerializerSettings() { Converters = { new TrangaTask.TrangaTaskJsonConverter() } })!;
         }
 
+        foreach (TrangaTask task in this._allTasks.Where(tTask => tTask.parentTaskId is not null))
+        {
+            TrangaTask? parentTask = this._allTasks.FirstOrDefault(pTask => pTask.taskId == task.parentTaskId);
+            if (parentTask is not null)
+            {
+                task.parentTask = parentTask;
+                parentTask.AddChildTask(task);
+            }
+        }
+            
+
         if (File.Exists(settings.knownPublicationsPath))
         {
             logger?.WriteLine(this.GetType().ToString(), $"Importing known publications from {settings.knownPublicationsPath}");

Tranga/TrangaSettings.cs

@@ -1,6 +1,7 @@
 using Logging;
 using Newtonsoft.Json;
 using Tranga.LibraryManagers;
+using Tranga.NotificationManagers;
 
 namespace Tranga;
 
@@ -8,32 +9,79 @@ public class TrangaSettings
 {
     public string downloadLocation { get; set; }
     public string workingDirectory { get; set; }
-    [JsonIgnore]public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
-    [JsonIgnore]public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
-    [JsonIgnore]public string knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json");
+    [JsonIgnore] public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
+    [JsonIgnore] public string tasksFilePath => Path.Join(workingDirectory, "tasks.json");
+    [JsonIgnore] public string knownPublicationsPath => Path.Join(workingDirectory, "knownPublications.json");
     [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
     public HashSet<LibraryManager> libraryManagers { get; }
+    public HashSet<NotificationManager> notificationManagers { get; }
 
-    public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager> libraryManagers)
+    public TrangaSettings(string downloadLocation, string workingDirectory, HashSet<LibraryManager>? libraryManagers,
+        HashSet<NotificationManager>? notificationManagers)
     {
         if (downloadLocation.Length < 1 || workingDirectory.Length < 1)
             throw new ArgumentException("Download-location and working-directory paths can not be empty!");
         this.workingDirectory = workingDirectory;
         this.downloadLocation = downloadLocation;
-        this.libraryManagers = libraryManagers;
+        this.libraryManagers = libraryManagers??new();
+        this.notificationManagers = notificationManagers??new();
     }
 
     public static TrangaSettings LoadSettings(string importFilePath, Logger? logger)
     {
         if (!File.Exists(importFilePath))
-            return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"), Directory.GetCurrentDirectory(), new HashSet<LibraryManager>());
+            return new TrangaSettings(Path.Join(Directory.GetCurrentDirectory(), "Downloads"),
+                Directory.GetCurrentDirectory(), new HashSet<LibraryManager>(), new HashSet<NotificationManager>());
 
         string toRead = File.ReadAllText(importFilePath);
-        TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead, new JsonSerializerSettings() { Converters = { new LibraryManager.LibraryManagerJsonConverter()} })!;
-        if(logger is not null)
-            foreach(LibraryManager lm in settings.libraryManagers)
+        TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(toRead,
+            new JsonSerializerSettings { Converters = { new NotificationManager.NotificationManagerJsonConverter(), new LibraryManager.LibraryManagerJsonConverter() } })!;
+        if (logger is not null)
+            foreach (LibraryManager lm in settings.libraryManagers)
                 lm.AddLogger(logger);
 
         return settings;
     }
+
+    public void UpdateSettings(UpdateField field, Logger? logger = null, params string[] values) 
+    {
+        switch (field)
+        {
+            case UpdateField.DownloadLocation:
+                if (values.Length != 1)
+                    return;
+                this.downloadLocation = values[0];
+                break;
+            case UpdateField.Komga:
+                if (values.Length != 2)
+                    return;
+                libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Komga));
+                libraryManagers.Add(new Komga(values[0], values[1], logger));
+                break;
+            case UpdateField.Kavita:
+                if (values.Length != 3)
+                    return;
+                libraryManagers.RemoveWhere(lm => lm.GetType() == typeof(Kavita));
+                libraryManagers.Add(new Kavita(values[0], values[1], values[2], logger));
+                break;
+            case UpdateField.Gotify:
+                if (values.Length != 2)
+                    return;
+                notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(Gotify));
+                Gotify newGotify = new(values[0], values[1], logger);
+                notificationManagers.Add(newGotify);
+                newGotify.SendNotification("Success!", "Gotify was added to Tranga!");
+                break;
+            case UpdateField.LunaSea:
+                if(values.Length != 1)
+                    return;
+                notificationManagers.RemoveWhere(nm => nm.GetType() == typeof(LunaSea));
+                LunaSea newLunaSea = new(values[0], logger);
+                notificationManagers.Add(newLunaSea);
+                newLunaSea.SendNotification("Success!", "LunaSea was added to Tranga!");
+                break;
+        }
+    }
+    
+    public enum UpdateField { DownloadLocation, Komga, Kavita, Gotify, LunaSea}
 }

Tranga/TrangaTask.cs

@@ -1,4 +1,5 @@
-using System.Text.Json.Serialization;
+using System.Globalization;
+using System.Text.Json.Serialization;
 using Logging;
 using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
@@ -20,43 +21,31 @@ public abstract class TrangaTask
     public TimeSpan reoccurrence { get; }
     public DateTime lastExecuted { get; set; }
     public Task task { get; }
-    [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);
+    public string taskId { get; set; }
+    [Newtonsoft.Json.JsonIgnore] public ExecutionState state { get; set; }
+    [Newtonsoft.Json.JsonIgnore] protected HashSet<TrangaTask> childTasks { get; }
+    [Newtonsoft.Json.JsonIgnore] public TrangaTask? parentTask { get; set; }
+    public string? parentTaskId { get; set; }
+    [Newtonsoft.Json.JsonIgnore]public double progress { get; private set; }
     [Newtonsoft.Json.JsonIgnore]public DateTime executionStarted { get; private set; }
+    [Newtonsoft.Json.JsonIgnore]public DateTime lastChange { get; private set; }
+    [Newtonsoft.Json.JsonIgnore]public DateTime executionApproximatelyFinished => progress != 0 ? lastChange.Add(GetRemainingTime()) : DateTime.MaxValue;
+    [Newtonsoft.Json.JsonIgnore]public TimeSpan executionApproximatelyRemaining => executionApproximatelyFinished.Subtract(DateTime.Now);
+    [Newtonsoft.Json.JsonIgnore]public DateTime nextExecution => lastExecuted.Add(reoccurrence);
 
-    [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);
-    
-    [Newtonsoft.Json.JsonIgnore]public DateTime lastChange { get; protected set; }
+    public enum ExecutionState { Waiting, Enqueued, Running }
 
-    public enum ExecutionState
-    {
-        Waiting,
-        Enqueued,
-        Running
-    };
-
-    protected TrangaTask(Task task, TimeSpan reoccurrence)
+    protected TrangaTask(Task task, TimeSpan reoccurrence, TrangaTask? parentTask = null)
     {
         this.reoccurrence = reoccurrence;
         this.lastExecuted = DateTime.Now.Subtract(reoccurrence);
         this.task = task;
-        this.progress = 0f;
         this.executionStarted = DateTime.Now;
-        this.lastChange = DateTime.Now;
-    }
-
-    public float IncrementProgress(float amount)
-    {
-        this.progress += amount;
-        this.lastChange = DateTime.Now;
-        return this.progress;
+        this.lastChange = DateTime.MaxValue;
+        this.taskId = Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes(this.executionStarted.ToString(CultureInfo.InvariantCulture)));
+        this.childTasks = new();
+        this.parentTask = parentTask;
+        this.parentTaskId = parentTask?.taskId;
     }
     
     /// <summary>
@@ -64,28 +53,68 @@ public abstract class TrangaTask
     /// </summary>
     /// <param name="taskManager"></param>
     /// <param name="logger"></param>
-    protected abstract void ExecuteTask(TaskManager taskManager, Logger? logger);
+    /// <param name="cancellationToken"></param>
+    protected abstract void ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null);
 
     /// <summary>
     /// Execute the task
     /// </summary>
     /// <param name="taskManager">Should be the parent taskManager</param>
     /// <param name="logger"></param>
-    public void Execute(TaskManager taskManager, Logger? logger)
+    /// <param name="cancellationToken"></param>
+    public void Execute(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
     {
         logger?.WriteLine(this.GetType().ToString(), $"Executing Task {this}");
         this.state = ExecutionState.Running;
         this.executionStarted = DateTime.Now;
-        ExecuteTask(taskManager, logger);
+        this.lastChange = DateTime.Now;
+        ExecuteTask(taskManager, logger, cancellationToken);
         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()
+    public void ReplaceFailedChildTask(DownloadChapterTask failed, DownloadChapterTask newTask)
     {
-        return nextExecution < DateTime.Now && state is ExecutionState.Waiting;
+        this.RemoveChildTask(failed);
+        this.AddChildTask(newTask);
+    }
+
+    public void AddChildTask(TrangaTask childTask)
+    {
+        this.childTasks.Add(childTask);
+    }
+
+    public void RemoveChildTask(TrangaTask childTask)
+    {
+        this.childTasks.Remove(childTask);
+        this.DecrementProgress(childTask.progress);
+    }
+
+    public void IncrementProgress(double amount)
+    {
+        this.lastChange = DateTime.Now;
+        this.progress += amount / (childTasks.Count > 0 ? childTasks.Count : 1);
+        if (parentTask is not null)
+        {
+            parentTask.IncrementProgress(amount);
+            parentTask.state = ExecutionState.Running;
+        }
+    }
+
+    public void DecrementProgress(double amount)
+    {
+        this.lastChange = DateTime.Now;
+        this.progress -= amount / childTasks.Count > 0 ? childTasks.Count : 1;
+        parentTask?.DecrementProgress(amount);
+    }
+
+    private TimeSpan GetRemainingTime()
+    {
+        if(progress == 0)
+            return DateTime.MaxValue.Subtract(DateTime.Now);
+        TimeSpan elapsed = lastChange.Subtract(executionStarted);
+        return elapsed.Divide(progress).Subtract(elapsed);
     }
 
     public enum Task : byte

Tranga/TrangaTasks/DownloadChapterTask.cs

@@ -9,31 +9,28 @@ public class DownloadChapterTask : TrangaTask
     public Publication publication { get; }
     public string language { get; }
     public Chapter chapter { get; }
-    [JsonIgnore]public DownloadNewChaptersTask? parentTask { get; init; }
-    
-    public DownloadChapterTask(Task task, string connectorName, Publication publication, Chapter chapter, string language = "en", DownloadNewChaptersTask? parentTask = null) : base(task, TimeSpan.Zero)
+
+    public DownloadChapterTask(Task task, string connectorName, Publication publication, Chapter chapter, string language = "en", DownloadNewChaptersTask? parentTask = null) : base(task, TimeSpan.Zero, parentTask)
     {
         this.chapter = chapter;
         this.connectorName = connectorName;
         this.publication = publication;
         this.language = language;
-        this.parentTask = parentTask;
     }
 
-    protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
+    protected override void ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
     {
+        if (cancellationToken?.IsCancellationRequested??false)
+            return;
+        if(this.parentTask is not null)
+            this.parentTask.state = ExecutionState.Running;
         Connector connector = taskManager.GetConnector(this.connectorName);
-        connector.DownloadChapter(this.publication, this.chapter, this);
+        connector.CopyCoverFromCacheToDownloadLocation(this.publication, taskManager.settings);
+        connector.DownloadChapter(this.publication, this.chapter, this, cancellationToken);
+        if(this.parentTask is not null)
+            this.parentTask.state = ExecutionState.Waiting;
         taskManager.DeleteTask(this);
     }
-    
-    public new float IncrementProgress(float amount)
-    {
-        this.progress += amount;
-        this.lastChange = DateTime.Now;
-        parentTask?.IncrementProgress(amount);
-        return this.progress;
-    }
 
     public override string ToString()
     {

Tranga/TrangaTasks/DownloadNewChaptersTask.cs

@@ -8,58 +8,37 @@ public class DownloadNewChaptersTask : TrangaTask
     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;
-        this.lastChange = DateTime.Now;
-        return this.progress;
     }
 
-    protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
+    protected override void ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
     {
+        if (cancellationToken?.IsCancellationRequested??false)
+            return;
         Publication pub = publication!;
         Connector connector = taskManager.GetConnector(this.connectorName);
         
         //Check if Publication already has a Folder
         pub.CreatePublicationFolder(taskManager.settings.downloadLocation);
-        List<Chapter> newChapters = GetNewChaptersList(connector, pub, language!, ref taskManager.chapterCollection);
-        this.childTaskAmount = newChapters.Count;
+        List<Chapter> newChapters = taskManager.GetNewChaptersList(connector, pub, language!);
 
         connector.CopyCoverFromCacheToDownloadLocation(pub, taskManager.settings);
         
         pub.SaveSeriesInfoJson(connector.downloadLocation);
 
         foreach (Chapter newChapter in newChapters)
-            taskManager.AddTask(new DownloadChapterTask(Task.DownloadChapter, this.connectorName!, pub, newChapter, this.language, this));
-    }
-    
-    /// <summary>
-    /// Updates the available Chapters of a Publication
-    /// </summary>
-    /// <param name="connector">Connector to use</param>
-    /// <param name="publication">Publication to check</param>
-    /// <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> 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
-        
-        Chapter[] newChapters = connector.GetChapters(publication, language);
-        newChaptersList = newChapters.Where(nChapter => !connector.CheckChapterIsDownloaded(publication, nChapter)).ToList();
-        
-        return newChaptersList;
+        {
+            DownloadChapterTask newTask = new (Task.DownloadChapter, this.connectorName, pub, newChapter, this.language, this);
+            taskManager.AddTask(newTask);
+            this.childTasks.Add(newTask);
+        }
+        if(newChapters.Count > 0)
+            foreach(NotificationManager nm in taskManager.settings.notificationManagers)
+                nm.SendNotification(pub.sortName, $"Downloading {newChapters.Count} new Chapters.");
     }
 
     public override string ToString()

Tranga/TrangaTasks/UpdateLibrariesTask.cs

@@ -8,10 +8,12 @@ public class UpdateLibrariesTask : TrangaTask
     {
     }
 
-    protected override void ExecuteTask(TaskManager taskManager, Logger? logger)
+    protected override void ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
     {
+        if (cancellationToken?.IsCancellationRequested??false)
+            return;
         foreach(LibraryManager lm in taskManager.settings.libraryManagers)
             lm.UpdateLibrary();
-        this.progress = 1f;
+        IncrementProgress(1);
     }
 }

Website/apiConnector.js

@@ -66,8 +66,8 @@ async function GetPublication(internalId){
     return json;
 }
 
-async function GetChapters(internalId, connectorName, language){
-    var uri = apiUri + `/Publications/GetChapters?internalId=${internalId}&connectorName=${connectorName}&language=${language}`;
+async function GetChapters(internalId, connectorName, onlyNew, language){
+    var uri = apiUri + `/Publications/GetChapters?internalId=${internalId}&connectorName=${connectorName}&onlyNew=${onlyNew}&language=${language}`;
     let json = await GetData(uri);
     return json;
 }
@@ -126,17 +126,33 @@ function EnqueueTask(taskType, connectorName, publicationId){
     PostData(uri);
 }
 
-function UpdateSettings(downloadLocation, komgaUrl, komgaAuth, kavitaUrl, kavitaUser, kavitaPass){
+function UpdateDownloadLocation(downloadLocation){
     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}`;
-    }
+    uri += "&downloadLocation="+downloadLocation;
+    PostData(uri);
+}
+
+function UpdateKomga(komgaUrl, komgaAuth){
+    var uri = apiUri + "/Settings/Update?"
+    uri += `&komgaUrl=${komgaUrl}&komgaAuth=${komgaAuth}`;
+    PostData(uri);
+}
+
+function UpdateKavita(kavitaUrl, kavitaUser, kavitaPass){
+    var uri = apiUri + "/Settings/Update?"
+    uri += `&kavitaUrl=${kavitaUrl}&kavitaUsername=${kavitaUser}&kavitaPassword=${kavitaPass}`;
+    PostData(uri);
+}
+
+function UpdateGotify(gotifyUrl, gotifyAppToken){
+    var uri = apiUri + "/Settings/Update?"
+    uri += `&gotifyUrl=${gotifyUrl}&gotifyAppToken=${gotifyAppToken}`;
+    PostData(uri);
+}
+
+function UpdateLunaSea(lunaseaWebhook){
+    var uri = apiUri + "/Settings/Update?"
+    uri += `&lunaseaWebhook=${lunaseaWebhook}`;
     PostData(uri);
 }
 

Website/index.html

@@ -59,9 +59,9 @@
           <popup-title>Create Task: Monitor Publication</popup-title>
           <popup-content>
             <div>
-              <p>Every</p>
-              <label for="hours">Hours: </label><input id="hours" type="number" value="3" min="0" max="23">
-              <label for="minutes">Minutes: </label><input id="minutes" type="number" value="0" min="0" max="59">
+              <span>Run every</span>
+              <label for="hours"></label><input id="hours" type="number" value="3" min="0" max="23"><span>hours</span>
+              <label for="minutes"></label><input id="minutes" type="number" value="0" min="0" max="59"><span>minutes</span>
               <input type="submit" value="Create" onclick="AddMonitorTask()">
             </div>
           </popup-content>
@@ -133,6 +133,17 @@
               <label for="kavitaUsername"></label><input placeholder="Username" id="kavitaUsername" type="text">
               <label for="kavitaPassword"></label><input placeholder="Password" id="kavitaPassword" type="password">
             </div>
+            <div>
+              <span class="title">Gotify</span>
+              <div>Configured: <span id="gotifyConfigured">✅❌</span></div>
+              <label for="gotifyUrl"></label><input placeholder="URL" id="gotifyUrl" type="text">
+              <label for="gotifyAppToken"></label><input placeholder="App-Token" id="gotifyAppToken" type="text">
+            </div>
+            <div>
+              <span class="title">LunaSea</span>
+              <div>Configured: <span id="lunaseaConfigured">✅❌</span></div>
+              <label for="lunaseaWebhook"></label><input placeholder="Webhook-Url" id="lunaseaWebhook" type="text">
+            </div>
             <div>
               <label for="libraryUpdateTime" style="margin-right: 5px;">Update Time</label><input id="libraryUpdateTime" type="time" value="00:01:00" step="10">
               <input type="submit" value="Update" onclick="UpdateLibrarySettings()">
@@ -140,25 +151,27 @@
           </popup-content>
         </popup-window>
       </popup>
+      
+      <popup id="downloadTasksPopup">
+        <blur-background id="blurBackgroundTasksQueuePopup"></blur-background>
+        <popup-window>
+          <popup-title>Task Progress</popup-title>
+          <popup-content>
+            
+          </popup-content>
+        </popup-window>
+      </popup>
     </viewport>
     <footer>
-      <div>
+      <div onclick="ShowTasksQueue();">
         <img src="media/running.svg" alt="running"><div id="tasksRunningTag">0</div>
       </div>
-      <div>
+      <div onclick="ShowTasksQueue();">
         <img src="media/queue.svg" alt="queue"><div id="tasksQueuedTag">0</div>
       </div>
-      <div>
-        <img src="media/tasks.svg" alt="queue"><div id="totalTasksTag">0</div>
-      </div>
       <p id="madeWith">Made with Blåhaj 🦈</p>
     </footer> 
   </wrapper>
-  <footer-tag-popup>
-    <footer-tag-content>
-      <footer-tag-task-name>Test</footer-tag-task-name>
-    </footer-tag-content>
-  </footer-tag-popup>
   
   <script src="apiConnector.js"></script>
   <script src="interaction.js"></script>

Website/interaction.js

@@ -33,15 +33,19 @@ const settingKomgaPass = document.querySelector("#komgaPassword");
 const settingKavitaUrl = document.querySelector("#kavitaUrl");
 const settingKavitaUser = document.querySelector("#kavitaUsername");
 const settingKavitaPass = document.querySelector("#kavitaPassword");
+const settingGotifyUrl = document.querySelector("#gotifyUrl");
+const settingGotifyAppToken = document.querySelector("#gotifyAppToken");
+const settingLunaseaWebhook = document.querySelector("#lunaseaWebhook");
 const libraryUpdateTime = document.querySelector("#libraryUpdateTime");
 const settingKomgaConfigured = document.querySelector("#komgaConfigured");
 const settingKavitaConfigured = document.querySelector("#kavitaConfigured");
+const settingGotifyConfigured = document.querySelector("#gotifyConfigured");
+const settingLunaseaConfigured = document.querySelector("#lunaseaConfigured");
 const settingApiUri = document.querySelector("#settingApiUri");
 const tagTasksRunning = document.querySelector("#tasksRunningTag");
 const tagTasksQueued = document.querySelector("#tasksQueuedTag");
-const tagTasksTotal = document.querySelector("#totalTasksTag");
-const tagTaskPopup = document.querySelector("footer-tag-popup");
-const tagTasksPopupContent = document.querySelector("footer-tag-content");
+const downloadTasksPopup = document.querySelector("#downloadTasksPopup");
+const downloadTasksOutput = downloadTasksPopup.querySelector("popup-content");
 
 searchbox.addEventListener("keyup", (event) => FilterResults());
 settingsCog.addEventListener("click", () => OpenSettings());
@@ -50,6 +54,7 @@ document.querySelector("#blurBackgroundTaskPopup").addEventListener("click", ()
 document.querySelector("#blurBackgroundPublicationPopup").addEventListener("click", () => HidePublicationPopup());
 document.querySelector("#blurBackgroundCreateMonitorTaskPopup").addEventListener("click", () => createMonitorTaskPopup.style.display = "none");
 document.querySelector("#blurBackgroundCreateDownloadChaptersTask").addEventListener("click", () => createDownloadChaptersTask.style.display = "none");
+document.querySelector("#blurBackgroundTasksQueuePopup").addEventListener("click", () => downloadTasksPopup.style.display = "none");
 selectedChapters.addEventListener("keypress", (event) => {
     if(event.key === "Enter"){
         DownloadChapterTaskClick();
@@ -63,7 +68,7 @@ createMonitorTaskButton.addEventListener("click", () => {
 createDownloadChapterTaskButton.addEventListener("click", () => {
     HidePublicationPopup();
     OpenDownloadChapterTaskPopup();
-})
+});
 publicationTaskStart.addEventListener("click", () => StartTaskClick());
 settingApiUri.addEventListener("keypress", (event) => {
     if(event.key === "Enter"){
@@ -77,12 +82,7 @@ searchPublicationQuery.addEventListener("keypress", (event) => {
         NewSearch();
     }
 });
-tagTasksRunning.addEventListener("mouseover", (event) => ShowRunningTasks(event));
-tagTasksRunning.addEventListener("mouseout", () => CloseTasksPopup());
-tagTasksQueued.addEventListener("mouseover", (event) => ShowQueuedTasks(event));
-tagTasksQueued.addEventListener("mouseout", () => CloseTasksPopup());
-tagTasksTotal.addEventListener("mouseover", (event) => ShowAllTasks(event));
-tagTasksTotal.addEventListener("mouseout", () => CloseTasksPopup());
+
 
 let availableConnectors;
 GetAvailableControllers()
@@ -156,8 +156,10 @@ function AddMonitorTask(){
 }
 
 function OpenDownloadChapterTaskPopup(){
+    selectedChapters.value = "";
+    chapterOutput.replaceChildren();
     createDownloadChaptersTask.style.display = "block";
-    GetChapters(toEditId, connectorSelect.value, "en").then((json) => {
+    GetChapters(toEditId, connectorSelect.value, true, "en").then((json) => {
         var i = 0;
         json.forEach(chapter => {
             var chapterDom = document.createElement("div");
@@ -236,7 +238,7 @@ function ShowPublicationViewerWindow(publicationId, event, add){
     publicationViewerName.innerText = publication.sortName;
     publicationViewerTags.innerText = publication.tags.join(", ");
     publicationViewerDescription.innerText = publication.description;
-    publicationViewerAuthor.innerText = publication.author;
+    publicationViewerAuthor.innerText = publication.authors.join(',');
     pubviewcover.src = `imageCache/${publication.coverFileNameInCache}`;
     toEditId = publicationId;
     
@@ -261,6 +263,7 @@ function HidePublicationPopup(){
 
 function ShowNewTaskWindow(){
     selectPublication.replaceChildren();
+    searchPublicationQuery.value = "";
     selectPublicationPopup.style.display = "flex";
 }
 
@@ -281,17 +284,21 @@ function OpenSettings(){
     settingsPopup.style.display = "flex";
 }
 
-
 function GetSettingsClick(){
     settingApiUri.value = "";
     settingKomgaUrl.value = "";
     settingKomgaUser.value = "";
     settingKomgaPass.value = "";
+    settingKomgaConfigured.innerText = "❌";
     settingKavitaUrl.value = "";
     settingKavitaUser.value = "";
     settingKavitaPass.value = "";
-    settingKomgaConfigured.innerText = "❌";
     settingKavitaConfigured.innerText = "❌";
+    settingGotifyUrl.value = "";
+    settingGotifyAppToken.value = "";
+    settingGotifyConfigured.innerText = "❌";
+    settingLunaseaWebhook.value = "";
+    settingLunaseaConfigured.innerText = "❌";
     
     settingApiUri.placeholder = apiUri;
     
@@ -310,6 +317,13 @@ function GetSettingsClick(){
                settingKavitaConfigured.innerText = "✅";
            }
         });
+        json.notificationManagers.forEach(nm => {
+           if(nm.notificationManagerType == 0){
+               settingGotifyConfigured.innerText = "✅";
+           } else if(nm.notificationManagerType == 1){
+               settingLunaseaConfigured.innerText = "✅";
+           }
+        });
     });
     
     GetKomgaTask().then(json => {
@@ -319,19 +333,24 @@ function GetSettingsClick(){
 }
 
 function UpdateLibrarySettings(){
-    if(settingKomgaUser.value != "" && settingKomgaPass != ""){
+    if(settingKomgaUrl.value != "" && settingKomgaUser.value != "" && settingKomgaPass != ""){
         var auth = utf8_to_b64(`${settingKomgaUser.value}:${settingKomgaPass.value}`);
         console.log(auth);
-
-        if(settingKomgaUrl.value != "")
-            UpdateSettings("", settingKomgaUrl.value, auth, "", "");
-        else
-            UpdateSettings("", settingKomgaUrl.placeholder, auth, "", "");
+        UpdateKomga(settingKomgaUrl.value, auth);
     }
     
     if(settingKavitaUrl.value != "" && settingKavitaUser.value != "" && settingKavitaPass.value != ""){
-        UpdateSettings("", "", "", settingKavitaUrl.value, settingKavitaUser.value, settingKavitaPass.value);
+        UpdateKavita(settingKavitaUrl.value, settingKavitaUser.value, settingKavitaPass.value);
     }
+    
+    if(settingGotifyUrl.value != "" && settingGotifyAppToken.value != ""){
+        UpdateGotify(settingGotifyUrl.value, settingGotifyAppToken.value);
+    }
+    
+    if(settingLunaseaWebhook.value != ""){
+        UpdateLunaSea(settingLunaseaWebhook.value);
+    }
+    
     CreateUpdateLibraryTask(libraryUpdateTime.value);
     setTimeout(() => GetSettingsClick(), 200);
 }
@@ -340,66 +359,6 @@ function utf8_to_b64( str ) {
     return window.btoa(unescape(encodeURIComponent( str )));
 }
 
-
-function ShowRunningTasks(event){
-    GetRunningTasks()
-        .then(json => {
-            tagTasksPopupContent.replaceChildren();
-            json.forEach(task => {
-                if(task.publication != null){
-                    var taskname = document.createElement("footer-tag-task-name");
-                    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);
-                }
-            });
-            if(tagTasksPopupContent.children.length > 0){
-                tagTaskPopup.style.display = "block";
-                tagTaskPopup.style.left = `${tagTasksRunning.offsetLeft - 20}px`;
-            }
-        });
-}
-
-function ShowQueuedTasks(event){
-    GetQueue()
-        .then(json => {
-            tagTasksPopupContent.replaceChildren();
-            json.forEach(task => {
-                var taskname = document.createElement("footer-tag-task-name");
-                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){
-                tagTaskPopup.style.display = "block";
-                tagTaskPopup.style.left = `${tagTasksQueued.offsetLeft- 20}px`;
-            }
-        });
-}
-function ShowAllTasks(event){
-    GetDownloadTasks()
-        .then(json => {
-            tagTasksPopupContent.replaceChildren();
-            json.forEach(task => {
-                var taskname = document.createElement("footer-tag-task-name");
-                taskname.innerText = task.publication.sortName;
-                tagTasksPopupContent.appendChild(taskname);
-            });
-            if(json.length > 0){
-                tagTaskPopup.style.display = "block";
-                tagTaskPopup.style.left = `${tagTasksTotal.offsetLeft - 20}px`;
-            }
-        });
-}
-
-function CloseTasksPopup(){
-    tagTaskPopup.style.display = "none";
-}
-
 function FilterResults(){
     if(searchBox.value.length > 0){
         tasksContent.childNodes.forEach(publication => {
@@ -420,12 +379,77 @@ function FilterResults(){
     }else{
         tasksContent.childNodes.forEach(publication => publication.style.display = "initial");
     }
+}
+
+function ShowTasksQueue(){
+
+    downloadTasksOutput.replaceChildren();
+    GetRunningTasks()
+        .then(json => {
+            tagTasksRunning.innerText = json.length;
+            json.forEach(task => {
+                if(task.task == 2 || task.task == 4) {
+                    downloadTasksOutput.appendChild(CreateProgressChild(task));
+                    document.querySelector(`#progress${task.taskId.replaceAll('=', '')}`).value = task.progress;
+                    var finishedHours = task.executionApproximatelyRemaining.split(':')[0];
+                    var finishedMinutes = task.executionApproximatelyRemaining.split(':')[1];
+                    var finishedSeconds = task.executionApproximatelyRemaining.split(':')[2].split('.')[0];
+                    document.querySelector(`#progressStr${task.taskId.replaceAll('=', '')}`).innerText = `${finishedHours}:${finishedMinutes}:${finishedSeconds}`;
+                }
+            });
+        });
+
+    GetQueue()
+        .then(json => {
+            tagTasksQueued.innerText = json.length;
+            json.forEach(task => {
+                downloadTasksOutput.appendChild(CreateProgressChild(task));
+            });
+        });
+    downloadTasksPopup.style.display = "flex";
+}
+
+function CreateProgressChild(task){
+    var child = document.createElement("div");
+    var img = document.createElement('img');
+    img.src = `imageCache/${task.publication.coverFileNameInCache}`;
+    child.appendChild(img);
+    
+    var name = document.createElement("span");
+    name.innerText = task.publication.sortName;
+    name.className = "pubTitle";
+    child.appendChild(name);
+
+
+    var progress = document.createElement("progress");
+    progress.id = `progress${task.taskId.replaceAll('=','')}`;
+    child.appendChild(progress);
+    
+    var progressStr = document.createElement("span");
+    progressStr.innerText = " \t∞";
+    progressStr.className = "progressStr";
+    progressStr.id = `progressStr${task.taskId.replaceAll('=','')}`;
+    child.appendChild(progressStr);
+    
+    if(task.chapter != undefined){
+        var chapterNumber = document.createElement("span");
+        chapterNumber.className = "chapterNumber";
+        chapterNumber.innerText = `Vol.${task.chapter.volumeNumber} Ch.${task.chapter.chapterNumber}`;
+        child.appendChild(chapterNumber);
+        
+        var chapterName = document.createElement("span");
+        chapterName.className = "chapterName";
+        chapterName.innerText = task.chapter.name;
+        child.appendChild(chapterName);
+    }
     
     
+    return child;
 }
 
 //Resets the tasks shown
 ResetContent();
+downloadTasksOutput.replaceChildren();
 //Get Tasks and show them
 GetDownloadTasks()
     .then(json => json.forEach(task => {
@@ -438,16 +462,17 @@ GetDownloadTasks()
 GetRunningTasks()
     .then(json => {
         tagTasksRunning.innerText = json.length;
-    });
-
-GetDownloadTasks()
-    .then(json => {
-        tagTasksTotal.innerText = json.length;
+        json.forEach(task => {
+            downloadTasksOutput.appendChild(CreateProgressChild(task));
+        });
     });
 
 GetQueue()
     .then(json => {
         tagTasksQueued.innerText = json.length;
+        json.forEach(task => {
+            downloadTasksOutput.appendChild(CreateProgressChild(task));
+        });
     })
 
 setInterval(() => {
@@ -476,15 +501,23 @@ setInterval(() => {
         .then(json => {
            tagTasksRunning.innerText = json.length;
         });
-
-    GetDownloadTasks()
-        .then(json => {
-            tagTasksTotal.innerText = json.length;
-        });
     
     GetQueue()
         .then(json => {
             tagTasksQueued.innerText = json.length;
-        })
-    
-}, 1000);
+        });
+}, 1000);
+
+setInterval(() => {
+    GetRunningTasks().then((json) => {
+        json.forEach(task => {
+            if(task.task == 2 || task.task == 4){
+                document.querySelector(`#progress${task.taskId.replaceAll('=','')}`).value = task.progress;
+                var finishedHours = task.executionApproximatelyRemaining.split(':')[0];
+                var finishedMinutes = task.executionApproximatelyRemaining.split(':')[1];
+                var finishedSeconds = task.executionApproximatelyRemaining.split(':')[2].split('.')[0];
+                document.querySelector(`#progressStr${task.taskId.replaceAll('=','')}`).innerText = `${finishedHours}:${finishedMinutes}:${finishedSeconds}`;
+            }
+        });
+    });
+},500);

Website/style.css

@@ -323,12 +323,15 @@ popup popup-window popup-content input, select {
     z-index: 9;
 }
 
+#createMonitorTaskPopup input[type="number"] {
+    width: 40px;
+}
+
 #createDownloadChaptersTask popup-content {
     flex-direction: column;
     align-items: start;
 }
 
-
 #createDownloadChaptersTask popup-content > * {
     margin: 3px 0;
 }
@@ -365,6 +368,77 @@ popup popup-window popup-content input, select {
     width: 60px;
 }
 
+#downloadTasksPopup popup-window {
+    left: 0;
+    top: 80px;
+    margin: 0 0 0 10px;
+    height: calc(100vh - 140px);
+    width: 400px;
+    max-width: 95vw;
+    overflow-y: scroll;
+}
+
+#downloadTasksPopup popup-content {
+    flex-direction: column;
+    align-items: start;
+    margin: 5px;
+}
+
+#downloadTasksPopup popup-content > div {
+    display: block;
+    height: 80px;
+    position: relative;
+    margin: 5px 0;
+}
+
+#downloadTasksPopup popup-content > div > img {
+    display: block;
+    position: absolute;
+    height: 100%;
+    width: 60px;
+    left: 0;
+    top: 0;
+    object-fit: cover;
+    border-radius: 4px;
+}
+
+#downloadTasksPopup popup-content > div > span {
+    display: block;
+    position: absolute;
+    width: max-content;
+}
+
+#downloadTasksPopup popup-content > div > .pubTitle {
+    left: 70px;
+    top: 0;
+}
+
+#downloadTasksPopup popup-content > div > .chapterName {
+    left: 70px;
+    top: 28pt;
+}
+
+#downloadTasksPopup popup-content > div > .chapterNumber {
+    left: 70px;
+    top: 14pt;
+}
+
+#downloadTasksPopup popup-content > div > progress {
+    display: block;
+    position: absolute;
+    left: 150px;
+    bottom: 0;
+    width: 200px;
+}
+
+#downloadTasksPopup popup-content > div > .progressStr {
+    display: block;
+    position: absolute;
+    left: 70px;
+    bottom: 0;
+    width: 70px;
+}
+
 blur-background {
     width: 100%;
     height: 100%;
@@ -380,6 +454,8 @@ blur-background {
     flex-wrap: wrap;
     justify-content: start;
     align-content: start;
+    max-height: 70vh;
+    overflow-y: scroll;
 }
 
 #publicationViewerPopup{