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/MangaConnectors/Bato.cs b/Tranga/MangaConnectors/Bato.cs index 5b5f370..798967a 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/MangaConnector.cs b/Tranga/MangaConnectors/MangaConnector.cs index 38619f9..fbe377d 100644 --- a/Tranga/MangaConnectors/MangaConnector.cs +++ b/Tranga/MangaConnectors/MangaConnector.cs @@ -14,10 +14,12 @@ namespace Tranga.MangaConnectors; public abstract class MangaConnector : GlobalBase { internal DownloadClient downloadClient { get; init; } = null!; + protected string[] SupportedLanguages; - 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); } diff --git a/Tranga/MangaConnectors/MangaDex.cs b/Tranga/MangaConnectors/MangaDex.cs index cbb8ffb..07480f5 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(); } diff --git a/Tranga/MangaConnectors/MangaHere.cs b/Tranga/MangaConnectors/MangaHere.cs index 0da1c5a..2cf0c22 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 64ab6c4..32bc78d 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 44b54a5..9c65a4b 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 0c6e85b..3422b34 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 7128910..a4de0cc 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 1140468..d21ae77 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 9335388..87dd3e1 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); } diff --git a/Tranga/Tranga.csproj b/Tranga/Tranga.csproj index 58cb6de..fece562 100644 --- a/Tranga/Tranga.csproj +++ b/Tranga/Tranga.csproj @@ -1,10 +1,11 @@ - net7.0 + net8.0 enable enable Exe + 12