Chapter fix RegexMatching on chapter number

API: Change Tasks/Progress chapterSortNumber to ChapterNumber

API/Dockerfile

@@ -6,7 +6,7 @@ COPY . /src/
 RUN dotnet restore API/API.csproj
 RUN dotnet publish -c Release -o /publish
 
-FROM glax/tranga-base:dev as runtime
+FROM glax/tranga-base:latest as runtime
 WORKDIR /publish
 COPY --from=build-env /publish .
 EXPOSE 6531

API/RequestHandler.cs

@@ -80,12 +80,16 @@ public class RequestHandler
     private Dictionary<string, string> GetRequestVariables(string query)
     {
         Dictionary<string, string> ret = new();
-        Regex queryRex = new (@"\?{1}([A-z]+=[A-z]+)+(&[A-z]+=[A-z]+)*");
+        Regex queryRex = new (@"\?{1}&?([A-z0-9-=]+=[A-z0-9-=]+)+(&[A-z0-9-=]+=[A-z0-9-=]+)*");
         if (!queryRex.IsMatch(query))
             return ret;
         query = query.Substring(1);
-        foreach(string kvpair in query.Split('&'))
+        foreach (string kvpair in query.Split('&').Where(str => str.Length >= 3))
-            ret.Add(kvpair.Split('=')[0], kvpair.Split('=')[1]);
+        {
+            string var = kvpair.Split('=')[0];
+            string val = kvpair.Substring(var.Length + 1);
+            ret.Add(var, val);
+        }
         return ret;
     }
 
@@ -178,7 +182,7 @@ public class RequestHandler
                 if (publication2 is null)
                     return;
     
-                IEnumerable<Chapter> toDownload = connector2.SearchChapters((Publication)publication2, chapters, language2 ?? "en");
+                IEnumerable<Chapter> toDownload = connector2.SelectChapters((Publication)publication2, chapters, language2 ?? "en");
                 foreach(Chapter chapter in toDownload)
                     _taskManager.AddTask(new DownloadChapterTask(connectorName2, (Publication)publication2, chapter, "en"));
                 break;
@@ -319,7 +323,7 @@ public class RequestHandler
                 variables.TryGetValue("taskType", out string? taskType2);
                 variables.TryGetValue("connectorName", out string? connectorName4);
                 variables.TryGetValue("publicationId", out string? publicationId);
-                variables.TryGetValue("chapterSortNumber", out string? chapterSortNumber);
+                variables.TryGetValue("chapterNumber", out string? chapterNumber);
                 if (taskType2 is null || connectorName4 is null || publicationId is null)
                     return null;
                 Connector? connector =
@@ -333,10 +337,10 @@ public class RequestHandler
                     if (pTask is TrangaTask.Task.MonitorPublication)
                     {
                         task = _taskManager.GetTasksMatching(pTask, connectorName: connectorName4, internalId: publicationId).FirstOrDefault();
-                    }else if (pTask is TrangaTask.Task.DownloadChapter && chapterSortNumber is not null)
+                    }else if (pTask is TrangaTask.Task.DownloadChapter && chapterNumber is not null)
                     {
                         task = _taskManager.GetTasksMatching(pTask, connectorName: connectorName4, internalId: publicationId,
-                            chapterSortNumber: chapterSortNumber).FirstOrDefault();
+                            chapterNumber: chapterNumber).FirstOrDefault();
                     }
                     if (task is null)
                         return null;

API/Server.cs

@@ -1,4 +1,5 @@
 using System.Net;
+using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
 using Logging;
@@ -18,7 +19,10 @@ public class Server
     public Server(int port, TaskManager taskManager, Logger? logger = null)
     {
         this.logger = logger;
-        this._listener.Prefixes.Add($"http://*:{port}/");
+        if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
+            this._listener.Prefixes.Add($"http://*:{port}/");
+        else
+            this._listener.Prefixes.Add($"http://localhost:{port}/");
         this._requestHandler = new RequestHandler(taskManager, this);
         Listen();
     }
@@ -51,7 +55,14 @@ public class Server
             return;
         }
 
-        _requestHandler.HandleRequest(request, response);
+        if (request.HttpMethod == "OPTIONS")
+        {
+            SendResponse(HttpStatusCode.OK, response);
+        }
+        else
+        {
+            _requestHandler.HandleRequest(request, response);
+        }
     }
 
     internal void SendResponse(HttpStatusCode statusCode, HttpListenerResponse response, object? content = null)
@@ -63,9 +74,16 @@ public class Server
         response.AddHeader("Access-Control-Max-Age", "1728000");
         response.AppendHeader("Access-Control-Allow-Origin", "*");
         response.ContentType = "application/json";
-        response.OutputStream.Write(content is not null
+        try
-            ? Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(content))
+        {
-            : Array.Empty<byte>());
+            response.OutputStream.Write(content is not null
+                ? Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(content))
+                : Array.Empty<byte>());
+        }
+        catch (HttpListenerException)
+        {
+            
+        }
         response.OutputStream.Close();
         
     }

Dockerfile

@@ -1,14 +0,0 @@
-# syntax=docker/dockerfile:1
-
-FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
-WORKDIR /src
-COPY . /src/
-RUN dotnet restore Tranga-API/Tranga-API.csproj
-RUN dotnet publish -c Release -o /publish
-
-#FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
-FROM glax/tranga-base:latest as runtime
-WORKDIR /publish
-COPY --from=build-env /publish .
-EXPOSE 80
-ENTRYPOINT ["dotnet", "/publish/Tranga-API.dll"]

README.md

@@ -52,14 +52,14 @@
 <!-- ABOUT THE PROJECT -->
 ## About The Project
 
-Tranga can download Chapters and Metadata from Scanlation sites such as 
+Tranga can download Chapters and Metadata from "Scanlation" sites such as 
 
 - [MangaDex.org](https://mangadex.org/)
 - [Manganato.com](https://manganato.com/)
 - [Mangasee](https://mangasee123.com/)
+- ❓ Open an [issue](https://github.com/C9Glax/tranga/issues)
 
-and automatically start updates in [Komga](https://komga.org/) and [Kavita](https://www.kavitareader.com/) to import them.
+and automatically import them with [Komga](https://komga.org/) and [Kavita](https://www.kavitareader.com/). Also Notifications will be sent to your devices using [Gotify](https://gotify.net/) and [LunaSea](https://www.lunasea.app/).
-
 ### Inspiration:
 
 Because [Kaizoku](https://github.com/oae/kaizoku) was relying on [mangal](https://github.com/metafates/mangal) and mangal
@@ -76,19 +76,18 @@ That is why I wanted to create my own project, in a language I understand, and t
 - Newtonsoft.JSON
 - [PuppeteerSharp](https://www.puppeteersharp.com/)
 - [Html Agility Pack (HAP)](https://html-agility-pack.net/)
-- Love <3 Blåhaj 🦈
+- 💙 Blåhaj 🦈
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
 
 ## Screenshots
 
-![image](screenshots/overview.png)
+| ![image](screenshots/overview.png) | ![image](screenshots/addtask.png) |
+|-----------------------------------:|:----------------------------------|
 
-![image](screenshots/addtask.png)
+| ![image](screenshots/settings.png) | ![image](screenshots/publication-description.png) | ![image](screenshots/progress.png) |
-
+|-----------------------------------:|:-------------------------------------------------:|:-----------------------------------|
-| ![image](screenshots/settings.png) | ![image](screenshots/publication-description.png) |
-|-----------------------------------:|:-------------------------------------------------:|
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 
@@ -110,39 +109,42 @@ Download [docker-compose.yaml](https://git.bernloehr.eu/glax/Tranga/src/branch/m
 
 Wherever you are mounting `/usr/share/Tranga-API` you also need to mount that same path + `/imageCache` in the webserver container.
 
-### Usage
+### Docker-Website usage
 
 There is two ways to download Mangas:
 - Downloading everything and monitor for new Chapters
 - Selecting specific Volumes/Chapters
 
 On the website you add new tasks, by selecting the blue '+' field. Next select the connector/site you want to use, and enter a search term.
-After pressing 'Search', the results will be presented below - this might, depending on the result-size, take a while.
+After clicking 'Search' (or pressing Enter), the results will be presented below - this might, depending on the result-size, take a while because we are already preloading the cover-images.
-Next select the publication and a new popup will open with two options:
+Next select the publication (by selecting the cover) and a new popup will open with two options:
 - "Monitor" - Download all chapters and monitor for new ones
 - "Download Chapter" - Download specific chapters only
 
-When selecting `Monitor` you will be presented with a new window and the selection of the interval you want to check for new chapters.
+When selecting `Monitor` you will be presented with a new window and the selection of the interval you want to check for new chapters (Default: Every 3 hours).
-When selecting `Download Chapter` a list will open with all available chapters from which you can then select a range.
+When selecting `Download Chapter` a list will open with all available chapters - that have not yet been downloaded - from which you can then select a range (see below).
 
 The syntax for selecting chapters is as follows:
 - To download a single Chapter enter either the index number (the number at the very start of the line) or its absolute number like so: `c(h)(apter)[number]`, spaces are allowed.
 - To download a range of chapters enter either a range of index numbers (`3-6`) or chapters (`ch 12-23`).
 - For volumes the syntax is as follows: `v(ol)[number](-[number])`, again spaces allowed.
 
-Examples: `2-12`, `c1`, `ch 2`, `chapter 3`, `v 2`, `vol3-4`, `v2c4` (note: you can only specify a single chapter with this syntax).
+Examples: `2-12`, `c1`, `ch 2`, `chapter 3`, `v 2`, `vol3-4`, `v2c4` (note: you can only specify a single chapter with this last syntax).
 
 ### Prerequisites
 
+#### To Build
 [.NET-Core 7.0 SDK](https://dotnet.microsoft.com/en-us/download/dotnet/7.0)
+#### To Run
+[.NET-Core 7.0 Runtime](https://dotnet.microsoft.com/en-us/download/dotnet/7.0) scroll down a bit, should be on the right the second item.
 
 <!-- ROADMAP -->
 ## Roadmap
 
 - [ ] Docker ARM support
-- [ ] ? 
+- [ ] ❓
 
-See the [open issues](https://git.bernloehr.eu/glax/Tranga/issues) for a full list of proposed features (and known issues).
+See the [open issues](https://github.com/C9Glax/tranga/issues) for a full list of proposed features (and known issues).
 
 <p align="right">(<a href="#readme-top">back to top</a>)</p>
 

Tranga-CLI/Tranga_Cli.cs

@@ -514,7 +514,7 @@ public static class Tranga_Cli
         while(selectedChapters is null || selectedChapters.Length < 1)
             selectedChapters = Console.ReadLine();
 
-        return connector.SearchChapters(publication, selectedChapters);
+        return connector.SelectChapters(publication, selectedChapters);
     }
 
     private static Connector? SelectConnector(Connector[] connectors, Logger logger)

Tranga/Chapter.cs

@@ -1,5 +1,5 @@
-using System.Globalization;
+using System.Text.RegularExpressions;
-using System.Text.RegularExpressions;
+using System.Xml.Linq;
 
 namespace Tranga;
 
@@ -9,32 +9,80 @@ namespace Tranga;
 /// </summary>
 public struct Chapter
 {
+    public Publication parentPublication { get; }
     public string? name { get; }
     public string? volumeNumber { get; }
-    public string? chapterNumber { get; }
+    public string chapterNumber { get; }
     public string url { get; }
     public string fileName { get; }
-    public string sortNumber { get; }
     
-    private static readonly Regex LegalCharacters = new Regex(@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*");
+    private static readonly Regex LegalCharacters = new (@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*");
-    public Chapter(string? name, string? volumeNumber, string? chapterNumber, string url)
+    private static readonly Regex IllegalStrings = new(@"Vol(ume)?.?", RegexOptions.IgnoreCase);
+    public Chapter(Publication parentPublication, string? name, string? volumeNumber, string chapterNumber, string url)
     {
+        this.parentPublication = parentPublication;
         this.name = name;
         this.volumeNumber = volumeNumber;
         this.chapterNumber = chapterNumber;
         this.url = url;
-        NumberFormatInfo nfi = new NumberFormatInfo()
-        {
-            NumberDecimalSeparator = "."
-        };
-        sortNumber = decimal.Round(Convert.ToDecimal(this.volumeNumber ?? "1") * Convert.ToDecimal(this.chapterNumber, nfi), 1)
-            .ToString(nfi);
 
         string chapterName = string.Concat(LegalCharacters.Matches(name ?? ""));
         string volStr = this.volumeNumber is not null ? $"Vol.{this.volumeNumber} " : "";
-        string chNumberStr = this.chapterNumber is not null ? $"Ch.{chapterNumber} " : "";
+        string chNumberStr = $"Ch.{chapterNumber} ";
         string chNameStr = chapterName.Length > 0 ? $"- {chapterName}" : "";
-        chNameStr = chNameStr.Replace("Volume", "").Replace("volume", "");
+        chNameStr = IllegalStrings.Replace(chNameStr, "");
         this.fileName = $"{volStr}{chNumberStr}{chNameStr}";
     }
+    
+    
+    /// <summary>
+    /// Checks if a chapter-archive is already present
+    /// </summary>
+    /// <returns>true if chapter is present</returns>
+    internal bool CheckChapterIsDownloaded(string downloadLocation)
+    {
+        string newFilePath = GetArchiveFilePath(downloadLocation);
+        if (!Directory.Exists(Path.Join(downloadLocation, parentPublication.folderName)))
+            return false;
+        FileInfo[] archives = new DirectoryInfo(Path.Join(downloadLocation, parentPublication.folderName)).GetFiles();
+        Regex chapterInfoRex = new(@"Ch\.[0-9.]+");
+        Regex chapterRex = new(@"[0-9]+(\.[0-9]+)?");
+        
+        if (File.Exists(newFilePath))
+            return true;
+
+        string cn = this.chapterNumber;
+        if (archives.FirstOrDefault(archive => chapterRex.Match(chapterInfoRex.Match(archive.Name).Value).Value == cn) is { } path)
+        {
+            File.Move(path.FullName, newFilePath);
+            return true;
+        }
+        return false;
+    }
+    /// <summary>
+    /// Creates full file path of chapter-archive
+    /// </summary>
+    /// <returns>Filepath</returns>
+    internal string GetArchiveFilePath(string downloadLocation)
+    {
+        return Path.Join(downloadLocation, parentPublication.folderName, $"{parentPublication.folderName} - {this.fileName}.cbz");
+    }
+
+    /// <summary>
+    /// Creates a string containing XML of publication and chapter.
+    /// See ComicInfo.xml
+    /// </summary>
+    /// <returns>XML-string</returns>
+    internal string GetComicInfoXmlString()
+    {
+        XElement comicInfo = new XElement("ComicInfo",
+            new XElement("Tags", string.Join(',', parentPublication.tags)),
+            new XElement("LanguageISO", parentPublication.originalLanguage),
+            new XElement("Title", this.name),
+            new XElement("Writer", string.Join(',', parentPublication.authors)),
+            new XElement("Volume", this.volumeNumber),
+            new XElement("Number", this.chapterNumber)
+        );
+        return comicInfo.ToString();
+    }
 }

Tranga/Connector.cs

@@ -15,24 +15,18 @@ namespace Tranga;
 /// </summary>
 public abstract class Connector
 {
-    internal string downloadLocation { get; }  //Location of local files
+    protected TrangaSettings settings { get; }
-    protected DownloadClient downloadClient { get; init; }
+    protected DownloadClient downloadClient { get; init; } = null!;
 
     protected readonly Logger? logger;
 
-    private readonly string _imageCachePath;
 
-    protected Connector(string downloadLocation, string imageCachePath, Logger? logger)
+    protected Connector(TrangaSettings settings, Logger? logger = null)
     {
-        this.downloadLocation = downloadLocation;
+        this.settings = settings;
         this.logger = logger;
-        this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
+        if (!Directory.Exists(settings.coverImageCache))
-        {
+            Directory.CreateDirectory(settings.coverImageCache);
-            //RequestTypes for RateLimits
-        }, logger);
-        this._imageCachePath = imageCachePath;
-        if (!Directory.Exists(imageCachePath))
-            Directory.CreateDirectory(this._imageCachePath);
     }
     
     public abstract string name { get; } //Name of the Connector (e.g. Website)
@@ -54,18 +48,19 @@ public abstract class Connector
     /// <returns>Array of Chapters matching Publication and Language</returns>
     public abstract Chapter[] GetChapters(Publication publication, string language = "");
 
-    public Chapter[] SearchChapters(Publication publication, string searchTerm, string? language = null)
+    public Chapter[] SelectChapters(Publication publication, string searchTerm, string? language = null)
     {
         Chapter[] availableChapters = this.GetChapters(publication, language??"en");
         Regex volumeRegex = new ("((v(ol)*(olume)*)+ *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
         Regex chapterRegex = new ("((c(h)*(hapter)*)+ *([0-9]+(-[0-9]+)?){1})", RegexOptions.IgnoreCase);
         Regex singleResultRegex = new("([0-9]+)", RegexOptions.IgnoreCase);
         Regex rangeResultRegex = new("([0-9]+(-[0-9]+))", RegexOptions.IgnoreCase);
+        Regex allRegex = new("a(ll)?", RegexOptions.IgnoreCase);
         if (volumeRegex.IsMatch(searchTerm) && chapterRegex.IsMatch(searchTerm))
         {
             string volume = singleResultRegex.Match(volumeRegex.Match(searchTerm).Value).Value;
             string chapter = singleResultRegex.Match(chapterRegex.Match(searchTerm).Value).Value;
-            return availableChapters.Where(aCh => aCh.volumeNumber is not null && aCh.chapterNumber is not null &&
+            return availableChapters.Where(aCh => aCh.volumeNumber is not null &&
                 aCh.volumeNumber.Equals(volume, StringComparison.InvariantCultureIgnoreCase) &&
                 aCh.chapterNumber.Equals(chapter, StringComparison.InvariantCultureIgnoreCase))
                 .ToArray();
@@ -99,15 +94,13 @@ public abstract class Connector
                 string range = rangeResultRegex.Match(chapter).Value;
                 int start = Convert.ToInt32(range.Split('-')[0]);
                 int end = Convert.ToInt32(range.Split('-')[1]);
-                return availableChapters.Where(aCh => aCh.chapterNumber is not null &&
+                return availableChapters.Where(aCh => Convert.ToInt32(aCh.chapterNumber) >= start &&
-                                                      Convert.ToInt32(aCh.chapterNumber) >= start &&
                                                       Convert.ToInt32(aCh.chapterNumber) <= end).ToArray();
             }
             else if (singleResultRegex.IsMatch(chapter))
             {
                 string chapterNumber = singleResultRegex.Match(chapter).Value;
                 return availableChapters.Where(aCh =>
-                    aCh.chapterNumber is not null &&
                     aCh.chapterNumber.Equals(chapterNumber, StringComparison.InvariantCultureIgnoreCase)).ToArray();
             }
         }
@@ -121,6 +114,8 @@ public abstract class Connector
             }
             else if(singleResultRegex.IsMatch(searchTerm))
                 return new [] { availableChapters[Convert.ToInt32(searchTerm)] };
+            else if (allRegex.IsMatch(searchTerm))
+                return availableChapters;
         }
 
         return Array.Empty<Chapter>();
@@ -145,7 +140,7 @@ public abstract class Connector
     {
         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);
+        string publicationFolder = publication.CreatePublicationFolder(settings.downloadLocation);
         DirectoryInfo dirInfo = new (publicationFolder);
         if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
         {
@@ -161,51 +156,6 @@ public abstract class Connector
             File.SetUnixFileMode(newFilePath, GroupRead | GroupWrite | OtherRead | OtherWrite | UserRead | UserWrite);
     }
 
-    /// <summary>
-    /// Creates a string containing XML of publication and chapter.
-    /// See ComicInfo.xml
-    /// </summary>
-    /// <returns>XML-string</returns>
-    protected static string GetComicInfoXmlString(Publication publication, Chapter chapter, Logger? logger)
-    {
-        logger?.WriteLine("Connector", $"Creating ComicInfo.Xml for {publication.sortName} {publication.internalId} {chapter.volumeNumber}-{chapter.chapterNumber}");
-        XElement comicInfo = new XElement("ComicInfo",
-            new XElement("Tags", string.Join(',',publication.tags)),
-            new XElement("LanguageISO", publication.originalLanguage),
-            new XElement("Title", chapter.name),
-            new XElement("Writer", string.Join(',', publication.authors)),
-            new XElement("Volume", chapter.volumeNumber),
-            new XElement("Number", chapter.chapterNumber)
-        );
-        return comicInfo.ToString();
-    }
-
-    /// <summary>
-    /// Checks if a chapter-archive is already present
-    /// </summary>
-    /// <returns>true if chapter is present</returns>
-    public bool CheckChapterIsDownloaded(Publication publication, Chapter chapter)
-    {
-        Regex legalCharacters = new Regex(@"([A-z]*[0-9]* *\.*-*,*\]*\[*'*\'*\)*\(*~*!*)*");
-        string oldFilePath = Path.Join(downloadLocation, publication.folderName, $"{string.Concat(legalCharacters.Matches(chapter.name ?? ""))} - V{chapter.volumeNumber}C{chapter.chapterNumber} - {chapter.sortNumber}.cbz");
-        string oldFilePath2 = Path.Join(downloadLocation, publication.folderName, $"{string.Concat(legalCharacters.Matches(chapter.name ?? ""))} - VC{chapter.chapterNumber} - {chapter.chapterNumber}.cbz");
-        string newFilePath = GetArchiveFilePath(publication, chapter);
-        if (File.Exists(oldFilePath))
-            File.Move(oldFilePath, newFilePath);
-        else if (File.Exists(oldFilePath2))
-            File.Move(oldFilePath2, newFilePath);
-        return File.Exists(newFilePath);
-    }
-
-    /// <summary>
-    /// Creates full file path of chapter-archive
-    /// </summary>
-    /// <returns>Filepath</returns>
-    protected string GetArchiveFilePath(Publication publication, Chapter chapter)
-    {
-        return Path.Join(downloadLocation, publication.folderName, $"{publication.folderName} - {chapter.fileName}.cbz");
-    }
-
     /// <summary>
     /// Downloads Image from URL and saves it to the given path(incl. fileName)
     /// </summary>
@@ -281,7 +231,7 @@ public abstract class Connector
     {
         string[] split = url.Split('/');
         string filename = split[^1];
-        string saveImagePath = Path.Join(_imageCachePath, filename);
+        string saveImagePath = Path.Join(settings.coverImageCache, filename);
 
         if (File.Exists(saveImagePath))
             return filename;

Tranga/Connectors/MangaDex.cs

@@ -19,7 +19,7 @@ public class MangaDex : Connector
         Author,
     }
 
-    public MangaDex(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation, imageCachePath, logger)
+    public MangaDex(TrangaSettings settings, Logger? logger = null) : base(settings, logger)
     {
         name = "MangaDex";
         this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
@@ -190,11 +190,11 @@ public class MangaDex : Connector
                     ? attributes["volume"]!.GetValue<string>()
                     : null;
                 
-                string? chapterNum = attributes.ContainsKey("chapter") && attributes["chapter"] is not null
+                string chapterNum = attributes.ContainsKey("chapter") && attributes["chapter"] is not null
                     ? attributes["chapter"]!.GetValue<string>()
-                    : null;
+                    : "null";
                 
-                chapters.Add(new Chapter(title, volume, chapterNum, chapterId));
+                chapters.Add(new Chapter(publication, title, volume, chapterNum, chapterId));
             }
         }
 
@@ -230,10 +230,10 @@ public class MangaDex : Connector
             imageUrls.Add($"{baseUrl}/data/{hash}/{image!.GetValue<string>()}");
 
         string comicInfoPath = Path.GetTempFileName();
-        File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
+        File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
         
         //Download Chapter-Images
-        return DownloadChapterImages(imageUrls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)RequestType.AtHomeServer, parentTask, comicInfoPath, cancellationToken:cancellationToken);
+        return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), (byte)RequestType.AtHomeServer, parentTask, comicInfoPath, cancellationToken:cancellationToken);
     }
 
     private string? GetCoverUrl(string publicationId, string? posterId)

Tranga/Connectors/MangaKatana.cs

@@ -0,0 +1,205 @@
+using System.Globalization;
+using System.Net;
+using System.Text.RegularExpressions;
+using HtmlAgilityPack;
+using Logging;
+using Tranga.TrangaTasks;
+
+namespace Tranga.Connectors;
+
+public class MangaKatana : Connector
+{
+	public override string name { get; }
+
+	public MangaKatana(TrangaSettings settings, Logger? logger = null) : base(settings, logger)
+	{
+		this.name = "MangaKatana";
+		this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
+		{
+			{(byte)1, 60}
+		}, logger);
+	}
+
+	public override Publication[] GetPublications(string publicationTitle = "")
+	{
+		logger?.WriteLine(this.GetType().ToString(), $"Getting Publications (title={publicationTitle})");
+		string sanitizedTitle = string.Concat(Regex.Matches(publicationTitle, "[A-z]* *")).ToLower().Replace(' ', '_');
+		string requestUrl = $"https://mangakatana.com/?search={sanitizedTitle}&search_by=book_name";
+		DownloadClient.RequestResult requestResult =
+			downloadClient.MakeRequest(requestUrl, (byte)1);
+		if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
+			return Array.Empty<Publication>();
+
+		return ParsePublicationsFromHtml(requestResult.result);
+	}
+
+	private Publication[] ParsePublicationsFromHtml(Stream html)
+	{
+		StreamReader reader = new(html);
+		string htmlString = reader.ReadToEnd();
+		HtmlDocument document = new();
+		document.LoadHtml(htmlString);
+		IEnumerable<HtmlNode> searchResults = document.DocumentNode.SelectNodes("//*[@id='book_list']/div");
+		List<string> urls = new();
+		foreach (HtmlNode mangaResult in searchResults)
+		{
+			urls.Add(mangaResult.Descendants("a").First().GetAttributes()
+				.First(a => a.Name == "href").Value);
+		}
+
+		HashSet<Publication> ret = new();
+		foreach (string url in urls)
+		{
+			DownloadClient.RequestResult requestResult =
+				downloadClient.MakeRequest(url, (byte)1);
+			if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
+				return Array.Empty<Publication>();
+
+			ret.Add(ParseSinglePublicationFromHtml(requestResult.result, url.Split('/')[^1]));
+		}
+
+		return ret.ToArray();
+	}
+
+	private Publication ParseSinglePublicationFromHtml(Stream html, string publicationId)
+	{
+		StreamReader reader = new(html);
+		string htmlString = reader.ReadToEnd();
+		HtmlDocument document = new();
+		document.LoadHtml(htmlString);
+		string status = "";
+		Dictionary<string, string> altTitles = new();
+		Dictionary<string, string>? links = null;
+		HashSet<string> tags = new();
+		string[] authors = Array.Empty<string>();
+		string originalLanguage = "";
+
+		HtmlNode infoNode = document.DocumentNode.SelectSingleNode("//*[@id='single_book']");
+		string sortName = infoNode.Descendants("h1").First(n => n.HasClass("heading")).InnerText;
+		HtmlNode infoTable = infoNode.SelectSingleNode("//*[@id='single_book']/div[2]/div/ul");
+
+		foreach (HtmlNode row in infoTable.Descendants("li"))
+		{
+			string key = row.SelectNodes("div").First().InnerText.ToLower();
+			string value = row.SelectNodes("div").Last().InnerText;
+			string keySanitized = string.Concat(Regex.Matches(key, "[a-z]"));
+
+			switch (keySanitized)
+			{
+				case "altnames":
+					string[] alts = value.Split(" ; ");
+					for (int i = 0; i < alts.Length; i++)
+						altTitles.Add(i.ToString(), alts[i]);
+					break;
+				case "authorsartists":
+					authors = value.Split(',');
+					break;
+				case "status":
+					status = value;
+					break;
+				case "genres":
+					tags = row.SelectNodes("div").Last().Descendants("a").Select(a => a.InnerText).ToHashSet();
+					break;
+				default: break;
+			}
+		}
+
+		string posterUrl = document.DocumentNode.SelectSingleNode("//*[@id='single_book']/div[1]/div").Descendants("img").First()
+			.GetAttributes().First(a => a.Name == "src").Value;
+
+		string coverFileNameInCache = SaveCoverImageToCache(posterUrl, 1);
+
+		string description = document.DocumentNode.SelectSingleNode("//*[@id='single_book']/div[3]/p").InnerText;
+		while (description.StartsWith('\n'))
+			description = description.Substring(1);
+
+		string yearString = infoTable.Descendants("div").First(d => d.HasClass("updateAt"))
+			.InnerText.Split('-')[^1];
+		int year = Convert.ToInt32(yearString);
+
+		return new Publication(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
+			year, originalLanguage, status, publicationId);
+	}
+
+	public override Chapter[] GetChapters(Publication publication, string language = "")
+	{
+		logger?.WriteLine(this.GetType().ToString(), $"Getting Chapters for {publication.sortName} {publication.internalId} (language={language})");
+		string requestUrl = $"https://mangakatana.com/manga/{publication.publicationId}";
+		// Leaving this in for verification if the page exists
+		DownloadClient.RequestResult requestResult =
+			downloadClient.MakeRequest(requestUrl, (byte)1);
+		if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
+			return Array.Empty<Chapter>();
+
+		//Return Chapters ordered by Chapter-Number
+		NumberFormatInfo chapterNumberFormatInfo = new()
+		{
+			NumberDecimalSeparator = "."
+		};
+		List<Chapter> chapters = ParseChaptersFromHtml(publication, requestUrl);
+		logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
+		return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
+	}
+
+	private List<Chapter> ParseChaptersFromHtml(Publication publication, string mangaUrl)
+	{
+		// Using HtmlWeb will include the chapters since they are loaded with js 
+		HtmlWeb web = new();
+		HtmlDocument document = web.Load(mangaUrl);
+
+		List<Chapter> ret = new();
+
+		HtmlNode chapterList = document.DocumentNode.SelectSingleNode("//div[contains(@class, 'chapters')]/table/tbody");
+
+		foreach (HtmlNode chapterInfo in chapterList.Descendants("tr"))
+		{
+			string fullString = chapterInfo.Descendants("a").First().InnerText;
+
+			string? volumeNumber = fullString.Contains("Vol.") ? fullString.Replace("Vol.", "").Split(' ')[0] : null;
+			string? chapterNumber = fullString.Split(':')[0].Split("Chapter ")[1].Replace('-', '.');
+			string chapterName = string.Concat(fullString.Split(':')[1..]);
+			string url = chapterInfo.Descendants("a").First()
+				.GetAttributeValue("href", "");
+			ret.Add(new Chapter(publication, chapterName, volumeNumber, chapterNumber, url));
+		}
+		
+		return ret;
+	}
+
+	public override HttpStatusCode DownloadChapter(Publication publication, Chapter chapter, DownloadChapterTask parentTask, CancellationToken? cancellationToken = null)
+	{
+		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;
+		// Leaving this in to check if the page exists
+		DownloadClient.RequestResult requestResult =
+			downloadClient.MakeRequest(requestUrl, (byte)1);
+		if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
+			return requestResult.statusCode;
+
+		string[] imageUrls = ParseImageUrlsFromHtml(requestUrl);
+
+		string comicInfoPath = Path.GetTempFileName();
+		File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
+
+		return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), (byte)1, parentTask, comicInfoPath, "https://mangakatana.com/", cancellationToken);
+	}
+
+	private string[] ParseImageUrlsFromHtml(string mangaUrl)
+	{
+		HtmlWeb web = new();
+		HtmlDocument document = web.Load(mangaUrl);
+
+		// Images are loaded dynamically, but the urls are present in a piece of js code on the page
+		string js = document.DocumentNode.SelectSingleNode("//script[contains(., 'data-src')]").InnerText
+			.Replace("\r", "")
+			.Replace("\n", "")
+			.Replace("\t", "");
+		string regexPat = @"(var thzq=\[')(.*)(,];function)";
+		var group = Regex.Matches(js, regexPat).First().Groups[2].Value.Replace("'", "");
+		var urls = group.Split(',');
+		
+		return urls;
+	}
+}

Tranga/Connectors/Manganato.cs

@@ -11,7 +11,7 @@ public class Manganato : Connector
 {
     public override string name { get; }
     
-    public Manganato(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation, imageCachePath, logger)
+    public Manganato(TrangaSettings settings, Logger? logger = null) : base(settings, logger)
     {
         this.name = "Manganato";
         this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
@@ -139,12 +139,12 @@ public class Manganato : Connector
         {
             NumberDecimalSeparator = "."
         };
-        List<Chapter> chapters = ParseChaptersFromHtml(requestResult.result);
+        List<Chapter> chapters = ParseChaptersFromHtml(publication, requestResult.result);
         logger?.WriteLine(this.GetType().ToString(), $"Done getting Chapters for {publication.internalId}");
         return chapters.OrderBy(chapter => Convert.ToSingle(chapter.chapterNumber, chapterNumberFormatInfo)).ToArray();
     }
 
-    private List<Chapter> ParseChaptersFromHtml(Stream html)
+    private List<Chapter> ParseChaptersFromHtml(Publication publication, Stream html)
     {
         StreamReader reader = new (html);
         string htmlString = reader.ReadToEnd();
@@ -163,7 +163,7 @@ public class Manganato : Connector
             string chapterName = string.Concat(fullString.Split(':')[1..]);
             string url = chapterInfo.Descendants("a").First(d => d.HasClass("chapter-name"))
                 .GetAttributeValue("href", "");
-            ret.Add(new Chapter(chapterName, volumeNumber, chapterNumber, url));
+            ret.Add(new Chapter(publication, chapterName, volumeNumber, chapterNumber, url));
         }
         ret.Reverse();
         return ret;
@@ -183,9 +183,9 @@ public class Manganato : Connector
         string[] imageUrls = ParseImageUrlsFromHtml(requestResult.result);
         
         string comicInfoPath = Path.GetTempFileName();
-        File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
+        File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
         
-        return DownloadChapterImages(imageUrls, GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, "https://chapmanganato.com/", cancellationToken);
+        return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), (byte)1, parentTask, comicInfoPath, "https://chapmanganato.com/", cancellationToken);
     }
 
     private string[] ParseImageUrlsFromHtml(Stream html)

Tranga/Connectors/Mangasee.cs

@@ -16,8 +16,7 @@ public class Mangasee : Connector
     private IBrowser? _browser = null;
     private const string ChromiumVersion = "1154303";
 
-    public Mangasee(string downloadLocation, string imageCachePath, Logger? logger) : base(downloadLocation,
+    public Mangasee(TrangaSettings settings, Logger? logger = null) : base(settings, logger)
-        imageCachePath, logger)
     {
         this.name = "Mangasee";
         this.downloadClient = new DownloadClient(new Dictionary<byte, int>()
@@ -197,7 +196,7 @@ public class Mangasee : Connector
 
             string url = chapter.Descendants("link").First().Value;
             url = url.Replace(Regex.Matches(url,"(-page-[0-9])")[0].ToString(),"");
-            ret.Add(new Chapter("", volumeNumber, chapterNumber, url));
+            ret.Add(new Chapter(publication, "", volumeNumber, chapterNumber, url));
         }
 
         //Return Chapters ordered by Chapter-Number
@@ -236,9 +235,9 @@ public class Mangasee : Connector
                 urls.Add(galleryImage.GetAttributeValue("src", ""));
             
             string comicInfoPath = Path.GetTempFileName();
-            File.WriteAllText(comicInfoPath, GetComicInfoXmlString(publication, chapter, logger));
+            File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
         
-            return DownloadChapterImages(urls.ToArray(), GetArchiveFilePath(publication, chapter), (byte)1, parentTask, comicInfoPath, cancellationToken:cancellationToken);
+            return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), (byte)1, parentTask, comicInfoPath, cancellationToken:cancellationToken);
         }
         return response.Status;
     }

Tranga/NotificationManagers/LunaSea.cs

@@ -6,18 +6,18 @@ namespace Tranga.NotificationManagers;
 
 public class LunaSea : NotificationManager
 {
-    public string webhook { get; }
+    public string id { get; }
     private readonly HttpClient _client = new();
-    public LunaSea(string webhook, Logger? logger = null) : base(NotificationManagerType.LunaSea, logger)
+    public LunaSea(string id, Logger? logger = null) : base(NotificationManagerType.LunaSea, logger)
     {
-        this.webhook = webhook;
+        this.id = id;
     }
 
     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);
+        HttpRequestMessage request = new(HttpMethod.Post, $"https://notify.lunasea.app/v1/custom/{id}");
         request.Content = new StringContent(JsonConvert.SerializeObject(message, Formatting.None), Encoding.UTF8, "application/json");
         HttpResponseMessage response = _client.Send(request);
         if (!response.IsSuccessStatusCode)

Tranga/TaskManager.cs

@@ -13,21 +13,21 @@ public class TaskManager
 {
     public Dictionary<Publication, List<Chapter>> chapterCollection = new();
     private HashSet<TrangaTask> _allTasks = new();
+    private readonly Dictionary<TrangaTask, CancellationTokenSource> _runningTasks = new ();
     private bool _continueRunning = true;
     private readonly Connector[] _connectors;
     public TrangaSettings settings { get; }
     private Logger? logger { get; }
 
-    private readonly Dictionary<DownloadChapterTask, CancellationTokenSource> _runningDownloadChapterTasks = new();
-
     public TaskManager(TrangaSettings settings, Logger? logger = null)
     {
         this.logger = logger;
         this._connectors = new Connector[]
         {
-            new MangaDex(settings.downloadLocation, settings.coverImageCache, logger),
+            new MangaDex(settings, logger),
-            new Manganato(settings.downloadLocation, settings.coverImageCache, logger),
+            new Manganato(settings, logger),
-            new Mangasee(settings.downloadLocation, settings.coverImageCache, logger)
+            new Mangasee(settings, logger),
+            new MangaKatana(settings, logger)
         };
         
         this.settings = settings;
@@ -82,21 +82,20 @@ public class TaskManager
                 }
             }
 
-            TrangaTask[] failedDownloadChapterTasks = _allTasks.Where(taskQuery =>
+            foreach (TrangaTask timedOutTask in _allTasks
-                taskQuery.state is TrangaTask.ExecutionState.Failed && taskQuery is DownloadChapterTask).ToArray();
+                         .Where(taskQuery => taskQuery.lastChange < DateTime.Now.Subtract(TimeSpan.FromMinutes(3))))
-            foreach (TrangaTask failedDownloadChapterTask in failedDownloadChapterTasks)
             {
-                DeleteTask(failedDownloadChapterTask);
+                _runningTasks[timedOutTask].Cancel();
-                TrangaTask newTask = failedDownloadChapterTask.Clone();
+                timedOutTask.state = TrangaTask.ExecutionState.Failed;
-                failedDownloadChapterTask.parentTask?.AddChildTask(newTask);
-                AddTask(newTask);
             }
             
-            TrangaTask[] successfulDownloadChapterTasks = _allTasks.Where(taskQuery =>
+            foreach (TrangaTask failedTask in _allTasks.Where(taskQuery =>
-                taskQuery.state is TrangaTask.ExecutionState.Success && taskQuery is DownloadChapterTask).ToArray();
+                         taskQuery.state is TrangaTask.ExecutionState.Failed).ToArray())
-            foreach(TrangaTask successfulDownloadChapterTask in successfulDownloadChapterTasks)
             {
-                DeleteTask(successfulDownloadChapterTask);
+                DeleteTask(failedTask);
+                TrangaTask newTask = failedTask.Clone();
+                failedTask.parentTask?.AddChildTask(newTask);
+                AddTask(newTask);
             }
             
             if(waitingTasksCount != _allTasks.Count(task => task.state is TrangaTask.ExecutionState.Waiting))
@@ -118,57 +117,70 @@ public class TaskManager
         {
             task.Execute(this, this.logger, cToken.Token);
         }, cToken.Token);
-        if(task is DownloadChapterTask chapterTask)
+        _runningTasks.Add(task, cToken);
-            _runningDownloadChapterTasks.Add(chapterTask, cToken);
         t.Start();
     }
 
     public void AddTask(TrangaTask newTask)
     {
-        logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
-
         switch (newTask.task)
         {
             case TrangaTask.Task.UpdateLibraries:
                 //Only one UpdateKomgaLibrary Task
                 logger?.WriteLine(this.GetType().ToString(), $"Replacing old {newTask.task}-Task.");
-                _allTasks.RemoveWhere(trangaTask => trangaTask.task is TrangaTask.Task.UpdateLibraries);
+                if (GetTasksMatching(newTask).FirstOrDefault() is { } exists)
+                    _allTasks.Remove(exists);
                 _allTasks.Add(newTask);
+                ExportDataAndSettings();
                 break;
-            case TrangaTask.Task.MonitorPublication:
+            default:
-                if (!_allTasks.Any(mTask => mTask is MonitorPublicationTask mpt && newTask is MonitorPublicationTask nMpt &&
+                if (!GetTasksMatching(newTask).Any())
-                                            mpt.publication.internalId == nMpt.publication.internalId &&
+                {
-                                            mpt.connectorName == nMpt.connectorName))
+                    logger?.WriteLine(this.GetType().ToString(), $"Adding new Task {newTask}");
-                    _allTasks.Add(newTask);
-                else
-                    logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
-                break;
-            case TrangaTask.Task.DownloadChapter:
-                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);
+                    ExportDataAndSettings();
+                }
                 else
                     logger?.WriteLine(this.GetType().ToString(), $"Task already exists {newTask}");
                 break;
         }
-        ExportDataAndSettings();
     }
 
     public void DeleteTask(TrangaTask removeTask)
     {
         logger?.WriteLine(this.GetType().ToString(), $"Removing Task {removeTask}");
-        _allTasks.Remove(removeTask);
+        if(_allTasks.Contains(removeTask))
+            _allTasks.Remove(removeTask);
         removeTask.parentTask?.RemoveChildTask(removeTask);
-        if (removeTask is DownloadChapterTask cRemoveTask && _runningDownloadChapterTasks.ContainsKey(cRemoveTask))
+        if (_runningTasks.ContainsKey(removeTask))
         {
-            _runningDownloadChapterTasks[cRemoveTask].Cancel();
+            _runningTasks[removeTask].Cancel();
-            _runningDownloadChapterTasks.Remove(cRemoveTask);
+            _runningTasks.Remove(removeTask);
         }
+        foreach(TrangaTask childTask in removeTask.childTasks)
+            DeleteTask(childTask);
+        ExportDataAndSettings();
     }
 
-    public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterSortNumber = null)
+    public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask mTask)
+    {
+        switch (mTask.task)
+        {
+            case TrangaTask.Task.UpdateLibraries:
+                return GetTasksMatching(TrangaTask.Task.UpdateLibraries);
+            case TrangaTask.Task.DownloadChapter:
+                DownloadChapterTask dct = (DownloadChapterTask)mTask;
+                return GetTasksMatching(TrangaTask.Task.DownloadChapter, connectorName: dct.connectorName,
+                    internalId: dct.publication.internalId);
+            case TrangaTask.Task.MonitorPublication:
+                MonitorPublicationTask mpt = (MonitorPublicationTask)mTask;
+                return GetTasksMatching(TrangaTask.Task.MonitorPublication, connectorName: mpt.connectorName,
+                    internalId: mpt.publication.internalId);
+        }
+        return Array.Empty<TrangaTask>();
+    }
+
+    public IEnumerable<TrangaTask> GetTasksMatching(TrangaTask.Task taskType, string? connectorName = null, string? searchString = null, string? internalId = null, string? chapterNumber = null)
     {
         switch (taskType)
         {
@@ -204,12 +216,12 @@ public class TaskManager
                         mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
                         dct.ToString().Contains(searchString, StringComparison.InvariantCultureIgnoreCase));
                 }
-                else if (internalId is not null && chapterSortNumber is not null)
+                else if (internalId is not null && chapterNumber is not null)
                 {
                     return _allTasks.Where(mTask =>
                         mTask is DownloadChapterTask dct && dct.connectorName == connectorName &&
-                        dct.publication.publicationId == internalId &&
+                        dct.publication.internalId == internalId &&
-                        dct.chapter.sortNumber == chapterSortNumber);
+                        dct.chapter.chapterNumber == chapterNumber);
                 }
                 else
                     return _allTasks.Where(mTask =>
@@ -285,7 +297,7 @@ public class TaskManager
         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();
+        newChaptersList = newChapters.Where(nChapter => !nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
         
         return newChaptersList;
     }
@@ -293,7 +305,7 @@ public class TaskManager
     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();
+        return newChapters.Where(nChapter => nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
     }
 
     /// <summary>
@@ -342,17 +354,16 @@ public class TaskManager
             this._allTasks = JsonConvert.DeserializeObject<HashSet<TrangaTask>>(buffer, new JsonSerializerSettings() { Converters = { new TrangaTask.TrangaTaskJsonConverter() } })!;
         }
 
-        foreach (TrangaTask task in this._allTasks.Where(tTask => tTask.parentTaskId is not null))
+        foreach (TrangaTask task in this._allTasks.Where(tTask => tTask.parentTaskId is not null).ToArray())
         {
             TrangaTask? parentTask = this._allTasks.FirstOrDefault(pTask => pTask.taskId == task.parentTaskId);
             if (parentTask is not null)
             {
-                task.parentTask = parentTask;
+                this.DeleteTask(task);
-                parentTask.AddChildTask(task);
+                parentTask.lastExecuted = DateTime.UnixEpoch;
             }
         }
         
-
         if (File.Exists(settings.knownPublicationsPath))
         {
             logger?.WriteLine(this.GetType().ToString(), $"Importing known publications from {settings.knownPublicationsPath}");
@@ -369,9 +380,7 @@ public class TaskManager
     private void ExportDataAndSettings()
     {
         logger?.WriteLine(this.GetType().ToString(), $"Exporting settings to {settings.settingsFilePath}");
-        while(IsFileInUse(settings.settingsFilePath))
+        settings.ExportSettings();
-            Thread.Sleep(50);
-        File.WriteAllText(settings.settingsFilePath, JsonConvert.SerializeObject(settings));
         
         logger?.WriteLine(this.GetType().ToString(), $"Exporting tasks to {settings.tasksFilePath}");
         while(IsFileInUse(settings.tasksFilePath))

Tranga/TrangaSettings.cs

@@ -1,4 +1,5 @@
-using Logging;
+using System.Text.RegularExpressions;
+using Logging;
 using Newtonsoft.Json;
 using Tranga.LibraryManagers;
 using Tranga.NotificationManagers;
@@ -43,6 +44,29 @@ public class TrangaSettings
         return settings;
     }
 
+    public void ExportSettings()
+    {
+        if (File.Exists(settingsFilePath))
+        {
+            bool inUse = true;
+            while (inUse)
+            {
+                try
+                {
+                    using FileStream stream = new (settingsFilePath, FileMode.Open, FileAccess.Read, FileShare.None);
+                    stream.Close();
+                    inUse = false;
+                }
+                catch (IOException)
+                {
+                    inUse = true;
+                    Thread.Sleep(50);
+                }
+            }
+        }
+        File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(this));
+    }
+
     public void UpdateSettings(UpdateField field, Logger? logger = null, params string[] values) 
     {
         switch (field)
@@ -81,6 +105,7 @@ public class TrangaSettings
                 newLunaSea.SendNotification("Success!", "LunaSea was added to Tranga!");
                 break;
         }
+        ExportSettings();
     }
     
     public enum UpdateField { DownloadLocation, Komga, Kavita, Gotify, LunaSea}

Tranga/TrangaTask.cs

@@ -22,14 +22,14 @@ public abstract class TrangaTask
     public DateTime lastExecuted { get; set; }
     [Newtonsoft.Json.JsonIgnore] public ExecutionState state { get; set; }
     public Task task { get; }
-    public string taskId { get; }
+    public string taskId { get; init; }
     [Newtonsoft.Json.JsonIgnore] public TrangaTask? parentTask { get; set; }
     public string? parentTaskId { get; set; }
-    [Newtonsoft.Json.JsonIgnore] protected HashSet<TrangaTask> childTasks { get; }
+    [Newtonsoft.Json.JsonIgnore] internal HashSet<TrangaTask> childTasks { get; }
     public double progress => GetProgress();
     [Newtonsoft.Json.JsonIgnore]public DateTime executionStarted { get; private set; }
-    [Newtonsoft.Json.JsonIgnore]public DateTime lastChange { get; private set; }
+    [Newtonsoft.Json.JsonIgnore]public DateTime lastChange { get; internal set; }
-    [Newtonsoft.Json.JsonIgnore]public DateTime executionApproximatelyFinished => progress != 0 ? lastChange.Add(GetRemainingTime()) : DateTime.MaxValue;
+    [Newtonsoft.Json.JsonIgnore]public DateTime executionApproximatelyFinished => lastChange.Add(GetRemainingTime());
     public TimeSpan executionApproximatelyRemaining => executionApproximatelyFinished.Subtract(DateTime.Now);
     [Newtonsoft.Json.JsonIgnore]public DateTime nextExecution => lastExecuted.Add(reoccurrence);
 
@@ -72,25 +72,47 @@ public abstract class TrangaTask
         this.state = ExecutionState.Running;
         this.executionStarted = DateTime.Now;
         this.lastChange = DateTime.Now;
+        if(parentTask is not null && parentTask.childTasks.All(ct => ct.state is ExecutionState.Waiting or ExecutionState.Failed))
+            parentTask.executionStarted = DateTime.Now;
+        
         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 && parentTask is null)
+            foreach(NotificationManager nm in taskManager.settings.notificationManagers)
+                switch (this.task)
+                {
+                    case Task.MonitorPublication:
+                        MonitorPublicationTask mpt = (MonitorPublicationTask)this;
+                        nm.SendNotification("Downloaded new chapters",
+                            $"{mpt.publication.sortName}: {this.childTasks.Count(ct => ct.state is ExecutionState.Success)} new chapters.");
+                        break;
+                    case Task.DownloadChapter:
+                        DownloadChapterTask dct = (DownloadChapterTask)this;
+                        nm.SendNotification("Chapter downloaded", $"{dct.publication.sortName} {dct.chapter.chapterNumber} {dct.chapter.name}");
+                        break;
+                }
+
+        
         if ((int)statusCode >= 200 && (int)statusCode < 300)
         {
             this.lastExecuted = DateTime.Now;
-            if (this is DownloadChapterTask)
+            if(this is DownloadChapterTask)
                 this.state = ExecutionState.Success;
             else
                 this.state = ExecutionState.Waiting;
         }
         else
         {
-            if (this is DownloadChapterTask && statusCode == HttpStatusCode.NotFound)
+            this.state = ExecutionState.Failed;
-                this.state = ExecutionState.Success;
-            else
-                this.state = ExecutionState.Failed;
             this.lastExecuted = DateTime.MaxValue;
         }
+
+        foreach (TrangaTask childTask in this.childTasks.Where(ct => ct is DownloadChapterTask).ToArray())
+            taskManager.DeleteTask(childTask);
+        
         logger?.WriteLine(this.GetType().ToString(), $"Finished Executing Task {this}");
     }
 
@@ -106,10 +128,10 @@ public abstract class TrangaTask
 
     private TimeSpan GetRemainingTime()
     {
-        if(progress == 0 || lastChange == DateTime.MaxValue || executionStarted == DateTime.UnixEpoch)
+        if(progress == 0 || state is ExecutionState.Enqueued or ExecutionState.Waiting or ExecutionState.Failed || lastChange == DateTime.MaxValue)
-            return TimeSpan.Zero;
+            return DateTime.MaxValue.Subtract(lastChange).Subtract(TimeSpan.FromHours(1));
         TimeSpan elapsed = lastChange.Subtract(executionStarted);
-        return elapsed.Divide(progress).Subtract(elapsed);
+        return elapsed.Divide(progress).Multiply(1 - progress);
     }
 
     public enum Task : byte
@@ -117,7 +139,6 @@ public abstract class TrangaTask
         MonitorPublication = 2,
         UpdateLibraries = 3,
         DownloadChapter = 4,
-        DownloadNewChapters = 2 //legacy
     }
 
     public override string ToString()

Tranga/TrangaTasks/DownloadChapterTask.cs

@@ -27,9 +27,6 @@ public class DownloadChapterTask : TrangaTask
         Connector connector = taskManager.GetConnector(this.connectorName);
         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;
     }
 
@@ -47,6 +44,9 @@ public class DownloadChapterTask : TrangaTask
     internal void IncrementProgress(double amount)
     {
         this._dctProgress += amount;
+        this.lastChange = DateTime.Now;
+        if(this.parentTask is not null)
+            this.parentTask.lastChange = DateTime.Now;
     }
 
     public override string ToString()

Tranga/TrangaTasks/MonitorPublicationTask.cs

@@ -27,7 +27,7 @@ public class MonitorPublicationTask : TrangaTask
 
         connector.CopyCoverFromCacheToDownloadLocation(publication, taskManager.settings);
         
-        publication.SaveSeriesInfoJson(connector.downloadLocation);
+        publication.SaveSeriesInfoJson(taskManager.settings.downloadLocation);
 
         foreach (Chapter newChapter in newChapters)
         {

Website/apiConnector.js

@@ -84,7 +84,7 @@ async function GetRunningTasks(){
 }
 
 async function GetDownloadTasks(){
-    var uri = apiUri + "/Tasks?taskType=DownloadNewChapters";
+    var uri = apiUri + "/Tasks?taskType=MonitorPublication";
     let json = await GetData(uri);
     return json;
 }

Website/index.html

@@ -142,7 +142,7 @@
             <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">
+              <label for="lunaseaWebhook"></label><input placeholder="device/:id or user/:id" 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">

Website/interaction.js

@@ -195,13 +195,13 @@ function DownloadChapterTaskClick(){
 
 function DeleteTaskClick(){
     taskToDelete = tasks.filter(tTask => tTask.publication.internalId === toEditId)[0];
-    DeleteTask("DownloadNewChapters", taskToDelete.connectorName, toEditId);
+    DeleteTask("MonitorPublication", taskToDelete.connectorName, toEditId);
     HidePublicationPopup();
 }
 
 function StartTaskClick(){
     var toEditTask = tasks.filter(task => task.publication.internalId == toEditId)[0];
-    StartTask("DownloadNewChapters", toEditTask.connectorName, toEditId);
+    StartTask("MonitorPublication", toEditTask.connectorName, toEditId);
     HidePublicationPopup();
 }