Merge pull request #230 from C9Glax/cuttingedge-merge-candidate

Cuttingedge merge candidate

.github/workflows/docker-base.yml

@@ -31,7 +31,7 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push base
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile-base

.github/workflows/docker-image-cuttingedge.yml

@@ -33,7 +33,7 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push API
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-image-dev.yml

@@ -33,7 +33,7 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push API
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-image-master.yml

@@ -33,7 +33,7 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push API
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile

.github/workflows/docker-image-serverv2.yml

@@ -33,7 +33,7 @@ jobs:
       
       # https://github.com/docker/build-push-action#multi-platform-image
       - name: Build and push API
-        uses: docker/build-push-action@v6.6.1
+        uses: docker/build-push-action@v6.7.0
         with:
           context: ./
           file: ./Dockerfile

CLI/Program.cs

@@ -47,37 +47,18 @@ internal sealed class TrangaCli : Command<TrangaCli.Settings>
         string? logFolderPath = settings.fileLoggerPath ?? "";
         Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, logFolderPath);
         
-        TrangaSettings? trangaSettings = null;
+        if(settings.workingDirectory is not null)
-
+            TrangaSettings.LoadFromWorkingDirectory(settings.workingDirectory);
-        if (settings.downloadLocation is not null && settings.workingDirectory is not null)
-        {
-            trangaSettings = new TrangaSettings(settings.downloadLocation, settings.workingDirectory);
-        }else if (settings.downloadLocation is not null)
-        {
-            if (trangaSettings is null)
-                trangaSettings = new TrangaSettings(downloadLocation: settings.downloadLocation);
         else
-                trangaSettings = new TrangaSettings(downloadLocation: settings.downloadLocation, settings.workingDirectory);
+            TrangaSettings.CreateOrUpdate();
-        }else if (settings.workingDirectory is not null)
+        if(settings.downloadLocation is not null)
-        {
+            TrangaSettings.CreateOrUpdate(downloadDirectory: settings.downloadLocation);
-            if (trangaSettings is null)
-                trangaSettings = new TrangaSettings(downloadLocation: settings.workingDirectory);
-            else
-                trangaSettings = new TrangaSettings(settings.downloadLocation, settings.workingDirectory);
-        }
-        else
-        {
-            trangaSettings = new TrangaSettings();
-        }
-
-        Directory.CreateDirectory(trangaSettings.downloadLocation);
-        Directory.CreateDirectory(trangaSettings.workingDirectory);
 
         Tranga.Tranga? api = null;
 
         Thread trangaApi = new Thread(() =>
         {
-            api = new(logger, trangaSettings);
+            api = new(logger);
         });
         trangaApi.Start();
         
@@ -120,7 +101,7 @@ internal sealed class TrangaCli : Command<TrangaCli.Settings>
                         parameters.Add(new ValueTuple<string, string>(name, value));
                     }
 
-                    string requestString = $"http://localhost:{trangaSettings.apiPortNumber}/{requestPath}";
+                    string requestString = $"http://localhost:{TrangaSettings.apiPortNumber}/{requestPath}";
                     if (parameters.Any())
                     {
                         requestString += "?";

README.md

@@ -50,6 +50,8 @@ Tranga can download Chapters and Metadata from "Scanlation" sites such as
 - [Mangaworld.bz](https://www.mangaworld.bz/) (it)
 - [Bato.to](https://bato.to/v3x) (en)
 - [Manga4Life](https://manga4life.com) (en)
+- [ManhuaPlus](https://manhuaplus.org/) (en)
+- [MangaHere](https://www.mangahere.cc/) (en) (Their covers suck)
 - ❓ Open an [issue](https://github.com/C9Glax/tranga/issues)
 
 and trigger a library-scan with [Komga](https://komga.org/) and [Kavita](https://www.kavitareader.com/).  

Tranga/Chapter.cs

@@ -87,15 +87,15 @@ public readonly struct Chapter : IComparable
     /// Checks if a chapter-archive is already present
     /// </summary>
     /// <returns>true if chapter is present</returns>
-    internal bool CheckChapterIsDownloaded(string downloadLocation)
+    internal bool CheckChapterIsDownloaded()
     {
-        if (!Directory.Exists(Path.Join(downloadLocation, parentManga.folderName)))
+        if (!Directory.Exists(Path.Join(TrangaSettings.downloadLocation, parentManga.folderName)))
             return false;
-        FileInfo[] archives = new DirectoryInfo(Path.Join(downloadLocation, parentManga.folderName)).GetFiles().Where(file => file.Name.Split('.')[^1] == "cbz").ToArray();
+        FileInfo[] archives = new DirectoryInfo(Path.Join(TrangaSettings.downloadLocation, parentManga.folderName)).GetFiles().Where(file => file.Name.Split('.')[^1] == "cbz").ToArray();
         Regex volChRex = new(@"(?:Vol(?:ume)?\.([0-9]+)\D*)?Ch(?:apter)?\.([0-9]+(?:\.[0-9]+)*)");
 
         Chapter t = this;
-        string thisPath = GetArchiveFilePath(downloadLocation);
+        string thisPath = GetArchiveFilePath();
         FileInfo? archive = archives.FirstOrDefault(archive =>
         {
             Match m = volChRex.Match(archive.Name);
@@ -112,9 +112,9 @@ public readonly struct Chapter : IComparable
     /// Creates full file path of chapter-archive
     /// </summary>
     /// <returns>Filepath</returns>
-    internal string GetArchiveFilePath(string downloadLocation)
+    internal string GetArchiveFilePath()
     {
-        return Path.Join(downloadLocation, parentManga.folderName, $"{parentManga.folderName} - {this.fileName}.cbz");
+        return Path.Join(TrangaSettings.downloadLocation, parentManga.folderName, $"{parentManga.folderName} - {this.fileName}.cbz");
     }
 
     /// <summary>

Tranga/GlobalBase.cs

@@ -11,7 +11,6 @@ public abstract class GlobalBase
 {
     [JsonIgnore]
     public Logger? logger { get; init; }
-    protected TrangaSettings settings { get; init; }
     protected HashSet<NotificationConnector> notificationConnectors { get; init; }
     protected HashSet<LibraryConnector> libraryConnectors { get; init; }
     private Dictionary<string, Manga> cachedPublications { get; init; }
@@ -21,18 +20,16 @@ public abstract class GlobalBase
     protected GlobalBase(GlobalBase clone)
     {
         this.logger = clone.logger;
-        this.settings = clone.settings;
         this.notificationConnectors = clone.notificationConnectors;
         this.libraryConnectors = clone.libraryConnectors;
         this.cachedPublications = clone.cachedPublications;
     }
 
-    protected GlobalBase(Logger? logger, TrangaSettings settings)
+    protected GlobalBase(Logger? logger)
     {
         this.logger = logger;
-        this.settings = settings;
+        this.notificationConnectors = TrangaSettings.LoadNotificationConnectors(this);
-        this.notificationConnectors = settings.LoadNotificationConnectors(this);
+        this.libraryConnectors = TrangaSettings.LoadLibraryConnectors(this);
-        this.libraryConnectors = settings.LoadLibraryConnectors(this);
         this.cachedPublications = new();
     }
 
@@ -81,20 +78,20 @@ public abstract class GlobalBase
         notificationConnectors.RemoveWhere(nc => nc.notificationConnectorType == notificationConnector.notificationConnectorType);
         notificationConnectors.Add(notificationConnector);
         
-        while(IsFileInUse(settings.notificationConnectorsFilePath))
+        while(IsFileInUse(TrangaSettings.notificationConnectorsFilePath))
             Thread.Sleep(100);
         Log("Exporting notificationConnectors");
-        File.WriteAllText(settings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
+        File.WriteAllText(TrangaSettings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
     }
 
     protected void DeleteNotificationConnector(NotificationConnector.NotificationConnectorType notificationConnectorType)
     {
         Log($"Removing {notificationConnectorType}");
         notificationConnectors.RemoveWhere(nc => nc.notificationConnectorType == notificationConnectorType);
-        while(IsFileInUse(settings.notificationConnectorsFilePath))
+        while(IsFileInUse(TrangaSettings.notificationConnectorsFilePath))
             Thread.Sleep(100);
         Log("Exporting notificationConnectors");
-        File.WriteAllText(settings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
+        File.WriteAllText(TrangaSettings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
     }
 
     protected void UpdateLibraries()
@@ -109,20 +106,20 @@ public abstract class GlobalBase
         libraryConnectors.RemoveWhere(lc => lc.libraryType == libraryConnector.libraryType);
         libraryConnectors.Add(libraryConnector);
         
-        while(IsFileInUse(settings.libraryConnectorsFilePath))
+        while(IsFileInUse(TrangaSettings.libraryConnectorsFilePath))
             Thread.Sleep(100);
         Log("Exporting libraryConnectors");
-        File.WriteAllText(settings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
+        File.WriteAllText(TrangaSettings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
     }
 
     protected void DeleteLibraryConnector(LibraryConnector.LibraryType libraryType)
     {
         Log($"Removing {libraryType}");
         libraryConnectors.RemoveWhere(lc => lc.libraryType == libraryType);
-        while(IsFileInUse(settings.libraryConnectorsFilePath))
+        while(IsFileInUse(TrangaSettings.libraryConnectorsFilePath))
             Thread.Sleep(100);
         Log("Exporting libraryConnectors");
-        File.WriteAllText(settings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
+        File.WriteAllText(TrangaSettings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
     }
 
     protected bool IsFileInUse(string filePath) => IsFileInUse(filePath, this.logger);

Tranga/Jobs/DownloadNewChapters.cs

@@ -33,7 +33,7 @@ public class DownloadNewChapters : Job
 
     protected override IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss)
     {
-        manga.SaveSeriesInfoJson(settings.downloadLocation);
+        manga.SaveSeriesInfoJson();
         Chapter[] chapters = mangaConnector.GetNewChapters(manga, this.translatedLanguage);
         this.progressToken.increments = chapters.Length;
         List<Job> jobs = new();

Tranga/Jobs/JobBoss.cs

@@ -140,15 +140,15 @@ public class JobBoss : GlobalBase
 
     private void LoadJobsList(HashSet<MangaConnector> connectors)
     {
-        if (!Directory.Exists(settings.jobsFolderPath)) //No jobs to load
+        if (!Directory.Exists(TrangaSettings.jobsFolderPath)) //No jobs to load
         {
-            Directory.CreateDirectory(settings.jobsFolderPath);
+            Directory.CreateDirectory(TrangaSettings.jobsFolderPath);
             return;
         }
         Regex idRex = new (@"(.*)\.json");
 
         //Load json-job-files
-        foreach (FileInfo file in new DirectoryInfo(settings.jobsFolderPath).EnumerateFiles().Where(fileInfo => idRex.IsMatch(fileInfo.Name)))
+        foreach (FileInfo file in new DirectoryInfo(TrangaSettings.jobsFolderPath).EnumerateFiles().Where(fileInfo => idRex.IsMatch(fileInfo.Name)))
         {
             Log($"Adding {file.Name}");
             Job? job = JsonConvert.DeserializeObject<Job>(File.ReadAllText(file.FullName),
@@ -180,14 +180,14 @@ public class JobBoss : GlobalBase
                 AddMangaToCache(dncJob.manga);
         }
 
-        string[] coverFiles = Directory.GetFiles(settings.coverImageCache);
+        string[] coverFiles = Directory.GetFiles(TrangaSettings.coverImageCache);
         foreach(string fileName in coverFiles.Where(fileName => !GetAllCachedManga().Any(manga => manga.coverFileNameInCache == fileName)))
                 File.Delete(fileName);
     }
 
     internal void UpdateJobFile(Job job, string? oldFile = null)
     {
-        string newJobFilePath = Path.Join(settings.jobsFolderPath, $"{job.id}.json");
+        string newJobFilePath = Path.Join(TrangaSettings.jobsFolderPath, $"{job.id}.json");
         
         if (!this.jobs.Any(jjob => jjob.id == job.id))
         {
@@ -234,7 +234,7 @@ public class JobBoss : GlobalBase
 
         //Remove files with jobs not in this.jobs-list
         Regex idRex = new (@"(.*)\.json");
-        foreach (FileInfo file in new DirectoryInfo(settings.jobsFolderPath).EnumerateFiles())
+        foreach (FileInfo file in new DirectoryInfo(TrangaSettings.jobsFolderPath).EnumerateFiles())
         {
             if (idRex.IsMatch(file.Name))
             {

Tranga/Jobs/UpdateMetadata.cs

@@ -34,7 +34,7 @@ public class UpdateMetadata : Job
             }
             
             this.manga = manga.WithMetadata(updatedManga);
-            this.manga.SaveSeriesInfoJson(settings.downloadLocation, true);
+            this.manga.SaveSeriesInfoJson(true);
             this.mangaConnector.CopyCoverFromCacheToDownloadLocation(manga);
             foreach (Job job in jobBoss.GetJobsLike(publication: this.manga))
             {

Tranga/Manga.cs

@@ -1,6 +1,7 @@
 using System.Runtime.InteropServices;
 using System.Text;
 using System.Text.RegularExpressions;
+using System.Web;
 using Newtonsoft.Json;
 using static System.IO.UnixFileMode;
 
@@ -51,18 +52,18 @@ public struct Manga
     [JsonConstructor]
     public Manga(string sortName, List<string> authors, string? description, Dictionary<string,string> altTitles, string[] tags, string? coverUrl, string? coverFileNameInCache, Dictionary<string,string>? links, int? year, string? originalLanguage, string publicationId, ReleaseStatusByte releaseStatus, string? websiteUrl = null, string? folderName = null, float? ignoreChaptersBelow = 0)
     {
-        this.sortName = sortName;
+        this.sortName = HttpUtility.HtmlDecode(sortName);
-        this.authors = authors;
+        this.authors = authors.Select(HttpUtility.HtmlDecode).ToList()!;
-        this.description = description;
+        this.description = HttpUtility.HtmlDecode(description);
-        this.altTitles = altTitles;
+        this.altTitles = altTitles.ToDictionary(a => HttpUtility.HtmlDecode(a.Key), a => HttpUtility.HtmlDecode(a.Value));
-        this.tags = tags;
+        this.tags = tags.Select(HttpUtility.HtmlDecode).ToArray()!;
         this.coverFileNameInCache = coverFileNameInCache;
         this.coverUrl = coverUrl;
         this.links = links ?? new Dictionary<string, string>();
         this.year = year;
         this.originalLanguage = originalLanguage;
         this.publicationId = publicationId;
-        this.folderName = folderName ?? string.Concat(LegalCharacters.Matches(sortName));
+        this.folderName = folderName ?? string.Concat(LegalCharacters.Matches(HttpUtility.HtmlDecode(sortName)));
         while (this.folderName.EndsWith('.'))
             this.folderName = this.folderName.Substring(0, this.folderName.Length - 1);
         string onlyLowerLetters = string.Concat(this.sortName.ToLower().Where(Char.IsLetter));
@@ -139,9 +140,9 @@ public struct Manga
         latestChapterDownloaded = latestChapterDownloaded < chapterNumber ? chapterNumber : latestChapterDownloaded;
     }
 
-    public void SaveSeriesInfoJson(string downloadDirectory, bool overwrite = false)
+    public void SaveSeriesInfoJson(bool overwrite = false)
     {
-        string publicationFolder = CreatePublicationFolder(downloadDirectory);
+        string publicationFolder = CreatePublicationFolder(TrangaSettings.downloadLocation);
         string seriesInfoPath = Path.Join(publicationFolder, "series.json");
         if(overwrite || (!overwrite && !File.Exists(seriesInfoPath)))
             File.WriteAllText(seriesInfoPath,this.GetSeriesInfoJson());

Tranga/MangaConnectors/Bato.cs

@@ -193,7 +193,7 @@ public class Bato : MangaConnector
 		string comicInfoPath = Path.GetTempFileName();
 		File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
 
-		return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
+		return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
 	}
 
 	private string[] ParseImageUrlsFromHtml(string mangaUrl)

Tranga/MangaConnectors/ChromiumDownloadClient.cs

@@ -1,8 +1,8 @@
 using System.Net;
 using System.Text;
+using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 using PuppeteerSharp;
-using PuppeteerSharp.Input;
 
 namespace Tranga.MangaConnectors;
 
@@ -11,10 +11,11 @@ internal class ChromiumDownloadClient : DownloadClient
     private IBrowser browser { get; set; }
     private const string ChromiumVersion = "1154303";
     private const int StartTimeoutMs = 30000;
+    private readonly HttpDownloadClient _httpDownloadClient;
     
     private async Task<IBrowser> DownloadBrowser()
     {
-        BrowserFetcher browserFetcher = new BrowserFetcher();
+        BrowserFetcher browserFetcher = new ();
         foreach(string rev in browserFetcher.LocalRevisions().Where(rev => rev != ChromiumVersion))
             browserFetcher.Remove(rev);
         if (!browserFetcher.LocalRevisions().Contains(ChromiumVersion))
@@ -58,9 +59,18 @@ internal class ChromiumDownloadClient : DownloadClient
     public ChromiumDownloadClient(GlobalBase clone) : base(clone)
     {
         this.browser = DownloadBrowser().Result;
+        _httpDownloadClient = new(this);
     }
 
-    protected override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
+    private readonly Regex _imageUrlRex = new(@"https?:\/\/.*\.(?:p?jpe?g|gif|a?png|bmp|avif|webp)(\?.*)?");
+    internal override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
+    {
+        return _imageUrlRex.IsMatch(url)
+            ? _httpDownloadClient.MakeRequestInternal(url, referrer)
+            : MakeRequestBrowser(url, referrer, clickButton);
+    }
+
+    private RequestResult MakeRequestBrowser(string url, string? referrer = null, string? clickButton = null)
     {
         IPage page = this.browser.NewPageAsync().Result;
         page.DefaultTimeout = 10000;

Tranga/MangaConnectors/DownloadClient.cs

@@ -14,15 +14,15 @@ internal abstract class DownloadClient : GlobalBase
     
     public RequestResult MakeRequest(string url, RequestType requestType, string? referrer = null, string? clickButton = null)
     {
-        if (!settings.requestLimits.ContainsKey(requestType))
+        if (!TrangaSettings.requestLimits.ContainsKey(requestType))
         {
             Log("RequestType not configured for rate-limit.");
             return new RequestResult(HttpStatusCode.NotAcceptable, null, Stream.Null);
         }
 
-        int rateLimit = settings.userAgent == TrangaSettings.DefaultUserAgent
+        int rateLimit = TrangaSettings.userAgent == TrangaSettings.DefaultUserAgent
             ? TrangaSettings.DefaultRequestLimits[requestType]
-            : settings.requestLimits[requestType];
+            : TrangaSettings.requestLimits[requestType];
         
         TimeSpan timeBetweenRequests = TimeSpan.FromMinutes(1).Divide(rateLimit);
         _lastExecutedRateLimit.TryAdd(requestType, DateTime.Now.Subtract(timeBetweenRequests));
@@ -40,6 +40,6 @@ internal abstract class DownloadClient : GlobalBase
         return result;
     }
 
-    protected abstract RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null);
+    internal abstract RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null);
     public abstract void Close();
 }

Tranga/MangaConnectors/HttpDownloadClient.cs

@@ -13,10 +13,10 @@ internal class HttpDownloadClient : DownloadClient
 
     public HttpDownloadClient(GlobalBase clone) : base(clone)
     {
-        Client.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", settings.userAgent);
+        Client.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", TrangaSettings.userAgent);
     }
     
-    protected override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
+    internal override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
     {
         if(clickButton is not null)
             Log("Can not click button on static site.");

Tranga/MangaConnectors/MangaConnector.cs

@@ -23,7 +23,7 @@ public abstract class MangaConnector : GlobalBase
     protected MangaConnector(GlobalBase clone, string name) : base(clone)
     {
         this.name = name;
-        Directory.CreateDirectory(settings.coverImageCache);
+        Directory.CreateDirectory(TrangaSettings.coverImageCache);
     }
     
     public string name { get; } //Name of the Connector (e.g. Website)
@@ -65,7 +65,7 @@ public abstract class MangaConnector : GlobalBase
         Log($"Checking for duplicates {manga}");
         List<Chapter> newChaptersList = allChapters.Where(nChapter => float.TryParse(nChapter.chapterNumber, numberFormatDecimalPoint, out float chapterNumber)
                                                                       && chapterNumber > manga.ignoreChaptersBelow
-                                                                      && !nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).ToList();
+                                                                      && !nChapter.CheckChapterIsDownloaded()).ToList();
         Log($"{newChaptersList.Count} new chapters. {manga}");
         try
         {
@@ -167,7 +167,7 @@ public abstract class MangaConnector : GlobalBase
     {
         Log($"Copy cover {manga}");
         //Check if Publication already has a Folder and cover
-        string publicationFolder = manga.CreatePublicationFolder(settings.downloadLocation);
+        string publicationFolder = manga.CreatePublicationFolder(TrangaSettings.downloadLocation);
         DirectoryInfo dirInfo = new (publicationFolder);
         if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
         {
@@ -223,7 +223,7 @@ public abstract class MangaConnector : GlobalBase
             return HttpStatusCode.RequestTimeout;
         Log($"Downloading Images for {saveArchiveFilePath}");
         if (progressToken is not null)
-            progressToken.increments = imageUrls.Length;
+            progressToken.increments += imageUrls.Length;
         //Check if Publication Directory already exists
         string directoryPath = Path.GetDirectoryName(saveArchiveFilePath)!;
         if (!Directory.Exists(directoryPath))
@@ -291,7 +291,7 @@ public abstract class MangaConnector : GlobalBase
         //https?:\/\/[a-zA-Z0-9-]+\.([a-zA-Z0-9-]+\.[a-zA-Z0-9]+)\/(?:.+\/)*(.+\.([a-zA-Z]+)) for only second level domains
         Match match = urlRex.Match(url);
         string filename = $"{match.Groups[1].Value}-{mangaInternalId}.{match.Groups[3].Value}";
-        string saveImagePath = Path.Join(settings.coverImageCache, filename);
+        string saveImagePath = Path.Join(TrangaSettings.coverImageCache, filename);
 
         if (File.Exists(saveImagePath))
             return saveImagePath;
@@ -299,7 +299,7 @@ public abstract class MangaConnector : GlobalBase
         RequestResult coverResult = downloadClient.MakeRequest(url, requestType);
         using MemoryStream ms = new();
         coverResult.result.CopyTo(ms);
-        Directory.CreateDirectory(settings.coverImageCache);
+        Directory.CreateDirectory(TrangaSettings.coverImageCache);
         File.WriteAllBytes(saveImagePath, ms.ToArray());
         Log($"Saving cover to {saveImagePath}");
         return saveImagePath;

Tranga/MangaConnectors/MangaConnectorJsonConverter.cs

@@ -38,6 +38,10 @@ public class MangaConnectorJsonConverter : JsonConverter
                 return this._connectors.First(c => c is Bato);
             case "Manga4Life":
                 return this._connectors.First(c => c is MangaLife);
+            case "ManhuaPlus":
+                return this._connectors.First(c => c is ManhuaPlus);
+            case "MangaHere":
+                return this._connectors.First(c => c is MangaHere);
         }
 
         throw new Exception();

Tranga/MangaConnectors/MangaDex.cs

@@ -290,6 +290,6 @@ public class MangaDex : MangaConnector
         File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
         
         //Download Chapter-Images
-        return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
+        return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
     }
 }

Tranga/MangaConnectors/MangaHere.cs

@@ -0,0 +1,203 @@
+using System.Net;
+using System.Text.RegularExpressions;
+using HtmlAgilityPack;
+using Tranga.Jobs;
+
+namespace Tranga.MangaConnectors;
+
+public class MangaHere : MangaConnector
+{
+    public MangaHere(GlobalBase clone) : base(clone, "MangaHere")
+    {
+        this.downloadClient = new ChromiumDownloadClient(clone);
+    }
+
+    public override Manga[] GetManga(string publicationTitle = "")
+    {
+        Log($"Searching Publications. Term=\"{publicationTitle}\"");
+        string sanitizedTitle = string.Join('+', Regex.Matches(publicationTitle, "[A-z]*").Where(str => str.Length > 0)).ToLower();
+        string requestUrl = $"https://www.mangahere.cc/search?title={sanitizedTitle}";
+        RequestResult requestResult =
+            downloadClient.MakeRequest(requestUrl, RequestType.Default);
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 || requestResult.htmlDocument is null)
+            return Array.Empty<Manga>();
+        
+        Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
+        Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
+        return publications;
+    }
+
+    private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
+    {
+        if (document.DocumentNode.SelectNodes("//div[contains(concat(' ',normalize-space(@class),' '),' container ')]").Any(node => node.ChildNodes.Any(cNode => cNode.HasClass("search-keywords"))))
+            return Array.Empty<Manga>();
+        
+        List<string> urls = document.DocumentNode
+            .SelectNodes("//a[contains(@href, '/manga/') and not(contains(@href, '.html'))]")
+            .Select(thumb => $"https://www.mangahere.cc{thumb.GetAttributeValue("href", "")}").Distinct().ToList();
+
+        HashSet<Manga> ret = new();
+        foreach (string url in urls)
+        {
+            Manga? manga = GetMangaFromUrl(url);
+            if (manga is not null)
+                ret.Add((Manga)manga);
+        }
+
+        return ret.ToArray();
+    }
+
+    public override Manga? GetMangaFromId(string publicationId)
+    {
+        return GetMangaFromUrl($"https://www.mangahere.cc/manga/{publicationId}");
+    }
+
+    public override Manga? GetMangaFromUrl(string url)
+    {
+        RequestResult requestResult =
+            downloadClient.MakeRequest(url, RequestType.MangaInfo);
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 || requestResult.htmlDocument is null)
+            return null;
+        
+        Regex idRex = new (@"https:\/\/www\.mangahere\.[a-z]{0,63}\/manga\/([0-9A-z\-]+).*");
+        string id = idRex.Match(url).Groups[1].Value;
+        return ParseSinglePublicationFromHtml(requestResult.htmlDocument, id, url);
+    }
+
+    private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
+    {
+        string originalLanguage = "", status = "";
+        Dictionary<string, string> altTitles = new(), links = new();
+        Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
+
+        //We dont get posters, because same origin bs HtmlNode posterNode = document.DocumentNode.SelectSingleNode("//img[contains(concat(' ',normalize-space(@class),' '),' detail-info-cover-img ')]");
+        string posterUrl = "http://static.mangahere.cc/v20230914/mangahere/images/nopicture.jpg";
+        string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
+
+        HtmlNode titleNode = document.DocumentNode.SelectSingleNode("//span[contains(concat(' ',normalize-space(@class),' '),' detail-info-right-title-font ')]");
+        string sortName = titleNode.InnerText;
+        
+        List<string> authors = document.DocumentNode
+            .SelectNodes("//p[contains(concat(' ',normalize-space(@class),' '),' detail-info-right-say ')]/a")
+            .Select(node => node.InnerText)
+            .ToList();
+
+        HashSet<string> tags = document.DocumentNode
+            .SelectNodes("//p[contains(concat(' ',normalize-space(@class),' '),' detail-info-right-tag-list ')]/a")
+            .Select(node => node.InnerText)
+            .ToHashSet();
+
+        status = document.DocumentNode.SelectSingleNode("//span[contains(concat(' ',normalize-space(@class),' '),' detail-info-right-title-tip ')]").InnerText;
+        switch (status.ToLower())
+        {
+            case "cancelled": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
+            case "hiatus": releaseStatus = Manga.ReleaseStatusByte.OnHiatus; break;
+            case "discontinued": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
+            case "complete": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
+            case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
+        }
+
+        HtmlNode descriptionNode = document.DocumentNode
+            .SelectSingleNode("//p[contains(concat(' ',normalize-space(@class),' '),' fullcontent ')]");
+        string description = descriptionNode.InnerText;
+
+        Manga manga = new(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl,
+            coverFileNameInCache, links,
+            null, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
+        AddMangaToCache(manga);
+        return manga;
+    }
+
+    public override Chapter[] GetChapters(Manga manga, string language="en")
+    {
+        Log($"Getting chapters {manga}");
+        string requestUrl = $"https://www.mangahere.cc/manga/{manga.publicationId}";
+        RequestResult requestResult =
+            downloadClient.MakeRequest(requestUrl, RequestType.Default);
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300 || requestResult.htmlDocument is null)
+            return Array.Empty<Chapter>();
+        
+        List<string> urls = requestResult.htmlDocument.DocumentNode.SelectNodes("//div[@id='list-2']/ul//li//a[contains(@href, '/manga/')]")
+            .Select(node => node.GetAttributeValue("href", "")).ToList();
+        Regex chapterRex = new(@".*\/manga\/[a-zA-Z0-9\-\._\~\!\$\&\'\(\)\*\+\,\;\=\:\@]+\/v([0-9(TBD)]+)\/c([0-9\.]+)\/.*");
+        
+        List<Chapter> chapters = new();
+        foreach (string url in urls)
+        {
+            Match rexMatch = chapterRex.Match(url);
+
+            string volumeNumber = rexMatch.Groups[1].Value == "TBD" ? "0" : rexMatch.Groups[1].Value;
+            string chapterNumber = rexMatch.Groups[2].Value;
+            string fullUrl = $"https://www.mangahere.cc{url}";
+            chapters.Add(new Chapter(manga, "", volumeNumber, chapterNumber, fullUrl));
+        }
+        //Return Chapters ordered by Chapter-Number
+        Log($"Got {chapters.Count} chapters. {manga}");
+        return chapters.Order().ToArray();
+    }
+
+    public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
+    {
+        if (progressToken?.cancellationRequested ?? false)
+        {
+            progressToken.Cancel();
+            return HttpStatusCode.RequestTimeout;
+        }
+
+        Manga chapterParentManga = chapter.parentManga;
+        Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
+
+        List<string> imageUrls = new();
+
+        int downloaded = 1;
+        int images = 1;
+        string url = string.Join('/', chapter.url.Split('/')[..^1]);
+        do
+        {
+            RequestResult requestResult =
+                downloadClient.MakeRequest($"{url}/{downloaded}.html", RequestType.Default);
+            if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
+            {
+                progressToken?.Cancel();
+                return requestResult.statusCode;
+            }
+
+            if (requestResult.htmlDocument is null)
+            {
+                progressToken?.Cancel();
+                return HttpStatusCode.InternalServerError;
+            }
+            
+            imageUrls.AddRange(ParseImageUrlsFromHtml(requestResult.htmlDocument));
+
+            images = requestResult.htmlDocument.DocumentNode
+                .SelectNodes("//a[contains(@href, '/manga/')]")
+                .MaxBy(node => node.GetAttributeValue("data-page", 0))!.GetAttributeValue("data-page", 0);
+            logger?.WriteLine($"MangaHere speciality: Get Image-url {downloaded}/{images}");
+            if (progressToken is not null)
+            {
+                progressToken.increments = images * 2;//we also have to download the images later
+                progressToken.Increment();
+            }
+        } while (downloaded++ <= images);
+        
+        string comicInfoPath = Path.GetTempFileName();
+        File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
+        
+        if (progressToken is not null)
+            progressToken.increments = images;//we blip to normal length, in downloadchapterimages it is increasaed by the amount of urls again
+        return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
+    }
+
+    private string[] ParseImageUrlsFromHtml(HtmlDocument document)
+    {
+        return document.DocumentNode
+            .SelectNodes("//img[contains(concat(' ',normalize-space(@class),' '),' reader-main-img ')]")
+            .Select(node =>
+            {
+                string url = node.GetAttributeValue("src", "");
+                return url.StartsWith("//") ? $"https:{url}" : url;
+            })
+            .ToArray();
+    }
+}

Tranga/MangaConnectors/MangaKatana.cs

@@ -217,7 +217,7 @@ public class MangaKatana : MangaConnector
 		string comicInfoPath = Path.GetTempFileName();
 		File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
 
-		return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
+		return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
 	}
 
 	private string[] ParseImageUrlsFromHtml(string mangaUrl)

Tranga/MangaConnectors/MangaLife.cs

@@ -194,6 +194,6 @@ public class MangaLife : MangaConnector
         string comicInfoPath = Path.GetTempFileName();
         File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
         
-        return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
+        return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
     }
 }

Tranga/MangaConnectors/Manganato.cs

@@ -1,4 +1,5 @@
-using System.Net;
+using System.Globalization;
+using System.Net;
 using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 using Tranga.Jobs;
@@ -127,9 +128,16 @@ public class Manganato : MangaConnector
         while (description.StartsWith('\n'))
             description = description.Substring(1);
         
-        string yearString = document.DocumentNode.Descendants("li").Last(li => li.HasClass("a-h")).Descendants("span")
+        string pattern = "MMM dd,yyyy HH:mm";
-            .First(s => s.HasClass("chapter-time")).InnerText;
+
-        int year = Convert.ToInt32(yearString.Split(',')[^1]) + 2000;
+        HtmlNode oldestChapter = document.DocumentNode
+            .SelectNodes("//span[contains(concat(' ',normalize-space(@class),' '),' chapter-time ')]").MaxBy(
+                node => DateTime.ParseExact(node.GetAttributeValue("title", "Dec 31 2400, 23:59"), pattern,
+                    CultureInfo.InvariantCulture).Millisecond)!;
+
+
+        int year = DateTime.ParseExact(oldestChapter.GetAttributeValue("title", "Dec 31 2400, 23:59"), pattern,
+            CultureInfo.InvariantCulture).Year;
         
         Manga manga = new (sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
             year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
@@ -209,7 +217,7 @@ public class Manganato : MangaConnector
         string comicInfoPath = Path.GetTempFileName();
         File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
         
-        return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, "https://chapmanganato.com/", progressToken:progressToken);
+        return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://chapmanganato.com/", progressToken:progressToken);
     }
 
     private string[] ParseImageUrlsFromHtml(HtmlDocument document)

Tranga/MangaConnectors/Mangasee.cs

@@ -61,21 +61,27 @@ public class Mangasee : MangaConnector
         }
     }
 
+    private readonly string[] _filterWords = {"a", "the", "of", "as", "to", "no", "for", "on", "with", "be", "and", "in", "wa", "at", "be", "ni"};
+    private string ToFilteredString(string input) => string.Join(' ', input.ToLower().Split(' ').Where(word => _filterWords.Contains(word) == false));
     private SearchResult[] FilteredResults(string publicationTitle, SearchResult[] unfilteredSearchResults)
     {
         Dictionary<SearchResult, int> similarity = new();
         foreach (SearchResult sr in unfilteredSearchResults)
         {
             List<int> scores = new();
-            foreach (string se in sr.a)
+            string filteredPublicationString = ToFilteredString(publicationTitle);
-                scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(se.ToLower(), publicationTitle.ToLower()));
+            string filteredSString = ToFilteredString(sr.s);
-            scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(sr.s.ToLower(), publicationTitle.ToLower()));
+            scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(filteredSString, filteredPublicationString));
+            foreach (string srA in sr.a)
+            {
+                string filteredAString = ToFilteredString(srA);
+                scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(filteredAString, filteredPublicationString));
+            }
             similarity.Add(sr, scores.Sum() / scores.Count);
         }
 
-        SearchResult[] similarity90 = similarity.Where(s => s.Value < 10).Select(s => s.Key).ToArray();
+        List<SearchResult> ret = similarity.OrderBy(s => s.Value).Take(10).Select(s => s.Key).ToList();
-
+        return ret.ToArray();
-        return similarity90;
     }
 
     public override Manga? GetMangaFromId(string publicationId)
@@ -219,6 +225,6 @@ public class Mangasee : MangaConnector
         string comicInfoPath = Path.GetTempFileName();
         File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
         
-        return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
+        return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
     }
 }

Tranga/MangaConnectors/Mangaworld.cs

@@ -169,7 +169,8 @@ public class Mangaworld: MangaConnector
         {
             foreach (HtmlNode chNode in chaptersWrapper.SelectNodes("div").Where(node => node.HasClass("chapter")))
             {
-                string number = chNode.SelectSingleNode("a").SelectSingleNode("span").InnerText.Split(" ")[^1];
+                string number = Regex.Match(chNode.SelectSingleNode("a").SelectSingleNode("span").InnerText,
+                    @"[Cc]apitolo ([0-9]+).*").Groups[1].Value;
                 string url = chNode.SelectSingleNode("a").GetAttributeValue("href", "");
                 ret.Add(new Chapter(manga, null, null, number, url));
             }
@@ -209,7 +210,7 @@ public class Mangaworld: MangaConnector
         string comicInfoPath = Path.GetTempFileName();
         File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
         
-        return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, "https://www.mangaworld.bz/", progressToken:progressToken);
+        return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://www.mangaworld.bz/", progressToken:progressToken);
     }
 
     private string[] ParseImageUrlsFromHtml(HtmlDocument document)

Tranga/MangaConnectors/ManhuaPlus.cs

@@ -0,0 +1,184 @@
+using System.Net;
+using System.Text.RegularExpressions;
+using HtmlAgilityPack;
+using Tranga.Jobs;
+
+namespace Tranga.MangaConnectors;
+
+public class ManhuaPlus : MangaConnector
+{
+    public ManhuaPlus(GlobalBase clone) : base(clone, "ManhuaPlus")
+    {
+        this.downloadClient = new ChromiumDownloadClient(clone);
+    }
+
+    public override Manga[] GetManga(string publicationTitle = "")
+    {
+        Log($"Searching Publications. Term=\"{publicationTitle}\"");
+        string sanitizedTitle = string.Join(' ', Regex.Matches(publicationTitle, "[A-z]*").Where(str => str.Length > 0)).ToLower();
+        string requestUrl = $"https://manhuaplus.org/search?keyword={sanitizedTitle}";
+        RequestResult requestResult =
+            downloadClient.MakeRequest(requestUrl, RequestType.Default);
+        if ((int)requestResult.statusCode < 200 || (int)requestResult.statusCode >= 300)
+            return Array.Empty<Manga>();
+
+        if (requestResult.htmlDocument is null)
+            return Array.Empty<Manga>();
+        Manga[] publications = ParsePublicationsFromHtml(requestResult.htmlDocument);
+        Log($"Retrieved {publications.Length} publications. Term=\"{publicationTitle}\"");
+        return publications;
+    }
+    
+    private Manga[] ParsePublicationsFromHtml(HtmlDocument document)
+    {
+        if (document.DocumentNode.SelectSingleNode("//h1/../..").ChildNodes//I already want to not.
+                .Any(node => node.InnerText.Contains("No manga found")))
+            return Array.Empty<Manga>();
+
+        List<string> urls = document.DocumentNode
+            .SelectNodes("//h1/../..//a[contains(@href, 'https://manhuaplus.org/manga/') and contains(concat(' ',normalize-space(@class),' '),' clamp ') and not(contains(@href, '/chapter'))]")
+                .Select(mangaNode => mangaNode.GetAttributeValue("href", "")).ToList();
+        logger?.WriteLine($"Got {urls.Count} urls.");
+
+        HashSet<Manga> ret = new();
+        foreach (string url in urls)
+        {
+            Manga? manga = GetMangaFromUrl(url);
+            if (manga is not null)
+                ret.Add((Manga)manga);
+        }
+
+        return ret.ToArray();
+    }
+
+    public override Manga? GetMangaFromId(string publicationId)
+    {
+        return GetMangaFromUrl($"https://manhuaplus.org/manga/{publicationId}");
+    }
+
+    public override Manga? GetMangaFromUrl(string url)
+    {
+        Regex publicationIdRex = new(@"https:\/\/manhuaplus.org\/manga\/(.*)(\/.*)*");
+        string publicationId = publicationIdRex.Match(url).Groups[1].Value;
+
+        RequestResult requestResult = this.downloadClient.MakeRequest(url, RequestType.MangaInfo);
+        if((int)requestResult.statusCode < 300 && (int)requestResult.statusCode >= 200 && requestResult.htmlDocument is not null && requestResult.redirectedToUrl != "https://manhuaplus.org/home") //When manga doesnt exists it redirects to home
+            return ParseSinglePublicationFromHtml(requestResult.htmlDocument, publicationId, url);
+        return null;
+    }
+
+    private Manga ParseSinglePublicationFromHtml(HtmlDocument document, string publicationId, string websiteUrl)
+    {
+        string originalLanguage = "", status = "";
+        Dictionary<string, string> altTitles = new(), links = new();
+        HashSet<string> tags = new();
+        Manga.ReleaseStatusByte releaseStatus = Manga.ReleaseStatusByte.Unreleased;
+
+        HtmlNode posterNode = document.DocumentNode.SelectSingleNode("/html/body/main/div/div/div[2]/div[1]/figure/a/img");//BRUH
+        Regex posterRex = new(@".*(\/uploads/covers/[a-zA-Z0-9\-\._\~\!\$\&\'\(\)\*\+\,\;\=\:\@]+).*");
+        string posterUrl = $"https://manhuaplus.org/{posterRex.Match(posterNode.GetAttributeValue("src", "")).Groups[1].Value}";
+        string coverFileNameInCache = SaveCoverImageToCache(posterUrl, publicationId, RequestType.MangaCover);
+
+        HtmlNode titleNode = document.DocumentNode.SelectSingleNode("//h1");
+        string sortName = titleNode.InnerText.Replace("\n", "");
+        
+        HtmlNode[] authorsNodes = document.DocumentNode
+            .SelectNodes("//a[contains(@href, 'https://manhuaplus.org/authors/')]")
+            .ToArray();
+        List<string> authors = new();
+        foreach (HtmlNode authorNode in authorsNodes)
+            authors.Add(authorNode.InnerText);
+
+        HtmlNode[] genreNodes = document.DocumentNode
+            .SelectNodes("//a[contains(@href, 'https://manhuaplus.org/genres/')]").ToArray();
+        foreach (HtmlNode genreNode in genreNodes)
+            tags.Add(genreNode.InnerText.Replace("\n", ""));
+
+        string yearNodeStr = document.DocumentNode
+            .SelectSingleNode("//aside//i[contains(concat(' ',normalize-space(@class),' '),' fa-clock ')]/../span").InnerText.Replace("\n", "");
+        int year = int.Parse(yearNodeStr.Split(' ')[0].Split('/')[^1]);
+
+        status = document.DocumentNode.SelectSingleNode("//aside//i[contains(concat(' ',normalize-space(@class),' '),' fa-rss ')]/../span").InnerText.Replace("\n", "");
+        switch (status.ToLower())
+        {
+            case "cancelled": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
+            case "hiatus": releaseStatus = Manga.ReleaseStatusByte.OnHiatus; break;
+            case "discontinued": releaseStatus = Manga.ReleaseStatusByte.Cancelled; break;
+            case "complete": releaseStatus = Manga.ReleaseStatusByte.Completed; break;
+            case "ongoing": releaseStatus = Manga.ReleaseStatusByte.Continuing; break;
+        }
+
+        HtmlNode descriptionNode = document.DocumentNode
+            .SelectSingleNode("//div[@id='syn-target']");
+        string description = descriptionNode.InnerText;
+
+        Manga manga = new(sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl,
+            coverFileNameInCache, links,
+            year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
+        AddMangaToCache(manga);
+        return manga;
+    }
+
+    public override Chapter[] GetChapters(Manga manga, string language="en")
+    {
+        Log($"Getting chapters {manga}");
+        RequestResult result = downloadClient.MakeRequest($"https://manhuaplus.org/manga/{manga.publicationId}", RequestType.Default);
+        if ((int)result.statusCode < 200 || (int)result.statusCode >= 300 || result.htmlDocument is null)
+        {
+            return Array.Empty<Chapter>();
+        }
+        
+        HtmlNodeCollection chapterNodes = result.htmlDocument.DocumentNode.SelectNodes("//li[contains(concat(' ',normalize-space(@class),' '),' chapter ')]//a");
+        string[] urls = chapterNodes.Select(node => node.GetAttributeValue("href", "")).ToArray();
+        Regex urlRex = new (@".*\/chapter-([0-9\-]+).*");
+        
+        List<Chapter> chapters = new();
+        foreach (string url in urls)
+        {
+            Match rexMatch = urlRex.Match(url);
+
+            string volumeNumber = "1";
+            string chapterNumber = rexMatch.Groups[1].Value;
+            string fullUrl = url;
+            chapters.Add(new Chapter(manga, "", volumeNumber, chapterNumber, fullUrl));
+        }
+        //Return Chapters ordered by Chapter-Number
+        Log($"Got {chapters.Count} chapters. {manga}");
+        return chapters.Order().ToArray();
+    }
+
+    public override HttpStatusCode DownloadChapter(Chapter chapter, ProgressToken? progressToken = null)
+    {
+        if (progressToken?.cancellationRequested ?? false)
+        {
+            progressToken.Cancel();
+            return HttpStatusCode.RequestTimeout;
+        }
+
+        Manga chapterParentManga = chapter.parentManga;
+        if (progressToken?.cancellationRequested ?? false)
+        {
+            progressToken.Cancel();
+            return HttpStatusCode.RequestTimeout;
+        }
+
+        Log($"Retrieving chapter-info {chapter} {chapterParentManga}");
+
+        RequestResult requestResult = this.downloadClient.MakeRequest(chapter.url, RequestType.Default);
+        if (requestResult.htmlDocument is null)
+        {
+            progressToken?.Cancel();
+            return HttpStatusCode.RequestTimeout;
+        }
+
+        HtmlDocument document = requestResult.htmlDocument;
+        
+        HtmlNode[] images = document.DocumentNode.SelectNodes("//a[contains(concat(' ',normalize-space(@class),' '),' readImg ')]/img").ToArray();
+        List<string> urls = images.Select(node => node.GetAttributeValue("src", "")).ToList();
+            
+        string comicInfoPath = Path.GetTempFileName();
+        File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
+        
+        return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
+    }
+}

Tranga/Server.cs

@@ -19,9 +19,9 @@ public class Server : GlobalBase
     {
         this._parent = parent;
         if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            this._listener.Prefixes.Add($"http://*:{settings.apiPortNumber}/");
+            this._listener.Prefixes.Add($"http://*:{TrangaSettings.apiPortNumber}/");
         else
-            this._listener.Prefixes.Add($"http://localhost:{settings.apiPortNumber}/");
+            this._listener.Prefixes.Add($"http://localhost:{TrangaSettings.apiPortNumber}/");
         Thread listenThread = new (Listen);
         listenThread.Start();
         Thread watchThread = new(WatchRunning);
@@ -198,16 +198,16 @@ public class Server : GlobalBase
                 SendResponse(HttpStatusCode.OK, response, _parent.jobBoss.jobs.Where(jjob => jjob is DownloadNewChapters).OrderBy(jjob => ((DownloadNewChapters)jjob).manga.sortName));
                 break;
             case "Settings":
-                SendResponse(HttpStatusCode.OK, response, settings);
+                SendResponse(HttpStatusCode.OK, response, TrangaSettings.AsJObject());
                 break;
             case "Settings/userAgent":
-                SendResponse(HttpStatusCode.OK, response, settings.userAgent);
+                SendResponse(HttpStatusCode.OK, response, TrangaSettings.userAgent);
                 break;
             case "Settings/customRequestLimit":
-                SendResponse(HttpStatusCode.OK, response, settings.requestLimits);
+                SendResponse(HttpStatusCode.OK, response, TrangaSettings.requestLimits);
                 break;
             case "Settings/AprilFoolsMode":
-                SendResponse(HttpStatusCode.OK, response, settings.aprilFoolsMode);
+                SendResponse(HttpStatusCode.OK, response, TrangaSettings.aprilFoolsMode);
                 break;
             case "NotificationConnectors":
                 SendResponse(HttpStatusCode.OK, response, notificationConnectors);
@@ -314,7 +314,7 @@ public class Server : GlobalBase
                 }
                 
                 if (requestVariables.TryGetValue("customFolderName", out customFolderName))
-                    manga.MovePublicationFolder(settings.downloadLocation, customFolderName);
+                    manga.MovePublicationFolder(TrangaSettings.downloadLocation, customFolderName);
                 requestVariables.TryGetValue("translatedLanguage", out translatedLanguage);
                 
                 _parent.jobBoss.AddJob(new DownloadNewChapters(this, connector!, manga, true, interval, translatedLanguage: translatedLanguage??"en"));
@@ -343,7 +343,7 @@ public class Server : GlobalBase
                 }
 
                 if (requestVariables.TryGetValue("customFolderName", out customFolderName))
-                    manga.MovePublicationFolder(settings.downloadLocation, customFolderName);
+                    manga.MovePublicationFolder(TrangaSettings.downloadLocation, customFolderName);
                 requestVariables.TryGetValue("translatedLanguage", out translatedLanguage);
                 
                 _parent.jobBoss.AddJob(new DownloadNewChapters(this, connector!, manga, false, translatedLanguage: translatedLanguage??"en"));
@@ -405,7 +405,7 @@ public class Server : GlobalBase
                     SendResponse(HttpStatusCode.BadRequest, response);
                     break;
                 }
-                settings.UpdateDownloadLocation(downloadLocation, moveFiles);
+                TrangaSettings.UpdateDownloadLocation(downloadLocation, moveFiles);
                 SendResponse(HttpStatusCode.Accepted, response);
                 break;
             case "Settings/AprilFoolsMode":
@@ -415,7 +415,7 @@ public class Server : GlobalBase
                     SendResponse(HttpStatusCode.BadRequest, response);
                     break;
                 }
-                settings.UpdateAprilFoolsMode(aprilFoolsModeEnabled);
+                TrangaSettings.UpdateAprilFoolsMode(aprilFoolsModeEnabled);
                 SendResponse(HttpStatusCode.Accepted, response);
                 break;
             /*case "Settings/UpdateWorkingDirectory":
@@ -433,11 +433,11 @@ public class Server : GlobalBase
                     SendResponse(HttpStatusCode.BadRequest, response);
                     break;
                 }
-                settings.UpdateUserAgent(customUserAgent);
+                TrangaSettings.UpdateUserAgent(customUserAgent);
                 SendResponse(HttpStatusCode.Accepted, response);
                 break;
             case "Settings/userAgent/Reset":
-                settings.UpdateUserAgent(null);
+                TrangaSettings.UpdateUserAgent(null);
                 SendResponse(HttpStatusCode.Accepted, response);
                 break;
             case "Settings/customRequestLimit":
@@ -450,17 +450,11 @@ public class Server : GlobalBase
                     break;
                 }
                 
-                if (settings.requestLimits.ContainsKey(requestType))
+                TrangaSettings.UpdateRateLimit(requestType, requestsPerMinute);
-                {
-                    settings.requestLimits[requestType] = requestsPerMinute;
                 SendResponse(HttpStatusCode.Accepted, response);
-                }else
-                    SendResponse(HttpStatusCode.BadRequest, response);
-                settings.ExportSettings();
                 break;
             case "Settings/customRequestLimit/Reset":
-                settings.requestLimits = TrangaSettings.DefaultRequestLimits;
+                TrangaSettings.ResetRateLimits();
-                settings.ExportSettings();
                 break;
             case "NotificationConnectors/Update":
                 if (!requestVariables.TryGetValue("notificationConnector", out notificationConnectorStr) ||
@@ -719,24 +713,21 @@ public class Server : GlobalBase
         response.AddHeader("Access-Control-Max-Age", "1728000");
         response.AppendHeader("Access-Control-Allow-Origin", "*");
 
+        try
+        {
             if (content is not Stream)
             {
                 response.ContentType = "application/json";
-            try
+                response.AddHeader("Cache-Control", "no-store");
-            {
                 response.OutputStream.Write(content is not null
                     ? Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(content))
                     : Array.Empty<byte>());
                 response.OutputStream.Close();
             }
-            catch (HttpListenerException e)
-            {
-                Log(e.ToString());
-            }
-        }
             else if (content is FileStream stream)
             {
                 string contentType = stream.Name.Split('.')[^1];
+                response.AddHeader("Cache-Control", "max-age=600");
                 switch (contentType.ToLower())
                 {
                     case "gif":
@@ -753,9 +744,15 @@ public class Server : GlobalBase
                         response.ContentType = "text/plain";
                         break;
                 }
+
                 stream.CopyTo(response.OutputStream);
                 response.OutputStream.Close();
                 stream.Close();
             }
         }
+        catch (HttpListenerException e)
+        {
+            Log(e.ToString());
+        }
+    }
 }

Tranga/Tranga.cs

@@ -11,10 +11,9 @@ public partial class Tranga : GlobalBase
     private Server _server;
     private HashSet<MangaConnector> _connectors;
 
-    public Tranga(Logger? logger, TrangaSettings settings) : base(logger, settings)
+    public Tranga(Logger? logger) : base(logger)
     {
         Log("\n\n _______                                   \n|_     _|.----..---.-..-----..-----..---.-.\n  |   |  |   _||  _  ||     ||  _  ||  _  |\n  |___|  |__|  |___._||__|__||___  ||___._|\n                             |_____|       \n\n");
-        Log(settings.ToString());
         keepRunning = true;
         _connectors = new HashSet<MangaConnector>()
         {  
@@ -24,7 +23,9 @@ public partial class Tranga : GlobalBase
             new MangaKatana(this),
             new Mangaworld(this),
             new Bato(this),
-            new MangaLife(this)
+            new MangaLife(this),
+            new ManhuaPlus(this),
+            new MangaHere(this),
         };
         foreach(DirectoryInfo dir in new DirectoryInfo(Path.GetTempPath()).GetDirectories("trangatemp"))//Cleanup old temp folders
             dir.Delete();
@@ -68,7 +69,7 @@ public partial class Tranga : GlobalBase
         {
             while (keepRunning)
             {
-                if(!settings.aprilFoolsMode || !IsAprilFirst())
+                if(!TrangaSettings.aprilFoolsMode || !IsAprilFirst())
                     jobBoss.CheckJobs();
                 else
                     Log("April Fools Mode in Effect");

Tranga/TrangaArgs.cs

@@ -36,34 +36,16 @@ public partial class Tranga : GlobalBase
             enabledLoggers.Add(Logger.LoggerType.FileLogger);
         Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, directoryPath);
 
-        TrangaSettings? settings = null;
         bool dlp = fetched.TryGetValue(downloadLocation, out string[]? downloadLocationPath);
-        bool wdp = fetched.TryGetValue(downloadLocation, out string[]? workingDirectoryPath);
+        bool wdp = fetched.TryGetValue(workingDirectory, out string[]? workingDirectoryPath);
 
-        if (dlp && wdp)
+        if (wdp)
-        {
+            TrangaSettings.LoadFromWorkingDirectory(workingDirectoryPath![0]);
-            settings = new TrangaSettings(downloadLocationPath![0], workingDirectoryPath![0]);
-        }else if (dlp)
-        {
-            if (settings is null)
-                settings = new TrangaSettings(downloadLocation: downloadLocationPath![0]);
         else
-                settings = new TrangaSettings(downloadLocation: downloadLocationPath![0], settings.workingDirectory);
+            TrangaSettings.CreateOrUpdate();
-        }else if (wdp)
+        if(dlp)
-        {
+            TrangaSettings.CreateOrUpdate(downloadDirectory: downloadLocationPath![0]);
-            if (settings is null)
-                settings = new TrangaSettings(downloadLocation: workingDirectoryPath![0]);
-            else
-                settings = new TrangaSettings(settings.downloadLocation, workingDirectoryPath![0]);
-        }
-        else
-        {
-            settings = new TrangaSettings();
-        }
 
-        Directory.CreateDirectory(settings.downloadLocation);//TODO validate path
+        Tranga _ = new (logger);
-        Directory.CreateDirectory(settings.workingDirectory);//TODO validate path
-
-        Tranga _ = new (logger, settings);
     }
 }

Tranga/TrangaSettings.cs

@@ -1,7 +1,6 @@
 using System.Runtime.InteropServices;
-using System.Text.Json.Nodes;
-using System.Text.RegularExpressions;
 using Newtonsoft.Json;
+using Newtonsoft.Json.Linq;
 using Tranga.LibraryConnectors;
 using Tranga.MangaConnectors;
 using Tranga.NotificationConnectors;
@@ -9,20 +8,20 @@ using static System.IO.UnixFileMode;
 
 namespace Tranga;
 
-public class TrangaSettings
+public static class TrangaSettings
 {
-    public string downloadLocation { get; private set; }
-    public string workingDirectory { get; private set; }
-    public int apiPortNumber { get; init; }
-    public string userAgent { get; private set; } = DefaultUserAgent;
-    [JsonIgnore] public string settingsFilePath => Path.Join(workingDirectory, "settings.json");
-    [JsonIgnore] public string libraryConnectorsFilePath => Path.Join(workingDirectory, "libraryConnectors.json");
-    [JsonIgnore] public string notificationConnectorsFilePath => Path.Join(workingDirectory, "notificationConnectors.json");
-    [JsonIgnore] public string jobsFolderPath => Path.Join(workingDirectory, "jobs");
-    [JsonIgnore] public string coverImageCache => Path.Join(workingDirectory, "imageCache");
     [JsonIgnore] internal static readonly string DefaultUserAgent = $"Tranga ({Enum.GetName(Environment.OSVersion.Platform)}; {(Environment.Is64BitOperatingSystem ? "x64" : "")}) / 1.0";
-    public ushort? version { get; } = 2;
+    public static string downloadLocation { get; private set; } = (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/Manga" : Path.Join(Directory.GetCurrentDirectory(), "Downloads"));
-    public bool aprilFoolsMode { get; private set; } = true;
+    public static string workingDirectory { get; private set; } = Path.Join(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/usr/share" : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "tranga-api");
+    public static int apiPortNumber { get; private set; } = 6531;
+    public static string userAgent { get; private set; } = DefaultUserAgent;
+    [JsonIgnore] public static string settingsFilePath => Path.Join(workingDirectory, "settings.json");
+    [JsonIgnore] public static string libraryConnectorsFilePath => Path.Join(workingDirectory, "libraryConnectors.json");
+    [JsonIgnore] public static string notificationConnectorsFilePath => Path.Join(workingDirectory, "notificationConnectors.json");
+    [JsonIgnore] public static string jobsFolderPath => Path.Join(workingDirectory, "jobs");
+    [JsonIgnore] public static string coverImageCache => Path.Join(workingDirectory, "imageCache");
+    public static ushort? version { get; } = 2;
+    public static bool aprilFoolsMode { get; private set; } = true;
     [JsonIgnore]internal static readonly Dictionary<RequestType, int> DefaultRequestLimits = new ()
     {
         {RequestType.MangaInfo, 250},
@@ -33,50 +32,35 @@ public class TrangaSettings
         {RequestType.Default, 60}
     };
 
-    public Dictionary<RequestType, int> requestLimits { get; set; } = DefaultRequestLimits;
+    public static Dictionary<RequestType, int> requestLimits { get; set; } = DefaultRequestLimits;
 
-    public TrangaSettings(string? downloadLocation = null, string? workingDirectory = null, int? apiPortNumber = null)
+    public static void LoadFromWorkingDirectory(string directory)
     {
-        string wd = workingDirectory ?? Path.Join(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/usr/share" : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "tranga-api");
+        TrangaSettings.workingDirectory = directory;
-        string sfp = Path.Join(wd, "settings.json");
+        if(File.Exists(settingsFilePath))
+            Deserialize(File.ReadAllText(settingsFilePath));
+        else return;
 
-        string lockFilePath = $"{sfp}.lock";
+        Directory.CreateDirectory(downloadLocation);
-        if (File.Exists(sfp) && !File.Exists(lockFilePath))
+        Directory.CreateDirectory(workingDirectory);
-        {//Load from settings file
-            FileStream lockFile = File.Create(lockFilePath,0, FileOptions.DeleteOnClose); //lock settingsfile
-            string settingsStr = File.ReadAllText(sfp);
-            settingsStr = Regex.Replace(settingsStr, @"""MangaDexAuthor"": [0-9]+,", "");//https://github.com/C9Glax/tranga/pull/161 Remove sometime in the future :3
-            TrangaSettings settings = JsonConvert.DeserializeObject<TrangaSettings>(settingsStr)!;
-            this.requestLimits = settings.requestLimits;
-            this.userAgent = settings.userAgent;
-            this.downloadLocation = downloadLocation ?? settings.downloadLocation;
-            this.workingDirectory = workingDirectory ?? settings.workingDirectory;
-            this.apiPortNumber = apiPortNumber ?? settings.apiPortNumber;
-            lockFile.Close();  //unlock settingsfile
-        }
-        else if(!File.Exists(sfp))
-        {//No settings file exists
-            if (downloadLocation?.Length < 1 || workingDirectory?.Length < 1)
-                throw new ArgumentException("Download-location and working-directory paths can not be empty!");
-            this.requestLimits = DefaultRequestLimits;
-            this.userAgent = DefaultUserAgent;
-            this.apiPortNumber = apiPortNumber ?? 6531;
-            this.downloadLocation = downloadLocation ?? (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/Manga" : Path.Join(Directory.GetCurrentDirectory(), "Downloads"));
-            this.workingDirectory = workingDirectory ?? Path.Join(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/usr/share" : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "tranga-api");
         ExportSettings();
     }
-        else
+
-        {//Settingsfile is locked
+    public static void CreateOrUpdate(string? downloadDirectory = null, string? pWorkingDirectory = null, int? pApiPortNumber = null, string? pUserAgent = null, bool? pAprilFoolsMode = null)
-            this.requestLimits = DefaultRequestLimits;
+    {
-            this.userAgent = DefaultUserAgent;
+        if(pWorkingDirectory is null && File.Exists(settingsFilePath))
-            this.apiPortNumber = apiPortNumber!.Value;
+            LoadFromWorkingDirectory(workingDirectory);
-            this.downloadLocation = downloadLocation!;
+        TrangaSettings.downloadLocation = downloadDirectory ?? TrangaSettings.downloadLocation;
-            this.workingDirectory = workingDirectory!;
+        TrangaSettings.workingDirectory = pWorkingDirectory ?? TrangaSettings.workingDirectory;
-        }
+        TrangaSettings.apiPortNumber = pApiPortNumber ?? TrangaSettings.apiPortNumber;
-        UpdateDownloadLocation(this.downloadLocation, false);
+        TrangaSettings.userAgent = pUserAgent ?? TrangaSettings.userAgent;
+        TrangaSettings.aprilFoolsMode = pAprilFoolsMode ?? TrangaSettings.aprilFoolsMode;
+        Directory.CreateDirectory(downloadLocation);
+        Directory.CreateDirectory(workingDirectory);
+        ExportSettings();
     }
 
-    public HashSet<LibraryConnector> LoadLibraryConnectors(GlobalBase clone)
+    public static HashSet<LibraryConnector> LoadLibraryConnectors(GlobalBase clone)
     {
         if (!File.Exists(libraryConnectorsFilePath))
             return new HashSet<LibraryConnector>();
@@ -90,7 +74,7 @@ public class TrangaSettings
             })!;
     }
 
-    public HashSet<NotificationConnector> LoadNotificationConnectors(GlobalBase clone)
+    public static HashSet<NotificationConnector> LoadNotificationConnectors(GlobalBase clone)
     {
         if (!File.Exists(notificationConnectorsFilePath))
             return new HashSet<NotificationConnector>();
@@ -104,13 +88,13 @@ public class TrangaSettings
             })!;
     }
 
-    public void UpdateAprilFoolsMode(bool enabled)
+    public static void UpdateAprilFoolsMode(bool enabled)
     {
-        this.aprilFoolsMode = enabled;
+        TrangaSettings.aprilFoolsMode = enabled;
         ExportSettings();
     }
 
-    public void UpdateDownloadLocation(string newPath, bool moveFiles = true)
+    public static void UpdateDownloadLocation(string newPath, bool moveFiles = true)
     {
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             Directory.CreateDirectory(newPath,
@@ -118,32 +102,44 @@ public class TrangaSettings
         else
             Directory.CreateDirectory(newPath);
         
-        if (moveFiles && Directory.Exists(this.downloadLocation))
+        if (moveFiles && Directory.Exists(TrangaSettings.downloadLocation))
-            Directory.Move(this.downloadLocation, newPath);
+            Directory.Move(TrangaSettings.downloadLocation, newPath);
 
-        this.downloadLocation = newPath;
+        TrangaSettings.downloadLocation = newPath;
         ExportSettings();
     }
 
-    public void UpdateWorkingDirectory(string newPath)
+    public static void UpdateWorkingDirectory(string newPath)
     {
         if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
             Directory.CreateDirectory(newPath,
                 GroupRead | GroupWrite | None | OtherRead | OtherWrite | UserRead | UserWrite);
         else
             Directory.CreateDirectory(newPath);
-        Directory.Move(this.workingDirectory, newPath);
+        Directory.Move(TrangaSettings.workingDirectory, newPath);
-        this.workingDirectory = newPath;
+        TrangaSettings.workingDirectory = newPath;
         ExportSettings();
     }
 
-    public void UpdateUserAgent(string? customUserAgent)
+    public static void UpdateUserAgent(string? customUserAgent)
     {
-        this.userAgent = customUserAgent ?? DefaultUserAgent;
+        TrangaSettings.userAgent = customUserAgent ?? DefaultUserAgent;
         ExportSettings();
     }
 
-    public void ExportSettings()
+    public static void UpdateRateLimit(RequestType requestType, int newLimit)
+    {
+        TrangaSettings.requestLimits[requestType] = newLimit;
+        ExportSettings();
+    }
+
+    public static void ResetRateLimits()
+    {
+        TrangaSettings.requestLimits = DefaultRequestLimits;
+        ExportSettings();
+    }
+
+    public static void ExportSettings()
     {
         if (File.Exists(settingsFilePath))
         {
@@ -152,22 +148,38 @@ public class TrangaSettings
         }
         else
             Directory.CreateDirectory(new FileInfo(settingsFilePath).DirectoryName!);
-        File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(this, Formatting.Indented));
+        File.WriteAllText(settingsFilePath, Serialize());
     }
 
-    public string GetFullCoverPath(Manga manga)
+    public static JObject AsJObject()
     {
-        return Path.Join(this.coverImageCache, manga.coverFileNameInCache);
+        JObject jobj = new JObject();
+        jobj.Add("downloadLocation", JToken.FromObject(TrangaSettings.downloadLocation));
+        jobj.Add("workingDirectory", JToken.FromObject(TrangaSettings.workingDirectory));
+        jobj.Add("apiPortNumber", JToken.FromObject(TrangaSettings.apiPortNumber));
+        jobj.Add("userAgent", JToken.FromObject(TrangaSettings.userAgent));
+        jobj.Add("aprilFoolsMode", JToken.FromObject(TrangaSettings.aprilFoolsMode));
+        jobj.Add("version", JToken.FromObject(TrangaSettings.version));
+        jobj.Add("requestLimits", JToken.FromObject(TrangaSettings.requestLimits));
+        return jobj;
     }
 
-    public override string ToString()
+    public static string Serialize() => AsJObject().ToString();
+
+    public static void Deserialize(string serialized)
     {
-        return $"TrangaSettings:\n" +
+        JObject jobj = JObject.Parse(serialized);
-               $"\tDownloadLocation: {downloadLocation}\n" +
+        if (jobj.TryGetValue("downloadLocation", out JToken? dl))
-               $"\tworkingDirectory: {workingDirectory}\n" +
+            TrangaSettings.downloadLocation = dl.Value<string>()!;
-               $"\tjobsFolderPath: {jobsFolderPath}\n" +
+        if (jobj.TryGetValue("workingDirectory", out JToken? wd))
-               $"\tsettingsFilePath: {settingsFilePath}\n" +
+            TrangaSettings.workingDirectory = wd.Value<string>()!;
-               $"\t\tnotificationConnectors: {notificationConnectorsFilePath}\n" +
+        if (jobj.TryGetValue("apiPortNumber", out JToken? apn))
-               $"\t\tlibraryConnectors: {libraryConnectorsFilePath}\n";
+            TrangaSettings.apiPortNumber = apn.Value<int>();
+        if (jobj.TryGetValue("userAgent", out JToken? ua))
+            TrangaSettings.userAgent = ua.Value<string>()!;
+        if (jobj.TryGetValue("aprilFoolsMode", out JToken? afm))
+            TrangaSettings.aprilFoolsMode = afm.Value<bool>()!;
+        if (jobj.TryGetValue("requestLimits", out JToken? rl))
+            TrangaSettings.requestLimits = rl.ToObject<Dictionary<RequestType, int>>()!;
     }
 }