36 changed files with 355 additions and 525 deletions
--- a/.dockerignore
+++ b/.dockerignore
@ -23,5 +23,3 @@
 **/values.dev.yaml
 LICENSE
 README.md
-Manga
-settings
--- a/.github/workflows/docker-base.yml
+++ b/.github/workflows/docker-base.yml
@ -0,0 +1,43 @@
+name: Docker Image CI
+
+on:
+  workflow_dispatch:
+    
+jobs:
+
+  build:
+
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+
+      # https://github.com/docker/setup-qemu-action#usage
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3.2.0
+
+      # https://github.com/marketplace/actions/docker-setup-buildx
+      - name: Set up Docker Buildx
+        id: buildx
+        uses: docker/setup-buildx-action@v3.6.1
+      
+      # https://github.com/docker/login-action#docker-hub
+      - name: Login to Docker Hub
+        uses: docker/login-action@v2
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+      
+      # https://github.com/docker/build-push-action#multi-platform-image
+      - name: Build and push base
+        uses: docker/build-push-action@v6.6.1
+        with:
+          context: ./
+          file: ./Dockerfile-base
+          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
+          platforms: linux/amd64
+          pull: true
+          push: true
+          tags: |
+            glax/tranga-base:latest
--- a/.github/workflows/docker-image-cuttingedge.yml
+++ b/.github/workflows/docker-image-cuttingedge.yml
@ -33,12 +33,12 @@ jobs:
      
      # https://github.com/docker/build-push-action#multi-platform-image
      - name: Build and push API
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.6.1
        with:
          context: ./
          file: ./Dockerfile
          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
          pull: true
          push: true
          tags: |
--- a/.github/workflows/docker-image-dev.yml
+++ b/.github/workflows/docker-image-dev.yml
@ -33,12 +33,12 @@ jobs:
      
      # https://github.com/docker/build-push-action#multi-platform-image
      - name: Build and push API
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.6.1
        with:
          context: ./
          file: ./Dockerfile
          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
          pull: true
          push: true
          tags: |
--- a/.github/workflows/docker-image-master.yml
+++ b/.github/workflows/docker-image-master.yml
@ -33,12 +33,12 @@ jobs:
      
      # https://github.com/docker/build-push-action#multi-platform-image
      - name: Build and push API
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.6.1
        with:
          context: ./
          file: ./Dockerfile
          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
          pull: true
          push: true
          tags: |
--- a/.github/workflows/docker-image-serverv2.yml
+++ b/.github/workflows/docker-image-serverv2.yml
@ -33,12 +33,12 @@ jobs:
      
      # https://github.com/docker/build-push-action#multi-platform-image
      - name: Build and push API
-        uses: docker/build-push-action@v6.7.0
+        uses: docker/build-push-action@v6.6.1
        with:
          context: ./
          file: ./Dockerfile
          #platforms: linux/amd64,linux/arm64,linux/riscv64,linux/ppc64le,linux/s390x,linux/386,linux/mips64le,linux/mips64,linux/arm/v7,linux/arm/v6
-          platforms: linux/amd64,linux/arm64
+          platforms: linux/amd64
          pull: true
          push: true
          tags: |
--- a/.gitignore
+++ b/.gitignore
@ -20,6 +20,3 @@ riderModule.iml
 cover.jpg
 cover.png
 /.vscode
-/Manga
-/settings
-*.DotSettings.user
--- a/CLI/Program.cs
+++ b/CLI/Program.cs
@ -47,18 +47,37 @@ internal sealed class TrangaCli : Command<TrangaCli.Settings>
        string? logFolderPath = settings.fileLoggerPath ?? "";
        Logger logger = new(enabledLoggers.ToArray(), Console.Out, Console.OutputEncoding, logFolderPath);
        
-        if(settings.workingDirectory is not null)
-            TrangaSettings.LoadFromWorkingDirectory(settings.workingDirectory);
+        TrangaSettings? trangaSettings = null;
+
+        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.CreateOrUpdate();
-        if(settings.downloadLocation is not null)
-            TrangaSettings.CreateOrUpdate(downloadDirectory: settings.downloadLocation);
+                trangaSettings = new TrangaSettings(downloadLocation: settings.downloadLocation, settings.workingDirectory);
+        }else if (settings.workingDirectory is not null)
+        {
+            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);
+            api = new(logger, trangaSettings);
        });
        trangaApi.Start();
        
@ -101,7 +120,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 += "?";
--- a/45
+++ b/45
@ -1,42 +1,29 @@
 # syntax=docker/dockerfile:1
-ARG DOTNET=7.0

-FROM mcr.microsoft.com/dotnet/runtime:$DOTNET AS base
-WORKDIR /publish
-ENV PUPPETEER_SKIP_CHROMIUM_DOWNLOAD=true
-ENV PUPPETEER_EXECUTABLE_PATH=/usr/bin/chromium
-RUN apt-get update \
-  && apt-get install -y libx11-6 libx11-xcb1 libatk1.0-0 libgtk-3-0 libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libxshmfence1 libnss3 chromium \
-  && apt-get autopurge -y \
-  && apt-get autoclean -y
-
-FROM mcr.microsoft.com/dotnet/sdk:$DOTNET AS build-env
+FROM mcr.microsoft.com/dotnet/sdk:7.0 as build-env
 WORKDIR /src
-
+COPY CLI /src/CLI
+COPY Tranga /src/Tranga
+COPY Logging /src/Logging
 COPY Tranga.sln /src
-COPY CLI/CLI.csproj /src/CLI/CLI.csproj
-COPY Logging/Logging.csproj /src/Logging/Logging.csproj 
-COPY Tranga/Tranga.csproj /src/Tranga/Tranga.csproj
-RUN dotnet restore /src/Tranga.sln
+RUN dotnet restore /src/Tranga/Tranga.csproj
+RUN dotnet publish -c Release -o /publish

-COPY . /src/
-RUN dotnet publish -c Release -o /publish -maxcpucount:1 
-
-FROM base AS runtime
+FROM glax/tranga-base:latest as runtime
 EXPOSE 6531
 ARG UNAME=tranga
 ARG UID=1000
 ARG GID=1000
-RUN groupadd -g $GID -o $UNAME \
-  && useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME \
-  && mkdir /usr/share/tranga-api \
-  && mkdir /Manga \
-  && chown 1000:1000 /usr/share/tranga-api \
-  && chown 1000:1000 /Manga 
+RUN groupadd -g $GID -o $UNAME
+RUN useradd -m -u $UID -g $GID -o -s /bin/bash $UNAME
+RUN mkdir /usr/share/tranga-api
+RUN mkdir /Manga
+RUN chown 1000:1000 /usr/share/tranga-api
+RUN chown 1000:1000 /Manga
 USER $UNAME

 WORKDIR /publish
-COPY --chown=1000:1000 --from=build-env /publish .
+COPY --from=build-env /publish .
 USER 0
-ENTRYPOINT ["dotnet", "/publish/Tranga.dll"]
-CMD ["-f", "-c", "-l", "/usr/share/tranga-api/logs"]
+RUN chown 1000:1000 /publish
+ENTRYPOINT ["dotnet", "/publish/Tranga.dll", "-f", "-c", "-l", "/usr/share/tranga-api/logs"]
--- a/8
+++ b/8
@ -0,0 +1,8 @@
+# syntax=docker/dockerfile:1
+#FROM mcr.microsoft.com/dotnet/aspnet:7.0 as runtime
+FROM mcr.microsoft.com/dotnet/runtime:7.0 as runtime
+WORKDIR /publish
+RUN apt-get update
+RUN apt-get install -y libx11-6 libx11-xcb1 libatk1.0-0 libgtk-3-0 libcups2 libdrm2 libxkbcommon0 libxcomposite1 libxdamage1 libxrandr2 libgbm1 libpango-1.0-0 libcairo2 libasound2 libxshmfence1 libnss3
+RUN apt-get autopurge -y
+RUN apt-get autoclean -y
--- a/README.md
+++ b/README.md
@ -50,8 +50,6 @@ 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/).  
--- a/Tranga/Chapter.cs
+++ b/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()
+    internal bool CheckChapterIsDownloaded(string downloadLocation)
    {
-        if (!Directory.Exists(Path.Join(TrangaSettings.downloadLocation, parentManga.folderName)))
+        if (!Directory.Exists(Path.Join(downloadLocation, parentManga.folderName)))
            return false;
-        FileInfo[] archives = new DirectoryInfo(Path.Join(TrangaSettings.downloadLocation, parentManga.folderName)).GetFiles().Where(file => file.Name.Split('.')[^1] == "cbz").ToArray();
+        FileInfo[] archives = new DirectoryInfo(Path.Join(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();
+        string thisPath = GetArchiveFilePath(downloadLocation);
        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()
+    internal string GetArchiveFilePath(string downloadLocation)
    {
-        return Path.Join(TrangaSettings.downloadLocation, parentManga.folderName, $"{parentManga.folderName} - {this.fileName}.cbz");
+        return Path.Join(downloadLocation, parentManga.folderName, $"{parentManga.folderName} - {this.fileName}.cbz");
    }

    /// <summary>
--- a/Tranga/GlobalBase.cs
+++ b/Tranga/GlobalBase.cs
@ -11,6 +11,7 @@ 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; }
@ -20,16 +21,18 @@ 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)
+    protected GlobalBase(Logger? logger, TrangaSettings settings)
    {
        this.logger = logger;
-        this.notificationConnectors = TrangaSettings.LoadNotificationConnectors(this);
-        this.libraryConnectors = TrangaSettings.LoadLibraryConnectors(this);
+        this.settings = settings;
+        this.notificationConnectors = settings.LoadNotificationConnectors(this);
+        this.libraryConnectors = settings.LoadLibraryConnectors(this);
        this.cachedPublications = new();
    }

@ -78,20 +81,20 @@ public abstract class GlobalBase
        notificationConnectors.RemoveWhere(nc => nc.notificationConnectorType == notificationConnector.notificationConnectorType);
        notificationConnectors.Add(notificationConnector);
        
-        while(IsFileInUse(TrangaSettings.notificationConnectorsFilePath))
+        while(IsFileInUse(settings.notificationConnectorsFilePath))
            Thread.Sleep(100);
        Log("Exporting notificationConnectors");
-        File.WriteAllText(TrangaSettings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
+        File.WriteAllText(settings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
    }

    protected void DeleteNotificationConnector(NotificationConnector.NotificationConnectorType notificationConnectorType)
    {
        Log($"Removing {notificationConnectorType}");
        notificationConnectors.RemoveWhere(nc => nc.notificationConnectorType == notificationConnectorType);
-        while(IsFileInUse(TrangaSettings.notificationConnectorsFilePath))
+        while(IsFileInUse(settings.notificationConnectorsFilePath))
            Thread.Sleep(100);
        Log("Exporting notificationConnectors");
-        File.WriteAllText(TrangaSettings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
+        File.WriteAllText(settings.notificationConnectorsFilePath, JsonConvert.SerializeObject(notificationConnectors));
    }

    protected void UpdateLibraries()
@ -106,20 +109,20 @@ public abstract class GlobalBase
        libraryConnectors.RemoveWhere(lc => lc.libraryType == libraryConnector.libraryType);
        libraryConnectors.Add(libraryConnector);
        
-        while(IsFileInUse(TrangaSettings.libraryConnectorsFilePath))
+        while(IsFileInUse(settings.libraryConnectorsFilePath))
            Thread.Sleep(100);
        Log("Exporting libraryConnectors");
-        File.WriteAllText(TrangaSettings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
+        File.WriteAllText(settings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
    }

    protected void DeleteLibraryConnector(LibraryConnector.LibraryType libraryType)
    {
        Log($"Removing {libraryType}");
        libraryConnectors.RemoveWhere(lc => lc.libraryType == libraryType);
-        while(IsFileInUse(TrangaSettings.libraryConnectorsFilePath))
+        while(IsFileInUse(settings.libraryConnectorsFilePath))
            Thread.Sleep(100);
        Log("Exporting libraryConnectors");
-        File.WriteAllText(TrangaSettings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
+        File.WriteAllText(settings.libraryConnectorsFilePath, JsonConvert.SerializeObject(libraryConnectors, Formatting.Indented));
    }

    protected bool IsFileInUse(string filePath) => IsFileInUse(filePath, this.logger);
--- a/Tranga/Jobs/DownloadNewChapters.cs
+++ b/Tranga/Jobs/DownloadNewChapters.cs
@ -33,7 +33,7 @@ public class DownloadNewChapters : Job

    protected override IEnumerable<Job> ExecuteReturnSubTasksInternal(JobBoss jobBoss)
    {
-        manga.SaveSeriesInfoJson();
+        manga.SaveSeriesInfoJson(settings.downloadLocation);
        Chapter[] chapters = mangaConnector.GetNewChapters(manga, this.translatedLanguage);
        this.progressToken.increments = chapters.Length;
        List<Job> jobs = new();
--- a/Tranga/Jobs/JobBoss.cs
+++ b/Tranga/Jobs/JobBoss.cs
@ -140,15 +140,15 @@ public class JobBoss : GlobalBase

    private void LoadJobsList(HashSet<MangaConnector> connectors)
    {
-        if (!Directory.Exists(TrangaSettings.jobsFolderPath)) //No jobs to load
+        if (!Directory.Exists(settings.jobsFolderPath)) //No jobs to load
        {
-            Directory.CreateDirectory(TrangaSettings.jobsFolderPath);
+            Directory.CreateDirectory(settings.jobsFolderPath);
            return;
        }
        Regex idRex = new (@"(.*)\.json");

        //Load json-job-files
-        foreach (FileInfo file in new DirectoryInfo(TrangaSettings.jobsFolderPath).EnumerateFiles().Where(fileInfo => idRex.IsMatch(fileInfo.Name)))
+        foreach (FileInfo file in new DirectoryInfo(settings.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(TrangaSettings.coverImageCache);
+        string[] coverFiles = Directory.GetFiles(settings.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(TrangaSettings.jobsFolderPath, $"{job.id}.json");
+        string newJobFilePath = Path.Join(settings.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(TrangaSettings.jobsFolderPath).EnumerateFiles())
+        foreach (FileInfo file in new DirectoryInfo(settings.jobsFolderPath).EnumerateFiles())
        {
            if (idRex.IsMatch(file.Name))
            {
--- a/Tranga/Jobs/UpdateMetadata.cs
+++ b/Tranga/Jobs/UpdateMetadata.cs
@ -34,7 +34,7 @@ public class UpdateMetadata : Job
            }
            
            this.manga = manga.WithMetadata(updatedManga);
-            this.manga.SaveSeriesInfoJson(true);
+            this.manga.SaveSeriesInfoJson(settings.downloadLocation, true);
            this.mangaConnector.CopyCoverFromCacheToDownloadLocation(manga);
            foreach (Job job in jobBoss.GetJobsLike(publication: this.manga))
            {
--- a/Tranga/Manga.cs
+++ b/Tranga/Manga.cs
@ -128,20 +128,11 @@ public struct Manga
    public void MovePublicationFolder(string downloadDirectory, string newFolderName)
    {
        string oldPath = Path.Join(downloadDirectory, this.folderName);
-        this.folderName = newFolderName;//Create new Path with the new folderName
+        this.folderName = newFolderName;
        string newPath = CreatePublicationFolder(downloadDirectory);
-        if (Directory.Exists(oldPath))
-        {
-            if (Directory.Exists(newPath)) //Move/Overwrite old Files, Delete old Directory
-            {
-                IEnumerable<string> newPathFileNames = new DirectoryInfo(newPath).GetFiles().Select(fi => fi.Name);
-                foreach(FileInfo fileInfo in new DirectoryInfo(oldPath).GetFiles().Where(fi => newPathFileNames.Contains(fi.Name) == false))
-                    File.Move(fileInfo.FullName, Path.Join(newPath, fileInfo.Name), true);
-                Directory.Delete(oldPath);
-            }else
+        if(Directory.Exists(oldPath))
            Directory.Move(oldPath, newPath);
    }
-    }

    public void UpdateLatestDownloadedChapter(Chapter chapter)//TODO check files if chapters are all downloaded
    {
@ -149,9 +140,9 @@ public struct Manga
        latestChapterDownloaded = latestChapterDownloaded < chapterNumber ? chapterNumber : latestChapterDownloaded;
    }

-    public void SaveSeriesInfoJson(bool overwrite = false)
+    public void SaveSeriesInfoJson(string downloadDirectory, bool overwrite = false)
    {
-        string publicationFolder = CreatePublicationFolder(TrangaSettings.downloadLocation);
+        string publicationFolder = CreatePublicationFolder(downloadDirectory);
        string seriesInfoPath = Path.Join(publicationFolder, "series.json");
        if(overwrite || (!overwrite && !File.Exists(seriesInfoPath)))
            File.WriteAllText(seriesInfoPath,this.GetSeriesInfoJson());
--- a/Tranga/MangaConnectors/Bato.cs
+++ b/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(), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
+		return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
 	}

 	private string[] ParseImageUrlsFromHtml(string mangaUrl)
--- a/Tranga/MangaConnectors/ChromiumDownloadClient.cs
+++ b/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,14 +11,41 @@ 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> StartBrowser()
+    private async Task<IBrowser> DownloadBrowser()
    {
+        BrowserFetcher browserFetcher = new BrowserFetcher();
+        foreach(string rev in browserFetcher.LocalRevisions().Where(rev => rev != ChromiumVersion))
+            browserFetcher.Remove(rev);
+        if (!browserFetcher.LocalRevisions().Contains(ChromiumVersion))
+        {
+            Log("Downloading headless browser");
+            DateTime last = DateTime.Now.Subtract(TimeSpan.FromSeconds(5));
+            browserFetcher.DownloadProgressChanged += (_, args) =>
+            {
+                double currentBytes = Convert.ToDouble(args.BytesReceived) / Convert.ToDouble(args.TotalBytesToReceive);
+                if (args.TotalBytesToReceive == args.BytesReceived)
+                    Log("Browser downloaded.");
+                else if (DateTime.Now > last.AddSeconds(1))
+                {
+                    Log($"Browser download progress: {currentBytes:P2}");
+                    last = DateTime.Now;
+                }
+
+            };
+            if (!browserFetcher.CanDownloadAsync(ChromiumVersion).Result)
+            {
+                Log($"Can't download browser version {ChromiumVersion}");
+                throw new Exception();
+            }
+            await browserFetcher.DownloadAsync(ChromiumVersion);
+        }
+        
        Log($"Starting Browser. ({StartTimeoutMs}ms timeout)");
        return await Puppeteer.LaunchAsync(new LaunchOptions
        {
            Headless = true,
+            ExecutablePath = browserFetcher.GetExecutablePath(ChromiumVersion),
            Args = new [] {
                "--disable-gpu",
                "--disable-dev-shm-usage",
@ -30,19 +57,10 @@ internal class ChromiumDownloadClient : DownloadClient

    public ChromiumDownloadClient(GlobalBase clone) : base(clone)
    {
-        this.browser = StartBrowser().Result;
-        _httpDownloadClient = new(this);
+        this.browser = DownloadBrowser().Result;
    }

-    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)
+    protected override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
    {
        IPage page = this.browser.NewPageAsync().Result;
        page.DefaultTimeout = 10000;
--- a/Tranga/MangaConnectors/DownloadClient.cs
+++ b/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 (!TrangaSettings.requestLimits.ContainsKey(requestType))
+        if (!settings.requestLimits.ContainsKey(requestType))
        {
            Log("RequestType not configured for rate-limit.");
            return new RequestResult(HttpStatusCode.NotAcceptable, null, Stream.Null);
        }

-        int rateLimit = TrangaSettings.userAgent == TrangaSettings.DefaultUserAgent
+        int rateLimit = settings.userAgent == TrangaSettings.DefaultUserAgent
            ? TrangaSettings.DefaultRequestLimits[requestType]
-            : TrangaSettings.requestLimits[requestType];
+            : settings.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;
    }

-    internal abstract RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null);
+    protected abstract RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null);
    public abstract void Close();
 }
--- a/Tranga/MangaConnectors/HttpDownloadClient.cs
+++ b/Tranga/MangaConnectors/HttpDownloadClient.cs
@ -13,10 +13,10 @@ internal class HttpDownloadClient : DownloadClient

    public HttpDownloadClient(GlobalBase clone) : base(clone)
    {
-        Client.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", TrangaSettings.userAgent);
+        Client.DefaultRequestHeaders.TryAddWithoutValidation("User-Agent", settings.userAgent);
    }
    
-    internal override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
+    protected override RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null)
    {
        if(clickButton is not null)
            Log("Can not click button on static site.");
--- a/Tranga/MangaConnectors/MangaConnector.cs
+++ b/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(TrangaSettings.coverImageCache);
+        Directory.CreateDirectory(settings.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()).ToList();
+                                                                      && !nChapter.CheckChapterIsDownloaded(settings.downloadLocation)).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(TrangaSettings.downloadLocation);
+        string publicationFolder = manga.CreatePublicationFolder(settings.downloadLocation);
        DirectoryInfo dirInfo = new (publicationFolder);
        if (dirInfo.EnumerateFiles().Any(info => info.Name.Contains("cover", StringComparison.InvariantCultureIgnoreCase)))
        {
@ -222,8 +222,8 @@ public abstract class MangaConnector : GlobalBase
        if (progressToken?.cancellationRequested ?? false)
            return HttpStatusCode.RequestTimeout;
        Log($"Downloading Images for {saveArchiveFilePath}");
-        if (progressToken is not null)
-            progressToken.increments += imageUrls.Length;
+        if(progressToken is not null)
+            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(TrangaSettings.coverImageCache, filename);
+        string saveImagePath = Path.Join(settings.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(TrangaSettings.coverImageCache);
+        Directory.CreateDirectory(settings.coverImageCache);
        File.WriteAllBytes(saveImagePath, ms.ToArray());
        Log($"Saving cover to {saveImagePath}");
        return saveImagePath;
--- a/Tranga/MangaConnectors/MangaConnectorJsonConverter.cs
+++ b/Tranga/MangaConnectors/MangaConnectorJsonConverter.cs
@ -40,8 +40,6 @@ public class MangaConnectorJsonConverter : JsonConverter
                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();
--- a/Tranga/MangaConnectors/MangaDex.cs
+++ b/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(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
+        return DownloadChapterImages(imageUrls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
    }
 }
--- a/Tranga/MangaConnectors/MangaHere.cs
+++ b/Tranga/MangaConnectors/MangaHere.cs
@ -1,203 +0,0 @@
-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();
-    }
-}
--- a/Tranga/MangaConnectors/MangaKatana.cs
+++ b/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(), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
+		return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, "https://mangakatana.com/", progressToken:progressToken);
 	}

 	private string[] ParseImageUrlsFromHtml(string mangaUrl)
--- a/Tranga/MangaConnectors/MangaLife.cs
+++ b/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(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
+        return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
    }
 }
--- a/Tranga/MangaConnectors/Manganato.cs
+++ b/Tranga/MangaConnectors/Manganato.cs
@ -1,5 +1,4 @@
-using System.Globalization;
-using System.Net;
+using System.Net;
 using System.Text.RegularExpressions;
 using HtmlAgilityPack;
 using Tranga.Jobs;
@ -128,16 +127,9 @@ public class Manganato : MangaConnector
        while (description.StartsWith('\n'))
            description = description.Substring(1);

-        string pattern = "MMM dd,yyyy HH:mm";
-
-        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;
+        string yearString = document.DocumentNode.Descendants("li").Last(li => li.HasClass("a-h")).Descendants("span")
+            .First(s => s.HasClass("chapter-time")).InnerText;
+        int year = Convert.ToInt32(yearString.Split(',')[^1]) + 2000;
        
        Manga manga = new (sortName, authors.ToList(), description, altTitles, tags.ToArray(), posterUrl, coverFileNameInCache, links,
            year, originalLanguage, publicationId, releaseStatus, websiteUrl: websiteUrl);
@ -217,7 +209,7 @@ public class Manganato : MangaConnector
        string comicInfoPath = Path.GetTempFileName();
        File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
        
-        return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, "https://chapmanganato.com/", progressToken:progressToken);
+        return DownloadChapterImages(imageUrls, chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, "https://chapmanganato.com/", progressToken:progressToken);
    }

    private string[] ParseImageUrlsFromHtml(HtmlDocument document)
--- a/Tranga/MangaConnectors/Mangasee.cs
+++ b/Tranga/MangaConnectors/Mangasee.cs
@ -61,27 +61,21 @@ 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();
-            string filteredPublicationString = ToFilteredString(publicationTitle);
-            string filteredSString = ToFilteredString(sr.s);
-            scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(filteredSString, filteredPublicationString));
-            foreach (string srA in sr.a)
-            {
-                string filteredAString = ToFilteredString(srA);
-                scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(filteredAString, filteredPublicationString));
-            }
+            foreach (string se in sr.a)
+                scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(se.ToLower(), publicationTitle.ToLower()));
+            scores.Add(NeedlemanWunschStringUtil.CalculateSimilarity(sr.s.ToLower(), publicationTitle.ToLower()));
            similarity.Add(sr, scores.Sum() / scores.Count);
        }

-        List<SearchResult> ret = similarity.OrderBy(s => s.Value).Take(10).Select(s => s.Key).ToList();
-        return ret.ToArray();
+        SearchResult[] similarity90 = similarity.Where(s => s.Value < 10).Select(s => s.Key).ToArray();
+
+        return similarity90;
    }

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

    private string[] ParseImageUrlsFromHtml(HtmlDocument document)
--- a/Tranga/MangaConnectors/ManhuaPlus.cs
+++ b/Tranga/MangaConnectors/ManhuaPlus.cs
@ -179,6 +179,6 @@ public class ManhuaPlus : MangaConnector
        string comicInfoPath = Path.GetTempFileName();
        File.WriteAllText(comicInfoPath, chapter.GetComicInfoXmlString());
        
-        return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
+        return DownloadChapterImages(urls.ToArray(), chapter.GetArchiveFilePath(settings.downloadLocation), RequestType.MangaImage, comicInfoPath, progressToken:progressToken);
    }
 }
--- a/Tranga/Server.cs
+++ b/Tranga/Server.cs
@ -19,9 +19,9 @@ public class Server : GlobalBase
    {
        this._parent = parent;
        if(RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
-            this._listener.Prefixes.Add($"http://*:{TrangaSettings.apiPortNumber}/");
+            this._listener.Prefixes.Add($"http://*:{settings.apiPortNumber}/");
        else
-            this._listener.Prefixes.Add($"http://localhost:{TrangaSettings.apiPortNumber}/");
+            this._listener.Prefixes.Add($"http://localhost:{settings.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, TrangaSettings.AsJObject());
+                SendResponse(HttpStatusCode.OK, response, settings);
                break;
            case "Settings/userAgent":
-                SendResponse(HttpStatusCode.OK, response, TrangaSettings.userAgent);
+                SendResponse(HttpStatusCode.OK, response, settings.userAgent);
                break;
            case "Settings/customRequestLimit":
-                SendResponse(HttpStatusCode.OK, response, TrangaSettings.requestLimits);
+                SendResponse(HttpStatusCode.OK, response, settings.requestLimits);
                break;
            case "Settings/AprilFoolsMode":
-                SendResponse(HttpStatusCode.OK, response, TrangaSettings.aprilFoolsMode);
+                SendResponse(HttpStatusCode.OK, response, settings.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(TrangaSettings.downloadLocation, customFolderName);
+                    manga.MovePublicationFolder(settings.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(TrangaSettings.downloadLocation, customFolderName);
+                    manga.MovePublicationFolder(settings.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;
                }
-                TrangaSettings.UpdateDownloadLocation(downloadLocation, moveFiles);
+                settings.UpdateDownloadLocation(downloadLocation, moveFiles);
                SendResponse(HttpStatusCode.Accepted, response);
                break;
            case "Settings/AprilFoolsMode":
@ -415,7 +415,7 @@ public class Server : GlobalBase
                    SendResponse(HttpStatusCode.BadRequest, response);
                    break;
                }
-                TrangaSettings.UpdateAprilFoolsMode(aprilFoolsModeEnabled);
+                settings.UpdateAprilFoolsMode(aprilFoolsModeEnabled);
                SendResponse(HttpStatusCode.Accepted, response);
                break;
            /*case "Settings/UpdateWorkingDirectory":
@ -433,11 +433,11 @@ public class Server : GlobalBase
                    SendResponse(HttpStatusCode.BadRequest, response);
                    break;
                }
-                TrangaSettings.UpdateUserAgent(customUserAgent);
+                settings.UpdateUserAgent(customUserAgent);
                SendResponse(HttpStatusCode.Accepted, response);
                break;
            case "Settings/userAgent/Reset":
-                TrangaSettings.UpdateUserAgent(null);
+                settings.UpdateUserAgent(null);
                SendResponse(HttpStatusCode.Accepted, response);
                break;
            case "Settings/customRequestLimit":
@ -450,11 +450,17 @@ public class Server : GlobalBase
                    break;
                }

-                TrangaSettings.UpdateRateLimit(requestType, requestsPerMinute);
+                if (settings.requestLimits.ContainsKey(requestType))
+                {
+                    settings.requestLimits[requestType] = requestsPerMinute;
                    SendResponse(HttpStatusCode.Accepted, response);
+                }else
+                    SendResponse(HttpStatusCode.BadRequest, response);
+                settings.ExportSettings();
                break;
            case "Settings/customRequestLimit/Reset":
-                TrangaSettings.ResetRateLimits();
+                settings.requestLimits = TrangaSettings.DefaultRequestLimits;
+                settings.ExportSettings();
                break;
            case "NotificationConnectors/Update":
                if (!requestVariables.TryGetValue("notificationConnector", out notificationConnectorStr) ||
@ -713,21 +719,24 @@ 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";
-                response.AddHeader("Cache-Control", "no-store");
+            try
+            {
                response.OutputStream.Write(content is not null
                    ? Encoding.UTF8.GetBytes(JsonConvert.SerializeObject(content))
                    : Array.Empty<byte>());
                response.OutputStream.Close();
            }
-            else if (content is FileStream stream)
+            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":
@ -744,15 +753,9 @@ public class Server : GlobalBase
                    response.ContentType = "text/plain";
                    break;
            }
-
            stream.CopyTo(response.OutputStream);
            response.OutputStream.Close();
            stream.Close();
        }
    }
-        catch (HttpListenerException e)
-        {
-            Log(e.ToString());
-        }
-    }
 }
--- a/Tranga/Tranga.cs
+++ b/Tranga/Tranga.cs
@ -11,9 +11,10 @@ public partial class Tranga : GlobalBase
    private Server _server;
    private HashSet<MangaConnector> _connectors;

-    public Tranga(Logger? logger) : base(logger)
+    public Tranga(Logger? logger, TrangaSettings settings) : base(logger, settings)
    {
        Log("\n\n _______                                   \n|_     _|.----..---.-..-----..-----..---.-.\n  |   |  |   _||  _  ||     ||  _  ||  _  |\n  |___|  |__|  |___._||__|__||___  ||___._|\n                             |_____|       \n\n");
+        Log(settings.ToString());
        keepRunning = true;
        _connectors = new HashSet<MangaConnector>()
        {  
@ -24,8 +25,7 @@ public partial class Tranga : GlobalBase
            new Mangaworld(this),
            new Bato(this),
            new MangaLife(this),
-            new ManhuaPlus(this),
-            new MangaHere(this),
+            new ManhuaPlus(this)
        };
        foreach(DirectoryInfo dir in new DirectoryInfo(Path.GetTempPath()).GetDirectories("trangatemp"))//Cleanup old temp folders
            dir.Delete();
@ -69,7 +69,7 @@ public partial class Tranga : GlobalBase
        {
            while (keepRunning)
            {
-                if(!TrangaSettings.aprilFoolsMode || !IsAprilFirst())
+                if(!settings.aprilFoolsMode || !IsAprilFirst())
                    jobBoss.CheckJobs();
                else
                    Log("April Fools Mode in Effect");
--- a/Tranga/TrangaArgs.cs
+++ b/Tranga/TrangaArgs.cs
@ -36,16 +36,34 @@ 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(workingDirectory, out string[]? workingDirectoryPath);
+        bool wdp = fetched.TryGetValue(downloadLocation, out string[]? workingDirectoryPath);

-        if (wdp)
-            TrangaSettings.LoadFromWorkingDirectory(workingDirectoryPath![0]);
+        if (dlp && wdp)
+        {
+            settings = new TrangaSettings(downloadLocationPath![0], workingDirectoryPath![0]);
+        }else if (dlp)
+        {
+            if (settings is null)
+                settings = new TrangaSettings(downloadLocation: downloadLocationPath![0]);
            else
-            TrangaSettings.CreateOrUpdate();
-        if(dlp)
-            TrangaSettings.CreateOrUpdate(downloadDirectory: downloadLocationPath![0]);
+                settings = new TrangaSettings(downloadLocation: downloadLocationPath![0], settings.workingDirectory);
+        }else if (wdp)
+        {
+            if (settings is null)
+                settings = new TrangaSettings(downloadLocation: workingDirectoryPath![0]);
+            else
+                settings = new TrangaSettings(settings.downloadLocation, workingDirectoryPath![0]);
+        }
+        else
+        {
+            settings = new TrangaSettings();
+        }
        
-        Tranga _ = new (logger);
+        Directory.CreateDirectory(settings.downloadLocation);//TODO validate path
+        Directory.CreateDirectory(settings.workingDirectory);//TODO validate path
+
+        Tranga _ = new (logger, settings);
    }
 }
--- a/Tranga/TrangaSettings.cs
+++ b/Tranga/TrangaSettings.cs
@ -1,6 +1,7 @@
 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;
@ -8,20 +9,20 @@ using static System.IO.UnixFileMode;

 namespace Tranga;

-public static class TrangaSettings
+public 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 static string downloadLocation { get; private set; } = (RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/Manga" : Path.Join(Directory.GetCurrentDirectory(), "Downloads"));
-    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;
+    public ushort? version { get; } = 2;
+    public bool aprilFoolsMode { get; private set; } = true;
    [JsonIgnore]internal static readonly Dictionary<RequestType, int> DefaultRequestLimits = new ()
    {
        {RequestType.MangaInfo, 250},
@ -32,35 +33,50 @@ public static class TrangaSettings
        {RequestType.Default, 60}
    };

-    public static Dictionary<RequestType, int> requestLimits { get; set; } = DefaultRequestLimits;
+    public Dictionary<RequestType, int> requestLimits { get; set; } = DefaultRequestLimits;

-    public static void LoadFromWorkingDirectory(string directory)
+    public TrangaSettings(string? downloadLocation = null, string? workingDirectory = null, int? apiPortNumber = null)
    {
-        TrangaSettings.workingDirectory = directory;
-        if(File.Exists(settingsFilePath))
-            Deserialize(File.ReadAllText(settingsFilePath));
-        else return;
+        string wd = workingDirectory ?? Path.Join(RuntimeInformation.IsOSPlatform(OSPlatform.Linux) ? "/usr/share" : Environment.GetFolderPath(Environment.SpecialFolder.ApplicationData), "tranga-api");
+        string sfp = Path.Join(wd, "settings.json");
        
-        Directory.CreateDirectory(downloadLocation);
-        Directory.CreateDirectory(workingDirectory);
+        string lockFilePath = $"{sfp}.lock";
+        if (File.Exists(sfp) && !File.Exists(lockFilePath))
+        {//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();
        }
-
-    public static void CreateOrUpdate(string? downloadDirectory = null, string? pWorkingDirectory = null, int? pApiPortNumber = null, string? pUserAgent = null, bool? pAprilFoolsMode = null)
-    {
-        if(pWorkingDirectory is null && File.Exists(settingsFilePath))
-            LoadFromWorkingDirectory(workingDirectory);
-        TrangaSettings.downloadLocation = downloadDirectory ?? TrangaSettings.downloadLocation;
-        TrangaSettings.workingDirectory = pWorkingDirectory ?? TrangaSettings.workingDirectory;
-        TrangaSettings.apiPortNumber = pApiPortNumber ?? TrangaSettings.apiPortNumber;
-        TrangaSettings.userAgent = pUserAgent ?? TrangaSettings.userAgent;
-        TrangaSettings.aprilFoolsMode = pAprilFoolsMode ?? TrangaSettings.aprilFoolsMode;
-        Directory.CreateDirectory(downloadLocation);
-        Directory.CreateDirectory(workingDirectory);
-        ExportSettings();
+        else
+        {//Settingsfile is locked
+            this.requestLimits = DefaultRequestLimits;
+            this.userAgent = DefaultUserAgent;
+            this.apiPortNumber = apiPortNumber!.Value;
+            this.downloadLocation = downloadLocation!;
+            this.workingDirectory = workingDirectory!;
+        }
+        UpdateDownloadLocation(this.downloadLocation, false);
    }

-    public static HashSet<LibraryConnector> LoadLibraryConnectors(GlobalBase clone)
+    public HashSet<LibraryConnector> LoadLibraryConnectors(GlobalBase clone)
    {
        if (!File.Exists(libraryConnectorsFilePath))
            return new HashSet<LibraryConnector>();
@ -74,7 +90,7 @@ public static class TrangaSettings
            })!;
    }

-    public static HashSet<NotificationConnector> LoadNotificationConnectors(GlobalBase clone)
+    public HashSet<NotificationConnector> LoadNotificationConnectors(GlobalBase clone)
    {
        if (!File.Exists(notificationConnectorsFilePath))
            return new HashSet<NotificationConnector>();
@ -88,13 +104,13 @@ public static class TrangaSettings
            })!;
    }

-    public static void UpdateAprilFoolsMode(bool enabled)
+    public void UpdateAprilFoolsMode(bool enabled)
    {
-        TrangaSettings.aprilFoolsMode = enabled;
+        this.aprilFoolsMode = enabled;
        ExportSettings();
    }

-    public static void UpdateDownloadLocation(string newPath, bool moveFiles = true)
+    public void UpdateDownloadLocation(string newPath, bool moveFiles = true)
    {
        if (RuntimeInformation.IsOSPlatform(OSPlatform.Linux))
            Directory.CreateDirectory(newPath,
@ -102,44 +118,32 @@ public static class TrangaSettings
        else
            Directory.CreateDirectory(newPath);
        
-        if (moveFiles && Directory.Exists(TrangaSettings.downloadLocation))
-            Directory.Move(TrangaSettings.downloadLocation, newPath);
+        if (moveFiles && Directory.Exists(this.downloadLocation))
+            Directory.Move(this.downloadLocation, newPath);

-        TrangaSettings.downloadLocation = newPath;
+        this.downloadLocation = newPath;
        ExportSettings();
    }

-    public static void UpdateWorkingDirectory(string newPath)
+    public 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(TrangaSettings.workingDirectory, newPath);
-        TrangaSettings.workingDirectory = newPath;
+        Directory.Move(this.workingDirectory, newPath);
+        this.workingDirectory = newPath;
        ExportSettings();
    }

-    public static void UpdateUserAgent(string? customUserAgent)
+    public void UpdateUserAgent(string? customUserAgent)
    {
-        TrangaSettings.userAgent = customUserAgent ?? DefaultUserAgent;
+        this.userAgent = customUserAgent ?? DefaultUserAgent;
        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()
+    public void ExportSettings()
    {
        if (File.Exists(settingsFilePath))
        {
@ -148,38 +152,22 @@ public static class TrangaSettings
        }
        else
            Directory.CreateDirectory(new FileInfo(settingsFilePath).DirectoryName!);
-        File.WriteAllText(settingsFilePath, Serialize());
+        File.WriteAllText(settingsFilePath, JsonConvert.SerializeObject(this, Formatting.Indented));
    }

-    public static JObject AsJObject()
+    public string GetFullCoverPath(Manga manga)
    {
-        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;
+        return Path.Join(this.coverImageCache, manga.coverFileNameInCache);
    }

-    public static string Serialize() => AsJObject().ToString();
-
-    public static void Deserialize(string serialized)
+    public override string ToString()
    {
-        JObject jobj = JObject.Parse(serialized);
-        if (jobj.TryGetValue("downloadLocation", out JToken? dl))
-            TrangaSettings.downloadLocation = dl.Value<string>()!;
-        if (jobj.TryGetValue("workingDirectory", out JToken? wd))
-            TrangaSettings.workingDirectory = wd.Value<string>()!;
-        if (jobj.TryGetValue("apiPortNumber", out JToken? apn))
-            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>>()!;
+        return $"TrangaSettings:\n" +
+               $"\tDownloadLocation: {downloadLocation}\n" +
+               $"\tworkingDirectory: {workingDirectory}\n" +
+               $"\tjobsFolderPath: {jobsFolderPath}\n" +
+               $"\tsettingsFilePath: {settingsFilePath}\n" +
+               $"\t\tnotificationConnectors: {notificationConnectorsFilePath}\n" +
+               $"\t\tlibraryConnectors: {libraryConnectorsFilePath}\n";
    }
 }
--- a/docker-compose.local.yaml
+++ b/docker-compose.local.yaml
@ -1,21 +0,0 @@
-version: '3'
-services:
-  tranga-api:
-    build:
-      dockerfile: Dockerfile
-      context: .
-    container_name: tranga-api
-    volumes:
-      - ./Manga:/Manga
-      - ./settings:/usr/share/tranga-api
-    ports:
-      - "6531:6531"
-    restart: unless-stopped
-  tranga-website:
-    image: glax/tranga-website:latest
-    container_name: tranga-website
-    ports:
-      - "9555:80"
-    depends_on: 
-      - tranga-api
-    restart: unless-stopped