Using HttpStatusCode to signify Task-Success

When DownloadChapterTask returns notfound, do not retry.

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);
@@ -32,6 +32,8 @@ logger.WriteLine("Tranga",$"Image-Cache-Path: {settings.coverImageCache}");
 
 logger.WriteLine("Tranga", "Loading Taskmanager.");
 TaskManager taskManager = new (settings, logger);
+foreach(NotificationManager nm in taskManager.settings.notificationManagers)
+    nm.SendNotification("Tranga-API", "Started Tranga-API");
 
 var builder = WebApplication.CreateBuilder(args);
 builder.Services.AddEndpointsApiExplorer();
@@ -75,15 +77,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)));
@@ -99,14 +112,12 @@ app.MapPost("/Tasks/CreateMonitorTask",
         Publication? publication = taskManager.GetAllPublications().FirstOrDefault(pub => pub.internalId == internalId);
         if (publication is null)
             return;
-        taskManager.AddTask(new DownloadNewChaptersTask(TrangaTask.Task.DownloadNewChapters, connectorName,
-            (Publication)publication,
-            TimeSpan.Parse(reoccurrenceTime), language ?? "en"));
+        taskManager.AddTask(new MonitorPublicationTask(connectorName, (Publication)publication, TimeSpan.Parse(reoccurrenceTime), language ?? "en"));
     });
 
 app.MapPost("/Tasks/CreateUpdateLibraryTask", (string reoccurrenceTime) =>
 {
-    taskManager.AddTask(new UpdateLibrariesTask(TrangaTask.Task.UpdateLibraries, TimeSpan.Parse(reoccurrenceTime)));
+    taskManager.AddTask(new UpdateLibrariesTask(TimeSpan.Parse(reoccurrenceTime)));
 });
 
 app.MapPost("/Tasks/CreateDownloadChaptersTask", (string connectorName, string internalId, string chapters, string? language) => {
@@ -121,14 +132,14 @@ app.MapPost("/Tasks/CreateDownloadChaptersTask", (string connectorName, string i
     
     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, chapter, "en"));
+        taskManager.AddTask(new DownloadChapterTask(connectorName, (Publication)publication, chapter, "en"));
 });
 
 app.MapDelete("/Tasks/Delete", (string taskType, string? connectorName, string? publicationId) =>
 {
     TrangaTask.Task task = Enum.Parse<TrangaTask.Task>(taskType);
-    taskManager.DeleteTask(task, connectorName, publicationId);
+    foreach(TrangaTask tTask in taskManager.GetTasksMatching(task, connectorName, internalId: publicationId))
+        taskManager.DeleteTask(tTask);
 });
 
 app.MapGet("/Tasks/Get", (string taskType, string? connectorName, string? searchString) =>
@@ -154,7 +165,7 @@ app.MapGet("/Tasks/GetProgress", (string taskType, string connectorName, string
     {
         TrangaTask? task = null;
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
-        if (pTask is TrangaTask.Task.DownloadNewChapters)
+        if (pTask is TrangaTask.Task.MonitorPublication)
         {
             task = taskManager.GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId).FirstOrDefault();
         }else if (pTask is TrangaTask.Task.DownloadChapter && chapterSortNumber is not null)
@@ -179,7 +190,7 @@ app.MapPost("/Tasks/Start", (string taskType, string? connectorName, string? int
     {
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
         TrangaTask? task = taskManager
-            .GetTasksMatching(pTask, connectorName: connectorName, internalId: internalId)?.FirstOrDefault();
+            .GetTasksMatching(pTask, connectorName: connectorName, internalId: internalId).FirstOrDefault();
             
         if (task is null)
             return;
@@ -204,7 +215,7 @@ app.MapPost("/Queue/Enqueue", (string taskType, string? connectorName, string? p
     {
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
         TrangaTask? task = taskManager
-            .GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId)?.First();
+            .GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId).FirstOrDefault();
             
         if (task is null)
             return;
@@ -222,7 +233,7 @@ app.MapDelete("/Queue/Dequeue", (string taskType, string? connectorName, string?
     {
         TrangaTask.Task pTask = Enum.Parse<TrangaTask.Task>(taskType);
         TrangaTask? task = taskManager
-            .GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId)?.First();
+            .GetTasksMatching(pTask, connectorName: connectorName, internalId: publicationId).FirstOrDefault();
             
         if (task is null)
             return;
@@ -237,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);
     }
 
@@ -320,8 +335,9 @@ public static class Tranga_Cli
         
         TimeSpan reoccurrence = SelectReoccurrence(logger);
         logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
-        TrangaTask? newTask = taskManager.AddTask(TrangaTask.Task.DownloadNewChapters, connector.name, publication.Value.publicationId, reoccurrence, "en");
-        Console.WriteLine(newTask);
+        TrangaTask nTask = new MonitorPublicationTask(connector.name, (Publication)publication, reoccurrence, "en");
+        taskManager.AddTask(nTask);
+        Console.WriteLine(nTask);
     }
 
     private static void AddTaskToQueue(TaskManager taskManager, Logger logger)
@@ -393,20 +409,19 @@ public static class Tranga_Cli
                 return;
         }
 
-        if (task is TrangaTask.Task.DownloadNewChapters)
+        if (task is TrangaTask.Task.MonitorPublication)
         {
             TimeSpan reoccurrence = SelectReoccurrence(logger);
             logger.WriteLine("Tranga_CLI", "Sending Task to TaskManager");
 
-            TrangaTask newTask = new DownloadNewChaptersTask(TrangaTask.Task.DownloadNewChapters, connector!.name, (Publication)publication!, reoccurrence, "en");
+            TrangaTask newTask = new MonitorPublicationTask(connector!.name, (Publication)publication!, reoccurrence, "en");
             taskManager.AddTask(newTask);
             Console.WriteLine(newTask);
         }else if (task is TrangaTask.Task.DownloadChapter)
         {
             foreach (Chapter chapter in SelectChapters(connector!, (Publication)publication!, logger))
             {
-                TrangaTask newTask = new DownloadChapterTask(TrangaTask.Task.DownloadChapter, connector!.name,
-                    (Publication)publication!, chapter, "en");
+                TrangaTask newTask = new DownloadChapterTask(connector!.name, (Publication)publication, chapter, "en");
                 taskManager.AddTask(newTask);
                 Console.WriteLine(newTask);
             }

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

@@ -20,7 +20,7 @@ public abstract class Connector
 
     protected readonly Logger? logger;
 
-    protected readonly string imageCachePath;
+    private readonly string _imageCachePath;
 
     protected Connector(string downloadLocation, string imageCachePath, Logger? logger)
     {
@@ -30,9 +30,9 @@ public abstract class Connector
         {
             //RequestTypes for RateLimits
         }, logger);
-        this.imageCachePath = imageCachePath;
+        this._imageCachePath = imageCachePath;
         if (!Directory.Exists(imageCachePath))
-            Directory.CreateDirectory(this.imageCachePath);
+            Directory.CreateDirectory(this._imageCachePath);
     }
     
     public abstract string name { get; } //Name of the Connector (e.g. Website)
@@ -82,10 +82,13 @@ public abstract class Connector
                                                       Convert.ToInt32(aCh.volumeNumber) >= start &&
                                                       Convert.ToInt32(aCh.volumeNumber) <= end).ToArray();
             }
-            else if(singleResultRegex.IsMatch(volume))
+            else if (singleResultRegex.IsMatch(volume))
+            {
+                string volumeNumber = singleResultRegex.Match(volume).Value;
                 return availableChapters.Where(aCh =>
                     aCh.volumeNumber is not null &&
-                    aCh.volumeNumber.Equals(volume, StringComparison.InvariantCultureIgnoreCase)).ToArray();
+                    aCh.volumeNumber.Equals(volumeNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
+            }
 
         }
         else if (chapterRegex.IsMatch(searchTerm))
@@ -100,10 +103,13 @@ public abstract class Connector
                                                       Convert.ToInt32(aCh.chapterNumber) >= start &&
                                                       Convert.ToInt32(aCh.chapterNumber) <= end).ToArray();
             }
-            else if(singleResultRegex.IsMatch(chapter))
+            else if (singleResultRegex.IsMatch(chapter))
+            {
+                string chapterNumber = singleResultRegex.Match(chapter).Value;
                 return availableChapters.Where(aCh =>
                     aCh.chapterNumber is not null &&
-                    aCh.chapterNumber.Equals(chapter, StringComparison.InvariantCultureIgnoreCase)).ToArray();
+                    aCh.chapterNumber.Equals(chapterNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
+            }
         }
         else
         {
@@ -128,7 +134,7 @@ public abstract class Connector
     /// <param name="chapter">Chapter with Images to retrieve</param>
     /// <param name="parentTask">Will be used for progress-tracking</param>
     /// <param name="cancellationToken"></param>
-    public abstract void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null);
+    public abstract HttpStatusCode DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null);
 
     /// <summary>
     /// Copies the already downloaded cover from cache to downloadLocation
@@ -137,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;
@@ -207,16 +213,15 @@ public abstract class Connector
     /// <param name="fullPath"></param>
     /// <param name="requestType">RequestType for Rate-Limit</param>
     /// <param name="referrer">referrer used in html request header</param>
-    private void DownloadImage(string imageUrl, string fullPath, byte requestType, string? referrer = null)
+    private HttpStatusCode DownloadImage(string imageUrl, string fullPath, byte requestType, string? referrer = null)
     {
         DownloadClient.RequestResult requestResult = downloadClient.MakeRequest(imageUrl, requestType, referrer);
-        if (requestResult.result != Stream.Null)
-        {
-            byte[] buffer = new byte[requestResult.result.Length];
-            requestResult.result.ReadExactly(buffer, 0, buffer.Length);
-            File.WriteAllBytes(fullPath, buffer);
-        }else
-            logger?.WriteLine(this.GetType().ToString(), "No Stream-Content in result.");
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 || requestResult.result == Stream.Null)
+            return requestResult.statusCode;
+        byte[] buffer = new byte[requestResult.result.Length];
+        requestResult.result.ReadExactly(buffer, 0, buffer.Length);
+        File.WriteAllBytes(fullPath, buffer);
+        return requestResult.statusCode;
     }
 
     /// <summary>
@@ -228,10 +233,11 @@ 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, CancellationToken? cancellationToken = null)
+    /// <param name="cancellationToken"></param>
+    protected HttpStatusCode DownloadChapterImages(string[] imageUrls, string saveArchiveFilePath, byte requestType, DownloadChapterTask parentTask, string? comicInfoPath = null, string? referrer = null, CancellationToken? cancellationToken = null)
     {
-        if (cancellationToken?.IsCancellationRequested??false)
-            return;
+        if (cancellationToken?.IsCancellationRequested ?? false)
+            return HttpStatusCode.RequestTimeout;
         logger?.WriteLine("Connector", $"Downloading Images for {saveArchiveFilePath}");
         //Check if Publication Directory already exists
         string directoryPath = Path.GetDirectoryName(saveArchiveFilePath)!;
@@ -239,7 +245,7 @@ public abstract class Connector
             Directory.CreateDirectory(directoryPath);
 
         if (File.Exists(saveArchiveFilePath)) //Don't download twice.
-            return;
+            return HttpStatusCode.OK;
         
         //Create a temporary folder to store images
         string tempFolder = Directory.CreateTempSubdirectory().FullName;
@@ -251,10 +257,12 @@ public abstract class Connector
             string[] split = imageUrl.Split('.');
             string extension = split[^1];
             logger?.WriteLine("Connector", $"Downloading Image {chapter + 1:000}/{imageUrls.Length:000} {parentTask.publication.sortName} {parentTask.publication.internalId} Vol.{parentTask.chapter.volumeNumber} Ch.{parentTask.chapter.chapterNumber} {parentTask.progress:P2}");
-            DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer);
+            HttpStatusCode status = DownloadImage(imageUrl, Path.Join(tempFolder, $"{chapter++}.{extension}"), requestType, referrer);
+            if ((int)status < 200 || (int)status >= 300)
+                return status;
             parentTask.IncrementProgress(1.0 / imageUrls.Length);
-            if (cancellationToken?.IsCancellationRequested??false)
-                return;
+            if (cancellationToken?.IsCancellationRequested ?? false)
+                return HttpStatusCode.RequestTimeout;
         }
         
         if(comicInfoPath is not null)
@@ -266,13 +274,14 @@ public abstract class Connector
         if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             File.SetUnixFileMode(saveArchiveFilePath, GroupRead | GroupWrite | OtherRead | OtherWrite | UserRead | UserWrite);
         Directory.Delete(tempFolder, true); //Cleanup
+        return HttpStatusCode.OK;
     }
     
     protected string SaveCoverImageToCache(string url, byte requestType)
     {
         string[] split = url.Split('/');
         string filename = split[^1];
-        string saveImagePath = Path.Join(imageCachePath, filename);
+        string saveImagePath = Path.Join(_imageCachePath, filename);
 
         if (File.Exists(saveImagePath))
             return filename;
@@ -287,11 +296,15 @@ public abstract class Connector
     
     protected class DownloadClient
     {
-        private static readonly HttpClient Client = new();
+        private static readonly HttpClient Client = new()
+        {
+            Timeout = TimeSpan.FromSeconds(60)
+        };
 
         private readonly Dictionary<byte, DateTime> _lastExecutedRateLimit;
         private readonly Dictionary<byte, TimeSpan> _rateLimit;
-        private Logger? logger;
+        // ReSharper disable once InconsistentNaming
+        private readonly Logger? logger;
 
         /// <summary>
         /// Creates a httpClient
@@ -348,10 +361,12 @@ public abstract class Connector
                     Thread.Sleep(_rateLimit[requestType] * 2);
                 }
             }
-            Stream resultString = response.IsSuccessStatusCode ? response.Content.ReadAsStream() : Stream.Null;
             if (!response.IsSuccessStatusCode)
+            {
                 logger?.WriteLine(this.GetType().ToString(), $"Request-Error {response.StatusCode}: {response.ReasonPhrase}");
-            return new RequestResult(response.StatusCode, resultString);
+                return new RequestResult(response.StatusCode, Stream.Null);
+            }
+            return new RequestResult(response.StatusCode, response.Content.ReadAsStream());
         }
 
         public struct RequestResult

Tranga/Connectors/MangaDex.cs

@@ -46,7 +46,7 @@ public class MangaDex : Connector
             DownloadClient.RequestResult requestResult =
                 downloadClient.MakeRequest(
                     $"https://api.mangadex.org/manga?limit={limit}&title={publicationTitle}&offset={offset}", (byte)RequestType.Manga);
-            if (requestResult.statusCode != HttpStatusCode.OK)
+            if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
                 break;
             JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
             
@@ -98,7 +98,7 @@ public class MangaDex : Connector
                 {
                     JsonArray relationships = manga["relationships"]!.AsArray();
                     posterId = relationships.FirstOrDefault(relationship => relationship!["type"]!.GetValue<string>() == "cover_art")!["id"]!.GetValue<string>();
-                    foreach (JsonNode node in relationships.Where(relationship =>
+                    foreach (JsonNode? node in relationships.Where(relationship =>
                                  relationship!["type"]!.GetValue<string>() == "author"))
                         authorIds.Add(node!["id"]!.GetValue<string>());
                 }
@@ -165,7 +165,7 @@ public class MangaDex : Connector
             DownloadClient.RequestResult requestResult =
                 downloadClient.MakeRequest(
                     $"https://api.mangadex.org/manga/{publication.publicationId}/feed?limit={limit}&offset={offset}&translatedLanguage%5B%5D={language}", (byte)RequestType.Feed);
-            if (requestResult.statusCode != HttpStatusCode.OK)
+            if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
                 break;
             JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
             
@@ -207,19 +207,19 @@ public class MangaDex : Connector
         return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
     }
 
-    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
+    public override HttpStatusCode DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
     {
-        if (cancellationToken?.IsCancellationRequested??false)
-            return;
+        if (cancellationToken?.IsCancellationRequested ?? false)
+            return HttpStatusCode.RequestTimeout;
         logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
         //Request URLs for Chapter-Images
         DownloadClient.RequestResult requestResult =
             downloadClient.MakeRequest($"https://api.mangadex.org/at-home/server/{chapter.url}?forcePort443=false'", (byte)RequestType.AtHomeServer);
-        if (requestResult.statusCode != HttpStatusCode.OK)
-            return;
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
+            return requestResult.statusCode;
         JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
         if (result is null)
-            return;
+            return HttpStatusCode.NoContent;
 
         string baseUrl = result["baseUrl"]!.GetValue<string>();
         string hash = result["chapter"]!["hash"]!.GetValue<string>();
@@ -233,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, cancellationToken:cancellationToken);
+        return DownloadChapterImages(imageUrls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)RequestType.AtHomeServer, parentTask, comicInfoPath, cancellationToken:cancellationToken);
     }
 
     private string? GetCoverUrl(string publicationId, string? posterId)
@@ -248,7 +248,7 @@ public class MangaDex : Connector
         //Request information where to download Cover
         DownloadClient.RequestResult requestResult =
             downloadClient.MakeRequest($"https://api.mangadex.org/cover/{posterId}", (byte)RequestType.CoverUrl);
-        if (requestResult.statusCode != HttpStatusCode.OK)
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
             return null;
         JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
         if (result is null)
@@ -268,7 +268,7 @@ public class MangaDex : Connector
         {
             DownloadClient.RequestResult requestResult =
                 downloadClient.MakeRequest($"https://api.mangadex.org/author/{authorId}", (byte)RequestType.Author);
-            if (requestResult.statusCode != HttpStatusCode.OK)
+            if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
                 return ret;
             JsonObject? result = JsonSerializer.Deserialize<JsonObject>(requestResult.result);
             if (result is null)

Tranga/Connectors/Manganato.cs

@@ -27,7 +27,7 @@ public class Manganato : Connector
         string requestUrl = $"https://manganato.com/search/story/{sanitizedTitle}";
         DownloadClient.RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, (byte)1);
-        if (requestResult.statusCode != HttpStatusCode.OK)
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
             return Array.Empty<Publication>();
 
         return ParsePublicationsFromHtml(requestResult.result);
@@ -52,7 +52,7 @@ public class Manganato : Connector
         {
             DownloadClient.RequestResult requestResult =
                 downloadClient.MakeRequest(url, (byte)1);
-            if (requestResult.statusCode != HttpStatusCode.OK)
+            if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
                 return Array.Empty<Publication>();
 
             ret.Add(ParseSinglePublicationFromHtml(requestResult.result, url.Split('/')[^1]));
@@ -131,7 +131,7 @@ public class Manganato : Connector
         string requestUrl = $"https://chapmanganato.com/{publication.publicationId}";
         DownloadClient.RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, (byte)1);
-        if (requestResult.statusCode != HttpStatusCode.OK)
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
             return Array.Empty<Chapter>();
         
         //Return Chapters ordered by Chapter-Number
@@ -169,23 +169,23 @@ public class Manganato : Connector
         return ret;
     }
 
-    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
+    public override HttpStatusCode DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
     {
-        if (cancellationToken?.IsCancellationRequested??false)
-            return;
+        if (cancellationToken?.IsCancellationRequested ?? false)
+            return HttpStatusCode.RequestTimeout;
         logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
         string requestUrl = chapter.url;
         DownloadClient.RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, (byte)1);
-        if (requestResult.statusCode != HttpStatusCode.OK)
-            return;
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
+            return requestResult.statusCode;
 
         string[] imageUrls = ParseImageUrlsFromHtml(requestResult.result);
         
         string comicInfoPath = Path.GetTempFileName();
         File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
         
-        DownloadChapterImages(imageUrls, GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, "https://chapmanganato.com/", cancellationToken);
+        return DownloadChapterImages(imageUrls, GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, "https://chapmanganato.com/", cancellationToken);
     }
 
     private string[] ParseImageUrlsFromHtml(Stream html)

Tranga/Connectors/Mangasee.cs

@@ -14,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)
@@ -80,7 +80,7 @@ public class Mangasee : Connector
         string requestUrl = $"https://mangasee123.com/_search.php";
         DownloadClient.RequestResult requestResult =
             downloadClient.MakeRequest(requestUrl, (byte)1);
-        if (requestResult.statusCode != HttpStatusCode.OK)
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
             return Array.Empty<Publication>();
 
         return ParsePublicationsFromHtml(requestResult.result, publicationTitle);
@@ -110,7 +110,7 @@ public class Mangasee : Connector
         {
             DownloadClient.RequestResult requestResult =
                 downloadClient.MakeRequest($"https://mangasee123.com/manga/{orderedItem.i}", (byte)1);
-            if (requestResult.statusCode != HttpStatusCode.OK)
+            if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
                 return Array.Empty<Publication>();
             ret.Add(ParseSinglePublicationFromHtml(requestResult.result, orderedItem.s, orderedItem.i, orderedItem.a));
         }
@@ -209,17 +209,17 @@ public class Mangasee : Connector
         return ret.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
     }
 
-    public override void DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
+    public override HttpStatusCode DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
     {
-        if (cancellationToken?.IsCancellationRequested??false)
-            return;
+        if (cancellationToken?.IsCancellationRequested ?? false)
+            return HttpStatusCode.RequestTimeout;
         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;
+            return HttpStatusCode.RequestTimeout;
         
         logger?.WriteLine(this.GetType().ToString(), $"Downloading Chapter-Info {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
         IPage page = _browser!.NewPageAsync().Result;
@@ -238,7 +238,8 @@ 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, cancellationToken:cancellationToken);
+            return DownloadChapterImages(urls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, cancellationToken:cancellationToken);
         }
+        return response.Status;
     }
 }

Tranga/LibraryManager.cs

@@ -23,6 +23,7 @@ public abstract class LibraryManager
     /// <param name="baseUrl">Base-URL of Komga instance, no trailing slashes(/)</param>
     /// <param name="auth">Base64 string of username and password (username):(password)</param>
     /// <param name="logger"></param>
+    /// <param name="libraryType"></param>
     protected LibraryManager(string baseUrl, string auth, Logger? logger, LibraryType libraryType)
     {
         this.baseUrl = baseUrl;

Tranga/NotificationManager.cs

@@ -0,0 +1,52 @@
+using Logging;
+using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
+using Tranga.NotificationManagers;
+
+namespace Tranga;
+
+public abstract class NotificationManager
+{
+    protected readonly Logger? logger;
+    public NotificationManagerType notificationManagerType;
+
+    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)!;
+            else if (jo["notificationManagerType"]!.Value<byte>() == (byte)NotificationManagerType.LunaSea)
+                return jo.ToObject<LunaSea>(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 = 4;
+        }
+    }
+}

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/TaskManager.cs

@@ -1,7 +1,6 @@
 using Logging;
 using Newtonsoft.Json;
 using Tranga.Connectors;
-using Tranga.LibraryManagers;
 using Tranga.TrangaTasks;
 
 namespace Tranga;
@@ -21,46 +20,6 @@ public class TaskManager
 
     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="logger"></param>
-    public TaskManager(string downloadFolderPath, string workingDirectory, string imageCachePath, HashSet<LibraryManager> libraryManagers, Logger? logger = null)
-    {
-        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)
     {
         this.logger = logger;
@@ -85,67 +44,64 @@ public class TaskManager
     private void TaskCheckerThread()
     {
         logger?.WriteLine(this.GetType().ToString(), "Starting TaskCheckerThread.");
-        int allTasksWaitingLength = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
+        int waitingTasksCount = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
         while (_continueRunning)
         {
-            TrangaTask[] tmp = _allTasks.Where(taskQuery =>
-                    taskQuery.nextExecution < DateTime.Now &&
-                    taskQuery.state is TrangaTask.ExecutionState.Waiting or TrangaTask.ExecutionState.Enqueued)
-                .OrderBy(tmpTask => tmpTask.nextExecution).ToArray();
-            foreach (TrangaTask task in tmp)
+            foreach (TrangaTask waitingButExecute in _allTasks.Where(taskQuery =>
+                         taskQuery.nextExecution < DateTime.Now &&
+                         taskQuery.state is TrangaTask.ExecutionState.Waiting))
             {
-                task.state = TrangaTask.ExecutionState.Enqueued;
-                switch (task.task)
+                waitingButExecute.state = TrangaTask.ExecutionState.Enqueued;
+            }
+                
+            foreach (TrangaTask enqueuedTask in _allTasks.Where(enqueuedTask => enqueuedTask.state is TrangaTask.ExecutionState.Enqueued))
+            {
+                switch (enqueuedTask.task)
                 {
-                    case TrangaTask.Task.DownloadNewChapters:
-                        if (!_allTasks.Any(taskQuery => taskQuery.task == TrangaTask.Task.DownloadNewChapters &&
-                                                        taskQuery.state is TrangaTask.ExecutionState.Running &&
-                                                        ((DownloadNewChaptersTask)taskQuery).connectorName == ((DownloadNewChaptersTask)task).connectorName))
-                        {
-                            ExecuteTaskNow(task);
-                        }
-                        break;
                     case TrangaTask.Task.DownloadChapter:
+                    case TrangaTask.Task.MonitorPublication:
                         if (!_allTasks.Any(taskQuery =>
-                                taskQuery.task == TrangaTask.Task.DownloadChapter &&
-                                taskQuery.state is TrangaTask.ExecutionState.Running &&
-                                ((DownloadChapterTask)taskQuery).connectorName ==
-                                ((DownloadChapterTask)task).connectorName))
+                            {
+                                if (taskQuery.state is not TrangaTask.ExecutionState.Running) return false;
+                                switch (taskQuery)
+                                {
+                                    case DownloadChapterTask dct when enqueuedTask is DownloadChapterTask eDct && dct.connectorName == eDct.connectorName:
+                                    case MonitorPublicationTask mpt when enqueuedTask is MonitorPublicationTask eMpt && mpt.connectorName == eMpt.connectorName:
+                                        return true;
+                                    default:
+                                        return false;
+                                }
+                            }))
                         {
-                            ExecuteTaskNow(task);
+                            ExecuteTaskNow(enqueuedTask);
                         }
                         break;
                     case TrangaTask.Task.UpdateLibraries:
-                        ExecuteTaskNow(task);
+                        ExecuteTaskNow(enqueuedTask);
                         break;
                 }
             }
 
-            HashSet<DownloadChapterTask> toRemove = new();
-            foreach (KeyValuePair<DownloadChapterTask, CancellationTokenSource> removeTask in _runningDownloadChapterTasks)
+            TrangaTask[] failedDownloadChapterTasks = _allTasks.Where(taskQuery =>
+                taskQuery.state is TrangaTask.ExecutionState.Failed && taskQuery is DownloadChapterTask).ToArray();
+            foreach (TrangaTask failedDownloadChapterTask in failedDownloadChapterTasks)
             {
-                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.Key.parentTask?.DecrementProgress(removeTask.Key.progress);
-                    removeTask.Value.Cancel();
-                    toRemove.Add(removeTask.Key);
-                }
-            }
-            foreach (DownloadChapterTask taskToRemove in toRemove)
-            {
-                DeleteTask(taskToRemove);
-                DownloadChapterTask newTask = new DownloadChapterTask(taskToRemove.task, taskToRemove.connectorName,
-                    taskToRemove.publication, taskToRemove.chapter, taskToRemove.language,
-                    taskToRemove.parentTask);
+                DeleteTask(failedDownloadChapterTask);
+                TrangaTask newTask = failedDownloadChapterTask.Clone();
+                failedDownloadChapterTask.parentTask?.AddChildTask(newTask);
                 AddTask(newTask);
-                taskToRemove.parentTask?.ReplaceFailedChildTask(taskToRemove, newTask);
+            }
+
+            TrangaTask[] successfulDownloadChapterTasks = _allTasks.Where(taskQuery =>
+                taskQuery.state is TrangaTask.ExecutionState.Success && taskQuery is DownloadChapterTask).ToArray();
+            foreach(TrangaTask successfulDownloadChapterTask in successfulDownloadChapterTasks)
+            {
+                DeleteTask(successfulDownloadChapterTask);
             }
             
-            if(allTasksWaitingLength != _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting))
+            if(waitingTasksCount != _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting))
                 ExportDataAndSettings();
-            allTasksWaitingLength = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
+            waitingTasksCount = _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting);
             Thread.Sleep(1000);
         }
     }
@@ -162,8 +118,8 @@ public class TaskManager
         {
             task.Execute(this, this.logger, cToken.Token);
         }, cToken.Token);
-        if(task.GetType() == typeof(DownloadChapterTask))
-            _runningDownloadChapterTasks.Add((DownloadChapterTask)task, cToken);
+        if(task is DownloadChapterTask chapterTask)
+            _runningDownloadChapterTasks.Add(chapterTask, cToken);
         t.Start();
     }
 
@@ -175,26 +131,23 @@ public class TaskManager
         {
             case TrangaTask.Task.UpdateLibraries:
                 //Only one UpdateKomgaLibrary Task
-                logger?.WriteLine(this.GetType().ToString(), $"Removing old {newTask.task}-Task.");
+                logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task.");
                 _allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries);
+                _allTasks.Add(newTask);
                 break;
-            case TrangaTask.Task.DownloadNewChapters:
-                IEnumerable<TrangaTask> matchingdnc =
-                    _allTasks.Where(mTask => mTask.GetType() == typeof(DownloadNewChaptersTask));
-                if (!matchingdnc.Any(mTask =>
-                        ((DownloadNewChaptersTask)mTask).publication.internalId == ((DownloadNewChaptersTask)newTask).publication.internalId &&
-                        ((DownloadNewChaptersTask)mTask).connectorName == ((DownloadNewChaptersTask)newTask).connectorName))
+            case TrangaTask.Task.MonitorPublication:
+                if (!_allTasks.Any(mTask => mTask is MonitorPublicationTask mpt && newTask is MonitorPublicationTask nMpt &&
+                                            mpt.publication.internalId == nMpt.publication.internalId &&
+                                            mpt.connectorName == nMpt.connectorName))
                     _allTasks.Add(newTask);
                 else
                     logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
                 break;
             case TrangaTask.Task.DownloadChapter:
-                IEnumerable<TrangaTask> matchingdc =
-                    _allTasks.Where(mTask => mTask.GetType() == typeof(DownloadChapterTask));
-                if (!matchingdc.Any(mTask =>
-                        ((DownloadChapterTask)mTask).publication.internalId == ((DownloadChapterTask)newTask).publication.internalId &&
-                        ((DownloadChapterTask)mTask).connectorName == ((DownloadChapterTask)newTask).connectorName &&
-                        ((DownloadChapterTask)mTask).chapter.sortNumber == ((DownloadChapterTask)newTask).chapter.sortNumber))
+                if (!_allTasks.Any(mTask => mTask is DownloadChapterTask dct && newTask is DownloadChapterTask nDct &&
+                                            dct.publication.internalId == nDct.publication.internalId &&
+                                            dct.connectorName == nDct.connectorName &&
+                                            dct.chapter.sortNumber == nDct.chapter.sortNumber))
                     _allTasks.Add(newTask);
                 else
                     logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
@@ -207,72 +160,12 @@ public class TaskManager
     {
         logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
         _allTasks.Remove(removeTask);
-        if (removeTask.GetType() == typeof(DownloadChapterTask))
-            _runningDownloadChapterTasks.Remove((DownloadChapterTask)removeTask);
-    }
-
-    public TrangaTask? AddTask(TrangaTask.Task taskType, string? connectorName, string? internalId,
-        TimeSpan reoccurrenceTime, string? language = "en")
-    {
-        TrangaTask? newTask = null;
-        switch (taskType)
+        removeTask.parentTask?.RemoveChildTask(removeTask);
+        if (removeTask is DownloadChapterTask cRemoveTask && _runningDownloadChapterTasks.ContainsKey(cRemoveTask))
         {
-            case TrangaTask.Task.UpdateLibraries:
-                newTask = new UpdateLibrariesTask(taskType, reoccurrenceTime);
-                break;
-            case TrangaTask.Task.DownloadNewChapters:
-                if (connectorName is null)
-                    logger?.WriteLine(this.GetType().ToString(), $"Value connectorName can not be null.");
-                if(internalId is null)
-                    logger?.WriteLine(this.GetType().ToString(), $"Value internalId can not be null.");
-                if(language is null)
-                    logger?.WriteLine(this.GetType().ToString(), $"Value language can not be null.");
-                if (connectorName is null || internalId is null || language is null)
-                    return null;
-                GetConnector(connectorName); //Check if connectorName is valid
-                Publication publication = GetAllPublications().First(pub => pub.internalId == internalId);
-                newTask = new DownloadNewChaptersTask(taskType, connectorName!, publication, reoccurrenceTime, language!);
-                break;
+            _runningDownloadChapterTasks[cRemoveTask].Cancel();
+            _runningDownloadChapterTasks.Remove(cRemoveTask);
         }
-        if(newTask is not null)
-            AddTask(newTask);
-        return newTask;
-    }
-
-    /// <summary>
-    /// Removes Task from task-collection
-    /// </summary>
-    /// <param name="task">TrangaTask.Task type</param>
-    /// <param name="connectorName">Name of Connector that was used</param>
-    /// <param name="publicationId">Publication that was used</param>
-    public void DeleteTask(TrangaTask.Task task, string? connectorName, string? publicationId)
-    {
-        logger?.WriteLine(this.GetType().ToString(), $"Removing Task {task} {publicationId}");
-        
-        switch (task)
-        {
-            case TrangaTask.Task.UpdateLibraries:
-                //Only one UpdateKomgaLibrary Task
-                logger?.WriteLine(this.GetType().ToString(), $"Removing old {task}-Task.");
-                _allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries);
-                break;
-            case TrangaTask.Task.DownloadNewChapters:
-                if (connectorName is null || publicationId is null)
-                    logger?.WriteLine(this.GetType().ToString(), "connectorName and publication can not be null");
-                else
-                {
-                    _allTasks.RemoveWhere(mTask =>
-                        mTask.GetType() == typeof(DownloadNewChaptersTask) &&
-                        ((DownloadNewChaptersTask)mTask).publication.internalId == publicationId &&
-                        ((DownloadNewChaptersTask)mTask).connectorName == connectorName!);
-                    _allTasks.RemoveWhere(mTask =>
-                        mTask.GetType() == typeof(DownloadChapterTask) &&
-                        ((DownloadChapterTask)mTask).publication.internalId == publicationId &&
-                        ((DownloadChapterTask)mTask).connectorName == connectorName!);
-                }
-                break;
-        }
-        ExportDataAndSettings();
     }
 
     public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterSortNumber = null)
@@ -281,50 +174,46 @@ public class TaskManager
         {
             case TrangaTask.Task.UpdateLibraries:
                 return _allTasks.Where(tTask => tTask.task == TrangaTask.Task.UpdateLibraries);
-            case TrangaTask.Task.DownloadNewChapters:
+            case TrangaTask.Task.MonitorPublication:
                 if(connectorName is null)
                     return _allTasks.Where(tTask => tTask.task == taskType);
                 GetConnector(connectorName);//Name check
-                IEnumerable<TrangaTask> matchingdnc = _allTasks.Where(tTask => tTask.GetType() == typeof(DownloadNewChaptersTask));
                 if (searchString is not null)
                 {
-                    return matchingdnc.Where(mTask =>
-                        ((DownloadNewChaptersTask)mTask).connectorName == connectorName &&
-                        ((DownloadNewChaptersTask)mTask).ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
+                    return _allTasks.Where(mTask =>
+                        mTask is MonitorPublicationTask mpt && mpt.connectorName == connectorName &&
+                        mpt.ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
                 }
                 else if (internalId is not null)
                 {
-                    return matchingdnc.Where(mTask =>
-                        ((DownloadNewChaptersTask)mTask).connectorName == connectorName &&
-                        ((DownloadNewChaptersTask)mTask).publication.internalId == internalId);
+                    return _allTasks.Where(mTask =>
+                        mTask is MonitorPublicationTask mpt && mpt.connectorName == connectorName &&
+                        mpt.publication.internalId == internalId);
                 }
                 else
                     return _allTasks.Where(tTask =>
-                        tTask.GetType() == typeof(DownloadNewChaptersTask) &&
-                        ((DownloadNewChaptersTask)tTask).connectorName == connectorName);
+                        tTask is MonitorPublicationTask mpt && mpt.connectorName == connectorName);
                 
             case TrangaTask.Task.DownloadChapter:
                 if(connectorName is null)
                     return _allTasks.Where(tTask => tTask.task == taskType);
                 GetConnector(connectorName);//Name check
-                IEnumerable<TrangaTask> matchingdc = _allTasks.Where(tTask => tTask.GetType() == typeof(DownloadChapterTask));
                 if (searchString is not null)
                 {
-                    return matchingdc.Where(mTask =>
-                        ((DownloadChapterTask)mTask).connectorName == connectorName &&
-                        ((DownloadChapterTask)mTask).ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
+                    return _allTasks.Where(mTask =>
+                        mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
+                        dct.ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
                 }
                 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).chapter.sortNumber == chapterSortNumber);
+                    return _allTasks.Where(mTask =>
+                        mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
+                        dct.publication.publicationId == internalId &&
+                        dct.chapter.sortNumber == chapterSortNumber);
                 }
                 else
-                    return _allTasks.Where(tTask =>
-                        tTask.GetType() == typeof(DownloadChapterTask) &&
-                        ((DownloadChapterTask)tTask).connectorName == connectorName);
+                    return _allTasks.Where(mTask =>
+                        mTask is DownloadChapterTask dct && dct.connectorName == connectorName);
                 
             default:
                 return Array.Empty<TrangaTask>();
@@ -381,6 +270,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
@@ -428,13 +342,14 @@ public class TaskManager
             this._allTasks = JsonConvert.DeserializeObject<HashSet<TrangaTask>>(buffer, new JsonSerializerSettings() { Converters = { new TrangaTask.TrangaTaskJsonConverter() } })!;
         }
 
-        foreach (TrangaTask task in this._allTasks.Where(task => task.GetType() == typeof(DownloadChapterTask)))
+        foreach (TrangaTask task in this._allTasks.Where(tTask => tTask.parentTaskId is not null))
         {
-            DownloadChapterTask dcTask = (DownloadChapterTask)task;
-            IEnumerable<TrangaTask> dncTasks = this._allTasks.Where(pTask => pTask.GetType() == typeof(DownloadNewChaptersTask));
-            DownloadNewChaptersTask? parentTask = (DownloadNewChaptersTask?)dncTasks.FirstOrDefault(pTask => pTask.taskId.Equals(dcTask.parentTaskId));
-            dcTask.parentTask = parentTask;
-            parentTask?.AddChildTask(dcTask);
+            TrangaTask? parentTask = this._allTasks.FirstOrDefault(pTask => pTask.taskId == task.parentTaskId);
+            if (parentTask is not null)
+            {
+                task.parentTask = parentTask;
+                parentTask.AddChildTask(task);
+            }
         }
             
 

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,4 @@
-using System.Globalization;
+using System.Net;
 using System.Text.Json.Serialization;
 using Logging;
 using Newtonsoft.Json;
@@ -11,7 +11,7 @@ namespace Tranga;
 /// <summary>
 /// Stores information on Task, when implementing new Tasks also update the serializer
 /// </summary>
-[JsonDerivedType(typeof(DownloadNewChaptersTask), 2)]
+[JsonDerivedType(typeof(MonitorPublicationTask), 2)]
 [JsonDerivedType(typeof(UpdateLibrariesTask), 3)]
 [JsonDerivedType(typeof(DownloadChapterTask), 4)]
 public abstract class TrangaTask
@@ -20,53 +20,32 @@ public abstract class TrangaTask
     // ReSharper disable once MemberCanBePrivate.Global I want it thaaat way
     public TimeSpan reoccurrence { get; }
     public DateTime lastExecuted { get; set; }
+    [Newtonsoft.Json.JsonIgnore] public ExecutionState state { get; set; }
     public Task task { get; }
-    public string taskId { get; set; }
-    [Newtonsoft.Json.JsonIgnore]public ExecutionState state { get; set; }
-    [Newtonsoft.Json.JsonIgnore]public double progress { get; protected set; }
-    [Newtonsoft.Json.JsonIgnore]public DateTime nextExecution => lastExecuted.Add(reoccurrence);
+    public string taskId { get; }
+    [Newtonsoft.Json.JsonIgnore] public TrangaTask? parentTask { get; set; }
+    public string? parentTaskId { get; set; }
+    [Newtonsoft.Json.JsonIgnore] protected HashSet<TrangaTask> childTasks { get; }
+    [Newtonsoft.Json.JsonIgnore] public double progress => GetProgress();
     [Newtonsoft.Json.JsonIgnore]public DateTime executionStarted { get; private set; }
-
-    [Newtonsoft.Json.JsonIgnore]
-    public DateTime executionApproximatelyFinished => this.progress != 0
-        ? this.executionStarted.Add(DateTime.Now.Subtract(this.executionStarted) / this.progress)
-        : DateTime.MaxValue;
-    
-    [Newtonsoft.Json.JsonIgnore]
-    public TimeSpan executionApproximatelyRemaining => this.executionApproximatelyFinished.Subtract(DateTime.Now);
-    
     [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);
 
-    public enum ExecutionState
-    {
-        Waiting,
-        Enqueued,
-        Running
-    };
+    public enum ExecutionState { Waiting, Enqueued, Running, Failed, Success }
 
-    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.executionStarted = DateTime.UnixEpoch;
         this.lastChange = DateTime.MaxValue;
-        this.taskId = Convert.ToBase64String(System.Text.Encoding.ASCII.GetBytes(this.executionStarted.ToString(CultureInfo.InvariantCulture)));
-    }
-
-    public double IncrementProgress(double amount)
-    {
-        this.progress += amount;
-        this.lastChange = DateTime.Now;
-        return this.progress;
-    }
-
-    public double DecrementProgress(double amount)
-    {
-        this.progress -= amount;
-        this.lastChange = DateTime.Now;
-        return this.progress;
+        this.taskId = Convert.ToBase64String(BitConverter.GetBytes(new Random().Next()));
+        this.childTasks = new();
+        this.parentTask = parentTask;
+        this.parentTaskId = parentTask?.taskId;
     }
     
     /// <summary>
@@ -75,7 +54,11 @@ public abstract class TrangaTask
     /// <param name="taskManager"></param>
     /// <param name="logger"></param>
     /// <param name="cancellationToken"></param>
-    protected abstract void ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null);
+    protected abstract HttpStatusCode ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null);
+
+    public abstract TrangaTask Clone();
+
+    protected abstract double GetProgress();
 
     /// <summary>
     /// Execute the task
@@ -87,25 +70,58 @@ public abstract class TrangaTask
     {
         logger?.WriteLine(this.GetType().ToString(), $"Executing Task {this}");
         this.state = ExecutionState.Running;
+        if(this.parentTask is not null)
+            this.parentTask.state = ExecutionState.Running;
         this.executionStarted = DateTime.Now;
         this.lastChange = DateTime.Now;
-        ExecuteTask(taskManager, logger, cancellationToken);
-        this.lastExecuted = DateTime.Now;
-        this.state = ExecutionState.Waiting;
+        HttpStatusCode statusCode = ExecuteTask(taskManager, logger, cancellationToken);
+        while(childTasks.Any(ct => ct.state is ExecutionState.Enqueued or ExecutionState.Running))
+            Thread.Sleep(1000);
+        if ((int)statusCode >= 200 && (int)statusCode < 300)
+        {
+            this.lastExecuted = DateTime.Now;
+            if (this is DownloadChapterTask)
+                this.state = ExecutionState.Success;
+            else
+                this.state = ExecutionState.Waiting;
+        }
+        else
+        {
+            if (this is DownloadChapterTask && statusCode == HttpStatusCode.NotFound)
+                this.state = ExecutionState.Success;
+            else
+                this.state = ExecutionState.Failed;
+            this.lastExecuted = DateTime.MaxValue;
+        }
+        if(this.parentTask is not null)
+            this.parentTask.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 AddChildTask(TrangaTask childTask)
     {
-        return nextExecution < DateTime.Now && state is ExecutionState.Waiting;
+        this.childTasks.Add(childTask);
+    }
+
+    public void RemoveChildTask(TrangaTask childTask)
+    {
+        this.childTasks.Remove(childTask);
+    }
+
+    private TimeSpan GetRemainingTime()
+    {
+        if(progress == 0 || lastChange == DateTime.MaxValue || executionStarted == DateTime.UnixEpoch)
+            return TimeSpan.Zero;
+        TimeSpan elapsed = lastChange.Subtract(executionStarted);
+        return elapsed.Divide(progress).Subtract(elapsed);
     }
 
     public enum Task : byte
     {
-        DownloadNewChapters = 2,
+        MonitorPublication = 2,
         UpdateLibraries = 3,
-        DownloadChapter = 4
+        DownloadChapter = 4,
+        DownloadNewChapters = 2 //legacy
     }
 
     public override string ToString()
@@ -117,14 +133,14 @@ public abstract class TrangaTask
     {
         public override bool CanConvert(Type objectType)
         {
-            return (objectType == typeof(TrangaTask));
+            return objectType == typeof(TrangaTask);
         }
 
         public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
         {
             JObject jo = JObject.Load(reader);
-            if (jo["task"]!.Value<Int64>() == (Int64)Task.DownloadNewChapters)
-                return jo.ToObject<DownloadNewChaptersTask>(serializer)!;
+            if (jo["task"]!.Value<Int64>() == (Int64)Task.MonitorPublication)
+                return jo.ToObject<MonitorPublicationTask>(serializer)!;
 
             if (jo["task"]!.Value<Int64>() == (Int64)Task.UpdateLibraries)
                 return jo.ToObject<UpdateLibrariesTask>(serializer)!;

Tranga/TrangaTasks/DownloadChapterTask.cs

@@ -1,5 +1,5 @@
-using Logging;
-using Newtonsoft.Json;
+using System.Net;
+using Logging;
 
 namespace Tranga.TrangaTasks;
 
@@ -9,31 +9,44 @@ public class DownloadChapterTask : TrangaTask
     public Publication publication { get; }
     public string language { get; }
     public Chapter chapter { get; }
-    [JsonIgnore]public DownloadNewChaptersTask? parentTask { get; set; }
-    public string? parentTaskId { get; set; }
 
-    
-    public DownloadChapterTask(Task task, string connectorName, Publication publication, Chapter chapter, string language = "en", DownloadNewChaptersTask? parentTask = null) : base(task, TimeSpan.Zero)
+    private double _dctProgress = 0;
+
+    public DownloadChapterTask(string connectorName, Publication publication, Chapter chapter, string language = "en", MonitorPublicationTask? parentTask = null) : base(Task.DownloadChapter, TimeSpan.Zero, parentTask)
     {
         this.chapter = chapter;
         this.connectorName = connectorName;
         this.publication = publication;
         this.language = language;
-        this.parentTask = parentTask;
-        this.parentTaskId = parentTask?.taskId;
     }
 
-    protected override void ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
+    protected override HttpStatusCode ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
     {
-        if (cancellationToken?.IsCancellationRequested??false)
-            return;
-        if(this.parentTask is not null)
-            this.parentTask.state = ExecutionState.Running;
+        if (cancellationToken?.IsCancellationRequested ?? false)
+            return HttpStatusCode.RequestTimeout;
         Connector connector = taskManager.GetConnector(this.connectorName);
-        connector.DownloadChapter(this.publication, this.chapter, this, cancellationToken);
-        if(this.parentTask is not null)
-            this.parentTask.state = ExecutionState.Waiting;
-        taskManager.DeleteTask(this);
+        connector.CopyCoverFromCacheToDownloadLocation(this.publication, taskManager.settings);
+        HttpStatusCode downloadSuccess = connector.DownloadChapter(this.publication, this.chapter, this, cancellationToken);
+        if((int)downloadSuccess >= 200 && (int)downloadSuccess < 300 && parentTask is not null)
+            foreach(NotificationManager nm in taskManager.settings.notificationManagers)
+                nm.SendNotification("New Chapter downloaded", $"{this.publication.sortName} {this.chapter.chapterNumber} {this.chapter.name}");
+        return downloadSuccess;
+    }
+
+    public override TrangaTask Clone()
+    {
+        return new DownloadChapterTask(this.connectorName, this.publication, this.chapter,
+            this.language, (MonitorPublicationTask?)this.parentTask);
+    }
+
+    protected override double GetProgress()
+    {
+        return _dctProgress;
+    }
+
+    internal void IncrementProgress(double amount)
+    {
+        this._dctProgress += amount;
     }
 
     public override string ToString()

Tranga/TrangaTasks/DownloadNewChaptersTask.cs

@@ -1,81 +0,0 @@
-using Logging;
-using Newtonsoft.Json;
-
-namespace Tranga.TrangaTasks;
-
-public class DownloadNewChaptersTask : TrangaTask
-{
-    public string connectorName { get; }
-    public Publication publication { get; }
-    public string language { get; }
-    [JsonIgnore]private HashSet<DownloadChapterTask> childTasks { get; }
-    [JsonIgnore]public new double progress => childTasks.Count > 0 ? childTasks.Sum(childTask => childTask.progress) / childTasks.Count : 0;
-    
-    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;
-        this.childTasks = new();
-    }
-
-    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);
-
-        connector.CopyCoverFromCacheToDownloadLocation(pub, taskManager.settings);
-        
-        pub.SaveSeriesInfoJson(connector.downloadLocation);
-
-        foreach (Chapter newChapter in newChapters)
-        {
-            DownloadChapterTask newTask = new (Task.DownloadChapter, this.connectorName!, pub, newChapter, this.language, this);
-            taskManager.AddTask(newTask);
-            this.childTasks.Add(newTask);
-        }
-    }
-
-    public void ReplaceFailedChildTask(DownloadChapterTask failed, DownloadChapterTask newTask)
-    {
-        if (!this.childTasks.Contains(failed))
-            throw new ArgumentException($"Task {failed} is not childTask of {this}");
-        this.childTasks.Remove(failed);
-        this.childTasks.Add(newTask);
-    }
-
-    public void AddChildTask(DownloadChapterTask childTask)
-    {
-        this.childTasks.Add(childTask);
-    }
-    
-    /// <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;
-    }
-
-    public override string ToString()
-    {
-        return $"{base.ToString()}, {connectorName}, {publication.sortName} {publication.internalId}";
-    }
-}

Tranga/TrangaTasks/MonitorPublicationTask.cs

@@ -0,0 +1,60 @@
+using System.Net;
+using Logging;
+
+namespace Tranga.TrangaTasks;
+
+public class MonitorPublicationTask : TrangaTask
+{
+    public string connectorName { get; }
+    public Publication publication { get; }
+    public string language { get; }
+    public MonitorPublicationTask(string connectorName, Publication publication, TimeSpan reoccurrence, string language = "en") : base(Task.MonitorPublication, reoccurrence)
+    {
+        this.connectorName = connectorName;
+        this.publication = publication;
+        this.language = language;
+    }
+
+    protected override HttpStatusCode ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
+    {
+        if (cancellationToken?.IsCancellationRequested ?? false)
+            return HttpStatusCode.RequestTimeout;
+        Connector connector = taskManager.GetConnector(this.connectorName);
+        
+        //Check if Publication already has a Folder
+        publication.CreatePublicationFolder(taskManager.settings.downloadLocation);
+        List<Chapter> newChapters = taskManager.GetNewChaptersList(connector, publication, language);
+
+        connector.CopyCoverFromCacheToDownloadLocation(publication, taskManager.settings);
+        
+        publication.SaveSeriesInfoJson(connector.downloadLocation);
+
+        foreach (Chapter newChapter in newChapters)
+        {
+            DownloadChapterTask newTask = new (this.connectorName, publication, newChapter, this.language, this);
+            this.childTasks.Add(newTask);
+            newTask.state = ExecutionState.Enqueued;
+            taskManager.AddTask(newTask);
+        }
+
+        return HttpStatusCode.OK;
+    }
+
+    public override TrangaTask Clone()
+    {
+        return new MonitorPublicationTask(this.connectorName, this.publication, this.reoccurrence,
+            this.language);
+    }
+
+    protected override double GetProgress()
+    {
+        if (this.childTasks.Count > 0)
+            return this.childTasks.Sum(ct => ct.progress) / childTasks.Count;
+        return 1;
+    }
+
+    public override string ToString()
+    {
+        return $"{base.ToString()}, {connectorName}, {publication.sortName} {publication.internalId}";
+    }
+}

Tranga/TrangaTasks/UpdateLibrariesTask.cs

@@ -1,19 +1,30 @@
-using Logging;
+using System.Net;
+using Logging;
 
 namespace Tranga.TrangaTasks;
 
 public class UpdateLibrariesTask : TrangaTask
 {
-    public UpdateLibrariesTask(Task task, TimeSpan reoccurrence) : base(task, reoccurrence)
+    public UpdateLibrariesTask(TimeSpan reoccurrence) : base(Task.UpdateLibraries, reoccurrence)
     {
     }
 
-    protected override void ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
+    protected override HttpStatusCode ExecuteTask(TaskManager taskManager, Logger? logger, CancellationToken? cancellationToken = null)
     {
-        if (cancellationToken?.IsCancellationRequested??false)
-            return;
+        if (cancellationToken?.IsCancellationRequested ?? false)
+            return HttpStatusCode.RequestTimeout;
         foreach(LibraryManager lm in taskManager.settings.libraryManagers)
             lm.UpdateLibrary();
-        this.progress = 1f;
+        return HttpStatusCode.OK;
+    }
+
+    public override TrangaTask Clone()
+    {
+        return new UpdateLibrariesTask(this.reoccurrence);
+    }
+
+    protected override double GetProgress()
+    {
+        return 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

@@ -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()">

Website/interaction.js

@@ -33,9 +33,14 @@ 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");
@@ -154,7 +159,7 @@ 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");
@@ -284,11 +289,16 @@ function GetSettingsClick(){
     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;
     
@@ -307,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 => {
@@ -316,20 +333,26 @@ function GetSettingsClick(){
 }
 
 function UpdateLibrarySettings(){
-    if(settingKomgaUser.value != "" && settingKomgaPass != ""){
+    if(settingKomgaUrl.value != "" && settingKomgaUser.value != "" && settingKomgaPass.value != ""){
         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);
+        CreateUpdateLibraryTask(libraryUpdateTime.value);
     }
     
     if(settingKavitaUrl.value != "" && settingKavitaUser.value != "" && settingKavitaPass.value != ""){
-        UpdateSettings("", "", "", settingKavitaUrl.value, settingKavitaUser.value, settingKavitaPass.value);
+        UpdateKavita(settingKavitaUrl.value, settingKavitaUser.value, settingKavitaPass.value);
+        CreateUpdateLibraryTask(libraryUpdateTime.value);
     }
-    CreateUpdateLibraryTask(libraryUpdateTime.value);
+    
+    if(settingGotifyUrl.value != "" && settingGotifyAppToken.value != ""){
+        UpdateGotify(settingGotifyUrl.value, settingGotifyAppToken.value);
+    }
+    
+    if(settingLunaseaWebhook.value != ""){
+        UpdateLunaSea(settingLunaseaWebhook.value);
+    }
+    
     setTimeout(() => GetSettingsClick(), 200);
 }
 
@@ -366,9 +389,14 @@ function ShowTasksQueue(){
         .then(json => {
             tagTasksRunning.innerText = json.length;
             json.forEach(task => {
-                downloadTasksOutput.appendChild(CreateProgressChild(task));
-                document.querySelector(`#progress${task.taskId.replaceAll('=','')}`).value = task.progress;
-                document.querySelector(`#progressStr${task.taskId.replaceAll('=','')}`).innerText = task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
+                if(task.task == 2 || task.task == 4) {
+                    downloadTasksOutput.appendChild(CreateProgressChild(task));
+                    document.querySelector(`#progress${GetValidSelector(task.taskId)}`).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${GetValidSelector(task.taskId)}`).innerText = `${finishedHours}:${finishedMinutes}:${finishedSeconds}`;
+                }
             });
         });
 
@@ -395,13 +423,13 @@ function CreateProgressChild(task){
 
 
     var progress = document.createElement("progress");
-    progress.id = `progress${task.taskId.replaceAll('=','')}`;
+    progress.id = `progress${GetValidSelector(task.taskId)}`;
     child.appendChild(progress);
     
     var progressStr = document.createElement("span");
-    progressStr.innerText = "00.00%";
+    progressStr.innerText = " \t∞";
     progressStr.className = "progressStr";
-    progressStr.id = `progressStr${task.taskId.replaceAll('=','')}`;
+    progressStr.id = `progressStr${GetValidSelector(task.taskId)}`;
     child.appendChild(progressStr);
     
     if(task.chapter != undefined){
@@ -484,8 +512,18 @@ setInterval(() => {
 setInterval(() => {
     GetRunningTasks().then((json) => {
         json.forEach(task => {
-            document.querySelector(`#progress${task.taskId.replaceAll('=','')}`).value = task.progress;
-            document.querySelector(`#progressStr${task.taskId.replaceAll('=','')}`).innerText = task.progress.toLocaleString(undefined,{style: 'percent', minimumFractionDigits:2});
+            if(task.task == 2 || task.task == 4){
+                document.querySelector(`#progress${GetValidSelector(task.taskId)}`).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${GetValidSelector(task.taskId)}`).innerText = `${finishedHours}:${finishedMinutes}:${finishedSeconds}`;
+            }
         });
     });
-},500);
+},500);
+
+function GetValidSelector(str){
+    var clean = [...str.matchAll(/[a-zA-Z0-9]*-*_*/g)];
+    return clean.join('');
+}

Website/style.css

@@ -454,6 +454,8 @@ blur-background {
     flex-wrap: wrap;
     justify-content: start;
     align-content: start;
+    max-height: 70vh;
+    overflow-y: scroll;
 }
 
 #publicationViewerPopup{