diff --git a/Elib2Ebook/Elib2Ebook.csproj b/Elib2Ebook/Elib2Ebook.csproj index fbd8a33..25f7710 100644 --- a/Elib2Ebook/Elib2Ebook.csproj +++ b/Elib2Ebook/Elib2Ebook.csproj @@ -6,7 +6,7 @@ Linux latestmajor Elib2Ebook - 1.45.4 + 1.45.5 true diff --git a/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/HentaiLibGetter.cs b/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/HentaiLibGetter.cs index 55df039..7e98839 100644 --- a/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/HentaiLibGetter.cs +++ b/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/HentaiLibGetter.cs @@ -1,27 +1,12 @@ using System; -using System.Text; using Elib2Ebook.Configs; -using Elib2Ebook.Extensions; -using Elib2Ebook.Types.SocialLib; -using HtmlAgilityPack; -namespace Elib2Ebook.Logic.Getters.LibSocial.NewSocialLib; +namespace Elib2Ebook.Logic.Getters.LibSocial.NewSocialLib; -public class HentaiLibGetter : NewLibSocialGetterBase { +public class HentaiLibGetter : MangalibLibGetterBase { public HentaiLibGetter(BookGetterConfig config) : base(config) { } - protected override Uri SystemUrl => new("https://hentailib.me"); - protected override Uri ImagesHost => new("https://img3.imglib.info/"); - - protected override HtmlDocument ResponseToHtmlDoc(SocialLibBookChapter chapterResponse) { - var sb = new StringBuilder(); - - foreach (var page in chapterResponse.Pages) { - var url = SystemUrl.MakeRelativeUri(page.Url.TrimStart('/')); - sb.Append($""); - } - - return sb.AsHtmlDoc(); - } + + protected override Uri SystemUrl => new("https://hentailib.me/"); } \ No newline at end of file diff --git a/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/MangaLibGetter.cs b/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/MangaLibGetter.cs new file mode 100644 index 0000000..0d417e2 --- /dev/null +++ b/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/MangaLibGetter.cs @@ -0,0 +1,12 @@ +using System; +using Elib2Ebook.Configs; + +namespace Elib2Ebook.Logic.Getters.LibSocial.NewSocialLib; + +public class MangaLibGetter : MangalibLibGetterBase { + public MangaLibGetter(BookGetterConfig config) : base(config) { } + + protected override Uri ImagesHost => new("https://img33.imgslib.link/"); + + protected override Uri SystemUrl => new("https://test-front.mangalib.me/"); +} \ No newline at end of file diff --git a/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/MangalibLibGetterBase.cs b/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/MangalibLibGetterBase.cs new file mode 100644 index 0000000..ddc0df1 --- /dev/null +++ b/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/MangalibLibGetterBase.cs @@ -0,0 +1,22 @@ +using System.Text; +using Elib2Ebook.Configs; +using Elib2Ebook.Extensions; +using Elib2Ebook.Types.SocialLib; +using HtmlAgilityPack; + +namespace Elib2Ebook.Logic.Getters.LibSocial.NewSocialLib; + +public abstract class MangalibLibGetterBase : NewLibSocialGetterBase { + protected MangalibLibGetterBase(BookGetterConfig config) : base(config) { } + + protected override HtmlDocument ResponseToHtmlDoc(SocialLibBookChapter chapterResponse) { + var sb = new StringBuilder(); + + foreach (var page in chapterResponse.Pages) { + var url = SystemUrl.MakeRelativeUri(page.Url.TrimStart('/')); + sb.Append($""); + } + + return sb.AsHtmlDoc(); + } +} \ No newline at end of file diff --git a/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/NewLibSocialGetterBase.cs b/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/NewLibSocialGetterBase.cs index e8dbc4d..3dca89d 100644 --- a/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/NewLibSocialGetterBase.cs +++ b/Elib2Ebook/Logic/Getters/LibSocial/NewSocialLib/NewLibSocialGetterBase.cs @@ -62,7 +62,7 @@ public abstract class NewLibSocialGetterBase : GetterBase{ var secret = GetRandom(128); var state = GetRandom(40); - var redirectUri = SystemUrl.MakeRelativeUri("ru/front/auth/oauth/callback"); + var redirectUri = SystemUrl.MakeRelativeUri("/ru/front/auth/oauth/callback"); var challenge = Challenge(secret);