CLI/CLI.csproj

@@ -2,10 +2,9 @@
 
     <PropertyGroup>
         <OutputType>Exe</OutputType>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

Dockerfile

@@ -1,5 +1,5 @@
 # syntax=docker/dockerfile:1
-ARG DOTNET=8.0
+ARG DOTNET=7.0
 
 FROM mcr.microsoft.com/dotnet/runtime:$DOTNET AS base
 WORKDIR /publish

Logging/Logging.csproj

@@ -1,10 +1,9 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
-        <LangVersion>12</LangVersion>
     </PropertyGroup>
 
 </Project>

Tranga/Manga.cs

@@ -67,7 +67,7 @@ public struct Manga
         while (this.folderName.EndsWith('.'))
             this.folderName = this.folderName.Substring(0, this.folderName.Length - 1);
         string onlyLowerLetters = string.Concat(this.sortName.ToLower().Where(Char.IsLetter));
-        this.internalId = DateTime.Now.Ticks.ToString();
+        this.internalId = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{onlyLowerLetters}{this.year}"));
         this.ignoreChaptersBelow = ignoreChaptersBelow ?? 0f;
         this.latestChapterDownloaded = 0;
         this.latestChapterAvailable = 0;

Tranga/MangaConnectors/Bato.cs

@@ -8,7 +8,7 @@ namespace Tranga.MangaConnectors;
 public class Bato : MangaConnector
 {
 	
-	public Bato(GlobalBase clone) : base(clone, "Bato", ["en"])
+	public Bato(GlobalBase clone) : base(clone, "Bato")
 	{
 		this.downloadClient = new HttpDownloadClient(clone);
 	}

Tranga/MangaConnectors/ChromiumDownloadClient.cs

@@ -8,12 +8,13 @@ namespace Tranga.MangaConnectors;
 
 internal class ChromiumDownloadClient : DownloadClient
 {
-    private static readonly IBrowser Browser = StartBrowser().Result;
+    private IBrowser browser { get; set; }
-    private const int StartTimeoutMs = 10000;
+    private const int StartTimeoutMs = 30000;
     private readonly HttpDownloadClient _httpDownloadClient;
     
-    private static async Task<IBrowser> StartBrowser()
+    private async Task<IBrowser> StartBrowser()
     {
+        Log($"Starting Browser. ({StartTimeoutMs}ms timeout)");
         return await Puppeteer.LaunchAsync(new LaunchOptions
         {
             Headless = true,
@@ -28,6 +29,7 @@ internal class ChromiumDownloadClient : DownloadClient
 
     public ChromiumDownloadClient(GlobalBase clone) : base(clone)
     {
+        this.browser = StartBrowser().Result;
         _httpDownloadClient = new(this);
     }
 
@@ -41,7 +43,7 @@ internal class ChromiumDownloadClient : DownloadClient
 
     private RequestResult MakeRequestBrowser(string url, string? referrer = null, string? clickButton = null)
     {
-        IPage page = Browser.NewPageAsync().Result;
+        IPage page = this.browser.NewPageAsync().Result;
         page.DefaultTimeout = 10000;
         IResponse response;
         try
@@ -52,7 +54,6 @@ internal class ChromiumDownloadClient : DownloadClient
         catch (Exception e)
         {
             Log($"Could not load Page:\n{e.Message}");
-            page.CloseAsync();
             return new RequestResult(HttpStatusCode.InternalServerError, null, Stream.Null);
         }
 
@@ -83,4 +84,9 @@ internal class ChromiumDownloadClient : DownloadClient
         page.CloseAsync();
         return new RequestResult(response.Status, document, stream, false, "");
     }
+
+    public override void Close()
+    {
+        this.browser.CloseAsync();
+    }
 }

Tranga/MangaConnectors/DownloadClient.cs

@@ -41,4 +41,5 @@ internal abstract class DownloadClient : GlobalBase
     }
 
     internal abstract RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null);
+    public abstract void Close();
 }

Tranga/MangaConnectors/HttpDownloadClient.cs

@@ -72,4 +72,9 @@ internal class HttpDownloadClient : DownloadClient
 
         return new RequestResult(response.StatusCode, document, stream);
     }
+
+    public override void Close()
+    {
+        Log("Closing.");
+    }
 }

Tranga/MangaConnectors/MangaConnector.cs

@@ -14,12 +14,15 @@ namespace Tranga.MangaConnectors;
 public abstract class MangaConnector : GlobalBase
 {
     internal DownloadClient downloadClient { get; init; } = null!;
-    public string[] SupportedLanguages;
 
-    protected MangaConnector(GlobalBase clone, string name, string[] supportedLanguages) : base(clone)
+    public void StopDownloadClient()
+    {
+        downloadClient.Close();
+    }
+
+    protected MangaConnector(GlobalBase clone, string name) : base(clone)
     {
         this.name = name;
-        this.SupportedLanguages = supportedLanguages;
         Directory.CreateDirectory(TrangaSettings.coverImageCache);
     }
     
@@ -231,10 +234,7 @@ public abstract class MangaConnector : GlobalBase
                 Directory.CreateDirectory(directoryPath);
 
         if (File.Exists(saveArchiveFilePath)) //Don't download twice.
-        {
-            progressToken?.Complete();
             return HttpStatusCode.Created;
-        }
         
         //Create a temporary folder to store images
         string tempFolder = Directory.CreateTempSubdirectory("trangatemp").FullName;

Tranga/MangaConnectors/MangaConnectorJsonConverter.cs

@@ -1,6 +1,4 @@
-using System.Data;
+using Newtonsoft.Json;
-using System.Diagnostics;
-using Newtonsoft.Json;
 using Newtonsoft.Json.Linq;
 
 namespace Tranga.MangaConnectors;
@@ -24,22 +22,29 @@ public class MangaConnectorJsonConverter : JsonConverter
     public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
     {
         JObject jo = JObject.Load(reader);
-        string? connectorName = jo.Value<string>("name");
+        switch (jo.GetValue("name")!.Value<string>()!)
-        if (connectorName is null)
-            throw new ConstraintException("Name can not be null.");
-        return connectorName switch
         {
-            "MangaDex" => this._connectors.First(c => c is MangaDex),
+            case "MangaDex":
-            "Manganato" => this._connectors.First(c => c is Manganato),
+                return this._connectors.First(c => c is MangaDex);
-            "MangaKatana" => this._connectors.First(c => c is MangaKatana),
+            case "Manganato":
-            "Mangasee" => this._connectors.First(c => c is Mangasee),
+                return this._connectors.First(c => c is Manganato);
-            "Mangaworld" => this._connectors.First(c => c is Mangaworld),
+            case "MangaKatana":
-            "Bato" => this._connectors.First(c => c is Bato),
+                return this._connectors.First(c => c is MangaKatana);
-            "Manga4Life" => this._connectors.First(c => c is MangaLife),
+            case "Mangasee":
-            "ManhuaPlus" => this._connectors.First(c => c is ManhuaPlus),
+                return this._connectors.First(c => c is Mangasee);
-            "MangaHere" => this._connectors.First(c => c is MangaHere),
+            case "Mangaworld":
-            _ => throw new UnreachableException($"Could not find Connector with name {connectorName}")
+                return this._connectors.First(c => c is Mangaworld);
-        };
+            case "Bato":
+                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();
     }
 
     public override bool CanWrite => false;

Tranga/MangaConnectors/MangaDex.cs

@@ -7,17 +7,14 @@ using JsonSerializer = System.Text.Json.JsonSerializer;
 namespace Tranga.MangaConnectors;
 public class MangaDex : MangaConnector
 {
-    //https://api.mangadex.org/docs/3-enumerations/#language-codes--localization
+    public MangaDex(GlobalBase clone) : base(clone, "MangaDex")
-    //https://en.wikipedia.org/wiki/List_of_ISO_639_language_codes
-    //https://gist.github.com/Josantonius/b455e315bc7f790d14b136d61d9ae469
-    public MangaDex(GlobalBase clone) : base(clone, "MangaDex", ["en","pt","pt-br","it","de","ru","aa","ab","ae","af","ak","am","an","ar-ae","ar-bh","ar-dz","ar-eg","ar-iq","ar-jo","ar-kw","ar-lb","ar-ly","ar-ma","ar-om","ar-qa","ar-sa","ar-sy","ar-tn","ar-ye","ar","as","av","ay","az","ba","be","bg","bh","bi","bm","bn","bo","br","bs","ca","ce","ch","co","cr","cs","cu","cv","cy","da","de-at","de-ch","de-de","de-li","de-lu","div","dv","dz","ee","el","en-au","en-bz","en-ca","en-cb","en-gb","en-ie","en-jm","en-nz","en-ph","en-tt","en-us","en-za","en-zw","eo","es-ar","es-bo","es-cl","es-co","es-cr","es-do","es-ec","es-es","es-gt","es-hn","es-la","es-mx","es-ni","es-pa","es-pe","es-pr","es-py","es-sv","es-us","es-uy","es-ve","es","et","eu","fa","ff","fi","fj","fo","fr-be","fr-ca","fr-ch","fr-fr","fr-lu","fr-mc","fr","fy","ga","gd","gl","gn","gu","gv","ha","he","hi","ho","hr-ba","hr-hr","hr","ht","hu","hy","hz","ia","id","ie","ig","ii","ik","in","io","is","it-ch","it-it","iu","iw","ja","ja-ro","ji","jv","jw","ka","kg","ki","kj","kk","kl","km","kn","ko","ko-ro","kr","ks","ku","kv","kw","ky","kz","la","lb","lg","li","ln","lo","ls","lt","lu","lv","mg","mh","mi","mk","ml","mn","mo","mr","ms-bn","ms-my","ms","mt","my","na","nb","nd","ne","ng","nl-be","nl-nl","nl","nn","no","nr","ns","nv","ny","oc","oj","om","or","os","pa","pi","pl","ps","pt-pt","qu-bo","qu-ec","qu-pe","qu","rm","rn","ro","rw","sa","sb","sc","sd","se-fi","se-no","se-se","se","sg","sh","si","sk","sl","sm","sn","so","sq","sr-ba","sr-sp","sr","ss","st","su","sv-fi","sv-se","sv","sw","sx","syr","ta","te","tg","th","ti","tk","tl","tn","to","tr","ts","tt","tw","ty","ug","uk","ur","us","uz","ve","vi","vo","wa","wo","xh","yi","yo","za","zh-cn","zh-hk","zh-mo","zh-ro","zh-sg","zh-tw","zh","zu"])
     {
         this.downloadClient = new HttpDownloadClient(clone);
     }
 
     public override Manga[] GetManga(string publicationTitle = "")
     {
-        Log($"Searching Publications. Term={publicationTitle}");
+        Log($"Searching Publications. Term=\"{publicationTitle}\"");
         const int limit = 100; //How many values we want returned at once
         int offset = 0; //"Page"
         int total = int.MaxValue; //How many total results are there, is updated on first request
@@ -57,7 +54,7 @@ public class MangaDex : MangaConnector
             if(MangaFromJsonObject(mangaNode.AsObject()) is { } manga)
                 retManga.Add(manga); //Add Publication (Manga) to result
         }
-        Log($"Retrieved {retManga.Count} publications. Term={publicationTitle}");
+        Log($"Retrieved {retManga.Count} publications. Term=\"{publicationTitle}\"");
         return retManga.ToArray();
     }
 
@@ -247,7 +244,7 @@ public class MangaDex : MangaConnector
                     continue;
                 }
                 
-                if(chapterNum is not "null" && !chapters.Any(chp => chp.volumeNumber.Equals(volume) && chp.chapterNumber.Equals(chapterNum)))
+                if(chapterNum is not "null")
                     chapters.Add(new Chapter(manga, title, volume, chapterNum, chapterId));
             }
         }

Tranga/MangaConnectors/MangaHere.cs

@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
 
 public class MangaHere : MangaConnector
 {
-    public MangaHere(GlobalBase clone) : base(clone, "MangaHere", ["en"])
+    public MangaHere(GlobalBase clone) : base(clone, "MangaHere")
     {
         this.downloadClient = new ChromiumDownloadClient(clone);
     }

Tranga/MangaConnectors/MangaKatana.cs

@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
 
 public class MangaKatana : MangaConnector
 {
-	public MangaKatana(GlobalBase clone) : base(clone, "MangaKatana", ["en"])
+	public MangaKatana(GlobalBase clone) : base(clone, "MangaKatana")
 	{
 		this.downloadClient = new HttpDownloadClient(clone);
 	}

Tranga/MangaConnectors/MangaLife.cs

@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
 
 public class MangaLife : MangaConnector
 {
-    public MangaLife(GlobalBase clone) : base(clone, "Manga4Life", ["en"])
+    public MangaLife(GlobalBase clone) : base(clone, "Manga4Life")
     {
         this.downloadClient = new ChromiumDownloadClient(clone);
     }

Tranga/MangaConnectors/Manganato.cs

@@ -8,7 +8,7 @@ namespace Tranga.MangaConnectors;
 
 public class Manganato : MangaConnector
 {
-    public Manganato(GlobalBase clone) : base(clone, "Manganato", ["en"])
+    public Manganato(GlobalBase clone) : base(clone, "Manganato")
     {
         this.downloadClient = new HttpDownloadClient(clone);
     }

Tranga/MangaConnectors/Mangasee.cs

@@ -11,7 +11,7 @@ namespace Tranga.MangaConnectors;
 
 public class Mangasee : MangaConnector
 {
-    public Mangasee(GlobalBase clone) : base(clone, "Mangasee", ["en"])
+    public Mangasee(GlobalBase clone) : base(clone, "Mangasee")
     {
         this.downloadClient = new ChromiumDownloadClient(clone);
     }

Tranga/MangaConnectors/Mangaworld.cs

@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
 
 public class Mangaworld: MangaConnector
 {
-    public Mangaworld(GlobalBase clone) : base(clone, "Mangaworld", ["it"])
+    public Mangaworld(GlobalBase clone) : base(clone, "Mangaworld")
     {
         this.downloadClient = new HttpDownloadClient(clone);
     }

Tranga/MangaConnectors/ManhuaPlus.cs

@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
 
 public class ManhuaPlus : MangaConnector
 {
-    public ManhuaPlus(GlobalBase clone) : base(clone, "ManhuaPlus", ["en"])
+    public ManhuaPlus(GlobalBase clone) : base(clone, "ManhuaPlus")
     {
         this.downloadClient = new ChromiumDownloadClient(clone);
     }
@@ -82,31 +82,17 @@ public class ManhuaPlus : MangaConnector
         HtmlNode titleNode = document.DocumentNode.SelectSingleNode("//h1");
         string sortName = titleNode.InnerText.Replace("\n", "");
         
-        List<string> authors = new();
-        try
-        {
         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);
-        }
-        catch (ArgumentNullException e)
-        {
-            Log("No authors found.");
-        }
 
-        try
-        {
         HtmlNode[] genreNodes = document.DocumentNode
             .SelectNodes("//a[contains(@href, 'https://manhuaplus.org/genres/')]").ToArray();
         foreach (HtmlNode genreNode in genreNodes)
             tags.Add(genreNode.InnerText.Replace("\n", ""));
-        }
-        catch (ArgumentNullException e)
-        {
-            Log("No genres found");
-        }
 
         string yearNodeStr = document.DocumentNode
             .SelectSingleNode("//aside//i[contains(concat(' ',normalize-space(@class),' '),' fa-clock ')]/../span").InnerText.Replace("\n", "");

Tranga/Server/v2Connector.cs

@@ -14,7 +14,7 @@ public partial class Server
     private ValueTuple<HttpStatusCode, object?> GetV2ConnectorConnectorNameGetManga(GroupCollection groups, Dictionary<string, string> requestParameters)
     {
         if(groups.Count < 1 ||
-           !_parent.GetConnectors().Keys.Contains(groups[1].Value) ||
+           !_parent.GetConnectors().Contains(groups[1].Value) ||
            !_parent.TryGetConnector(groups[1].Value, out MangaConnector? connector) ||
            connector is null)
             return new ValueTuple<HttpStatusCode, object?>(HttpStatusCode.BadRequest, $"Connector '{groups[1].Value}' does not exist.");

Tranga/Tranga.cs

@@ -49,9 +49,9 @@ public partial class Tranga : GlobalBase
         return connector is not null;
     }
 
-    public Dictionary<string, string[]> GetConnectors()
+    public IEnumerable<string> GetConnectors()
     {
-        return _connectors.ToDictionary(c => c.name, c => c.SupportedLanguages);
+        return _connectors.Select(c => c.name);
     }
 
     public Manga? GetPublicationById(string internalId) => GetCachedManga(internalId);

Tranga/Tranga.csproj

@@ -1,11 +1,10 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
-        <TargetFramework>net8.0</TargetFramework>
+        <TargetFramework>net7.0</TargetFramework>
         <ImplicitUsings>enable</ImplicitUsings>
         <Nullable>enable</Nullable>
         <OutputType>Exe</OutputType>
-        <LangVersion>12</LangVersion>
     </PropertyGroup>
 
     <ItemGroup>

docs/API_Calls_v2.md

@@ -34,7 +34,7 @@ Returns available Manga Connectors (Scanlation sites)
 <details>
   <summary>Returns</summary>
 
-  Dictionary with Connector-Names and supported languages.
+  List of strings with Names.
 </details>
 
 ### <sub>![GET](https://img.shields.io/badge/GET-0f0)</sub> `/v2/Connector/<ConnectorName>/GetManga`