diff --git a/CLI/CLI.csproj b/CLI/CLI.csproj
index abf151f..f4f37e2 100644
--- a/CLI/CLI.csproj
+++ b/CLI/CLI.csproj
@@ -2,9 +2,10 @@
Exe
- net7.0
+ net8.0
enable
enable
+ 12
diff --git a/Dockerfile b/Dockerfile
index e3938b3..5162023 100644
--- a/Dockerfile
+++ b/Dockerfile
@@ -1,5 +1,5 @@
# syntax=docker/dockerfile:1
-ARG DOTNET=7.0
+ARG DOTNET=8.0
FROM mcr.microsoft.com/dotnet/runtime:$DOTNET AS base
WORKDIR /publish
diff --git a/Logging/Logging.csproj b/Logging/Logging.csproj
index 6836c68..ccbcb6c 100644
--- a/Logging/Logging.csproj
+++ b/Logging/Logging.csproj
@@ -1,9 +1,10 @@
- net7.0
+ net8.0
enable
enable
+ 12
diff --git a/Tranga/Manga.cs b/Tranga/Manga.cs
index f2cf01e..c03e403 100644
--- a/Tranga/Manga.cs
+++ b/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 = Convert.ToBase64String(Encoding.ASCII.GetBytes($"{onlyLowerLetters}{this.year}"));
+ this.internalId = DateTime.Now.Ticks.ToString();
this.ignoreChaptersBelow = ignoreChaptersBelow ?? 0f;
this.latestChapterDownloaded = 0;
this.latestChapterAvailable = 0;
diff --git a/Tranga/MangaConnectors/Bato.cs b/Tranga/MangaConnectors/Bato.cs
index e502ffa..8b21e88 100644
--- a/Tranga/MangaConnectors/Bato.cs
+++ b/Tranga/MangaConnectors/Bato.cs
@@ -8,7 +8,7 @@ namespace Tranga.MangaConnectors;
public class Bato : MangaConnector
{
- public Bato(GlobalBase clone) : base(clone, "Bato")
+ public Bato(GlobalBase clone) : base(clone, "Bato", ["en"])
{
this.downloadClient = new HttpDownloadClient(clone);
}
diff --git a/Tranga/MangaConnectors/ChromiumDownloadClient.cs b/Tranga/MangaConnectors/ChromiumDownloadClient.cs
index efe7f53..c94f0bd 100644
--- a/Tranga/MangaConnectors/ChromiumDownloadClient.cs
+++ b/Tranga/MangaConnectors/ChromiumDownloadClient.cs
@@ -8,13 +8,12 @@ namespace Tranga.MangaConnectors;
internal class ChromiumDownloadClient : DownloadClient
{
- private IBrowser browser { get; set; }
- private const int StartTimeoutMs = 30000;
+ private static readonly IBrowser Browser = StartBrowser().Result;
+ private const int StartTimeoutMs = 10000;
private readonly HttpDownloadClient _httpDownloadClient;
- private async Task StartBrowser()
+ private static async Task StartBrowser()
{
- Log($"Starting Browser. ({StartTimeoutMs}ms timeout)");
return await Puppeteer.LaunchAsync(new LaunchOptions
{
Headless = true,
@@ -29,7 +28,6 @@ internal class ChromiumDownloadClient : DownloadClient
public ChromiumDownloadClient(GlobalBase clone) : base(clone)
{
- this.browser = StartBrowser().Result;
_httpDownloadClient = new(this);
}
@@ -43,7 +41,7 @@ internal class ChromiumDownloadClient : DownloadClient
private RequestResult MakeRequestBrowser(string url, string? referrer = null, string? clickButton = null)
{
- IPage page = this.browser.NewPageAsync().Result;
+ IPage page = Browser.NewPageAsync().Result;
page.DefaultTimeout = 10000;
IResponse response;
try
@@ -54,6 +52,7 @@ 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);
}
@@ -84,9 +83,4 @@ internal class ChromiumDownloadClient : DownloadClient
page.CloseAsync();
return new RequestResult(response.Status, document, stream, false, "");
}
-
- public override void Close()
- {
- this.browser.CloseAsync();
- }
}
\ No newline at end of file
diff --git a/Tranga/MangaConnectors/DownloadClient.cs b/Tranga/MangaConnectors/DownloadClient.cs
index 298774f..a138c62 100644
--- a/Tranga/MangaConnectors/DownloadClient.cs
+++ b/Tranga/MangaConnectors/DownloadClient.cs
@@ -41,5 +41,4 @@ internal abstract class DownloadClient : GlobalBase
}
internal abstract RequestResult MakeRequestInternal(string url, string? referrer = null, string? clickButton = null);
- public abstract void Close();
}
\ No newline at end of file
diff --git a/Tranga/MangaConnectors/HttpDownloadClient.cs b/Tranga/MangaConnectors/HttpDownloadClient.cs
index 238306b..a4a352f 100644
--- a/Tranga/MangaConnectors/HttpDownloadClient.cs
+++ b/Tranga/MangaConnectors/HttpDownloadClient.cs
@@ -72,9 +72,4 @@ internal class HttpDownloadClient : DownloadClient
return new RequestResult(response.StatusCode, document, stream);
}
-
- public override void Close()
- {
- Log("Closing.");
- }
}
\ No newline at end of file
diff --git a/Tranga/MangaConnectors/MangaConnector.cs b/Tranga/MangaConnectors/MangaConnector.cs
index 5af28e5..fbe377d 100644
--- a/Tranga/MangaConnectors/MangaConnector.cs
+++ b/Tranga/MangaConnectors/MangaConnector.cs
@@ -14,15 +14,12 @@ namespace Tranga.MangaConnectors;
public abstract class MangaConnector : GlobalBase
{
internal DownloadClient downloadClient { get; init; } = null!;
+ protected string[] SupportedLanguages;
- public void StopDownloadClient()
- {
- downloadClient.Close();
- }
-
- protected MangaConnector(GlobalBase clone, string name) : base(clone)
+ protected MangaConnector(GlobalBase clone, string name, string[] supportedLanguages) : base(clone)
{
this.name = name;
+ this.SupportedLanguages = supportedLanguages;
Directory.CreateDirectory(TrangaSettings.coverImageCache);
}
@@ -234,7 +231,10 @@ 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;
diff --git a/Tranga/MangaConnectors/MangaConnectorJsonConverter.cs b/Tranga/MangaConnectors/MangaConnectorJsonConverter.cs
index 2213a48..3b3e6da 100644
--- a/Tranga/MangaConnectors/MangaConnectorJsonConverter.cs
+++ b/Tranga/MangaConnectors/MangaConnectorJsonConverter.cs
@@ -1,4 +1,6 @@
-using Newtonsoft.Json;
+using System.Data;
+using System.Diagnostics;
+using Newtonsoft.Json;
using Newtonsoft.Json.Linq;
namespace Tranga.MangaConnectors;
@@ -22,29 +24,22 @@ public class MangaConnectorJsonConverter : JsonConverter
public override object ReadJson(JsonReader reader, Type objectType, object? existingValue, JsonSerializer serializer)
{
JObject jo = JObject.Load(reader);
- switch (jo.GetValue("name")!.Value()!)
+ string? connectorName = jo.Value("name");
+ if (connectorName is null)
+ throw new ConstraintException("Name can not be null.");
+ return connectorName switch
{
- case "MangaDex":
- return this._connectors.First(c => c is MangaDex);
- case "Manganato":
- return this._connectors.First(c => c is Manganato);
- case "MangaKatana":
- return this._connectors.First(c => c is MangaKatana);
- case "Mangasee":
- return this._connectors.First(c => c is Mangasee);
- case "Mangaworld":
- 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();
+ "MangaDex" => this._connectors.First(c => c is MangaDex),
+ "Manganato" => this._connectors.First(c => c is Manganato),
+ "MangaKatana" => this._connectors.First(c => c is MangaKatana),
+ "Mangasee" => this._connectors.First(c => c is Mangasee),
+ "Mangaworld" => this._connectors.First(c => c is Mangaworld),
+ "Bato" => this._connectors.First(c => c is Bato),
+ "Manga4Life" => this._connectors.First(c => c is MangaLife),
+ "ManhuaPlus" => this._connectors.First(c => c is ManhuaPlus),
+ "MangaHere" => this._connectors.First(c => c is MangaHere),
+ _ => throw new UnreachableException($"Could not find Connector with name {connectorName}")
+ };
}
public override bool CanWrite => false;
diff --git a/Tranga/MangaConnectors/MangaDex.cs b/Tranga/MangaConnectors/MangaDex.cs
index 217a2c4..9ea9d48 100644
--- a/Tranga/MangaConnectors/MangaDex.cs
+++ b/Tranga/MangaConnectors/MangaDex.cs
@@ -7,14 +7,17 @@ using JsonSerializer = System.Text.Json.JsonSerializer;
namespace Tranga.MangaConnectors;
public class MangaDex : MangaConnector
{
- public MangaDex(GlobalBase clone) : base(clone, "MangaDex")
+ //https://api.mangadex.org/docs/3-enumerations/#language-codes--localization
+ //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
@@ -54,7 +57,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();
}
@@ -244,7 +247,7 @@ public class MangaDex : MangaConnector
continue;
}
- if(chapterNum is not "null")
+ if(chapterNum is not "null" && !chapters.Any(chp => chp.volumeNumber.Equals(volume) && chp.chapterNumber.Equals(chapterNum)))
chapters.Add(new Chapter(manga, title, volume, chapterNum, chapterId));
}
}
diff --git a/Tranga/MangaConnectors/MangaHere.cs b/Tranga/MangaConnectors/MangaHere.cs
index 585cc91..b68eb9c 100644
--- a/Tranga/MangaConnectors/MangaHere.cs
+++ b/Tranga/MangaConnectors/MangaHere.cs
@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
public class MangaHere : MangaConnector
{
- public MangaHere(GlobalBase clone) : base(clone, "MangaHere")
+ public MangaHere(GlobalBase clone) : base(clone, "MangaHere", ["en"])
{
this.downloadClient = new ChromiumDownloadClient(clone);
}
diff --git a/Tranga/MangaConnectors/MangaKatana.cs b/Tranga/MangaConnectors/MangaKatana.cs
index 551c5bf..ad8a28f 100644
--- a/Tranga/MangaConnectors/MangaKatana.cs
+++ b/Tranga/MangaConnectors/MangaKatana.cs
@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
public class MangaKatana : MangaConnector
{
- public MangaKatana(GlobalBase clone) : base(clone, "MangaKatana")
+ public MangaKatana(GlobalBase clone) : base(clone, "MangaKatana", ["en"])
{
this.downloadClient = new HttpDownloadClient(clone);
}
diff --git a/Tranga/MangaConnectors/MangaLife.cs b/Tranga/MangaConnectors/MangaLife.cs
index 6c55865..11f4c31 100644
--- a/Tranga/MangaConnectors/MangaLife.cs
+++ b/Tranga/MangaConnectors/MangaLife.cs
@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
public class MangaLife : MangaConnector
{
- public MangaLife(GlobalBase clone) : base(clone, "Manga4Life")
+ public MangaLife(GlobalBase clone) : base(clone, "Manga4Life", ["en"])
{
this.downloadClient = new ChromiumDownloadClient(clone);
}
diff --git a/Tranga/MangaConnectors/Manganato.cs b/Tranga/MangaConnectors/Manganato.cs
index b92c288..1c04012 100644
--- a/Tranga/MangaConnectors/Manganato.cs
+++ b/Tranga/MangaConnectors/Manganato.cs
@@ -8,7 +8,7 @@ namespace Tranga.MangaConnectors;
public class Manganato : MangaConnector
{
- public Manganato(GlobalBase clone) : base(clone, "Manganato")
+ public Manganato(GlobalBase clone) : base(clone, "Manganato", ["en"])
{
this.downloadClient = new HttpDownloadClient(clone);
}
diff --git a/Tranga/MangaConnectors/Mangasee.cs b/Tranga/MangaConnectors/Mangasee.cs
index b725b91..f7983c5 100644
--- a/Tranga/MangaConnectors/Mangasee.cs
+++ b/Tranga/MangaConnectors/Mangasee.cs
@@ -11,7 +11,7 @@ namespace Tranga.MangaConnectors;
public class Mangasee : MangaConnector
{
- public Mangasee(GlobalBase clone) : base(clone, "Mangasee")
+ public Mangasee(GlobalBase clone) : base(clone, "Mangasee", ["en"])
{
this.downloadClient = new ChromiumDownloadClient(clone);
}
diff --git a/Tranga/MangaConnectors/Mangaworld.cs b/Tranga/MangaConnectors/Mangaworld.cs
index 989ca07..b560c27 100644
--- a/Tranga/MangaConnectors/Mangaworld.cs
+++ b/Tranga/MangaConnectors/Mangaworld.cs
@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
public class Mangaworld: MangaConnector
{
- public Mangaworld(GlobalBase clone) : base(clone, "Mangaworld")
+ public Mangaworld(GlobalBase clone) : base(clone, "Mangaworld", ["it"])
{
this.downloadClient = new HttpDownloadClient(clone);
}
diff --git a/Tranga/MangaConnectors/ManhuaPlus.cs b/Tranga/MangaConnectors/ManhuaPlus.cs
index 0d30fd2..ffa3179 100644
--- a/Tranga/MangaConnectors/ManhuaPlus.cs
+++ b/Tranga/MangaConnectors/ManhuaPlus.cs
@@ -7,7 +7,7 @@ namespace Tranga.MangaConnectors;
public class ManhuaPlus : MangaConnector
{
- public ManhuaPlus(GlobalBase clone) : base(clone, "ManhuaPlus")
+ public ManhuaPlus(GlobalBase clone) : base(clone, "ManhuaPlus", ["en"])
{
this.downloadClient = new ChromiumDownloadClient(clone);
}
@@ -82,17 +82,31 @@ public class ManhuaPlus : MangaConnector
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 authors = new();
- foreach (HtmlNode authorNode in authorsNodes)
- authors.Add(authorNode.InnerText);
+ try
+ {
+ HtmlNode[] authorsNodes = document.DocumentNode
+ .SelectNodes("//a[contains(@href, 'https://manhuaplus.org/authors/')]")
+ .ToArray();
+ foreach (HtmlNode authorNode in authorsNodes)
+ authors.Add(authorNode.InnerText);
+ }
+ catch (ArgumentNullException e)
+ {
+ Log("No authors found.");
+ }
- HtmlNode[] genreNodes = document.DocumentNode
- .SelectNodes("//a[contains(@href, 'https://manhuaplus.org/genres/')]").ToArray();
- foreach (HtmlNode genreNode in genreNodes)
- tags.Add(genreNode.InnerText.Replace("\n", ""));
+ 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", "");
diff --git a/Tranga/Tranga.csproj b/Tranga/Tranga.csproj
index cc66d5a..17a3133 100644
--- a/Tranga/Tranga.csproj
+++ b/Tranga/Tranga.csproj
@@ -1,10 +1,11 @@
- net7.0
+ net8.0
enable
enable
Exe
+ 12