glax/Tranga
1
0
Fork 0
mirror of https://github.com/C9Glax/tranga.git synced 2025-10-11 05:09:49 +02:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Fix image-url parsing

Browse Source
This commit is contained in:
glax
2025-09-21 02:16:16 +02:00
parent 94c220fafc
commit ebb30ff6d7
1 changed files with 24 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
API/MangaConnectors/MangaPark.cs
View File

@@ -41,7 +41,7 @@ public class MangaPark : MangaConnector
if (document.DocumentNode.SelectSingleNode("//button[contains(text(),\"No Data\")]") is not null) // No results found if (document.DocumentNode.SelectSingleNode("//button[contains(text(),\"No Data\")]") is not null) // No results found
break; break;
ret.AddRange(document.GetNodesWith("q4_9").Select(n => ParseSingleMangaFromSearchResultsList(baseUri, n))); ret.AddRange(document.GetNodesWith("q4_9")?.Select(n => ParseSingleMangaFromSearchResultsList(baseUri, n))??[]);
}else }else
return null; return null;
} }
@@ -80,14 +80,14 @@ public class MangaPark : MangaConnector
if (document.GetNodeWith("q1_1")?.GetAttributeValue("title", string.Empty) is not { Length: >0 } name) if (document.GetNodeWith("q1_1")?.GetAttributeValue("title", string.Empty) is not { Length: >0 } name)
{ {
Log.Error("Name not found."); Log.Debug("Name not found.");
return null; return null;
} }
string description = document.GetNodeWith("0a_9")?.InnerText ?? string.Empty; string description = document.GetNodeWith("0a_9")?.InnerText ?? string.Empty;
if (document.GetNodeWith("q1_1")?.GetAttributeValue("src", string.Empty) is not { Length: >0 } coverRelative) if (document.GetNodeWith("q1_1")?.GetAttributeValue("src", string.Empty) is not { Length: >0 } coverRelative)
{ {
Log.Error("Cover not found."); Log.Debug("Cover not found.");
return null; return null;
} }
string coverUrl = $"{url[..url.IndexOf('/', 9)]}{coverRelative}"; string coverUrl = $"{url[..url.IndexOf('/', 9)]}{coverRelative}";
@@ -146,7 +146,11 @@ public class MangaPark : MangaConnector
{ {
HtmlDocument document= result.CreateDocument(); HtmlDocument document= result.CreateDocument();
HtmlNodeCollection chapterNodes = document.GetNodesWith("8t_8"); if (document.GetNodesWith("8t_8") is not { } chapterNodes)
{
Log.Debug("No chapters found.");
return null;
}
return chapterNodes.Select(n => ParseChapter(mangaId.Obj, n, baseUri)).ToArray(); return chapterNodes.Select(n => ParseChapter(mangaId.Obj, n, baseUri)).ToArray();
} }
@@ -156,13 +160,13 @@ public class MangaPark : MangaConnector
private readonly Regex _volChTitleRex = new(@"(?:.*(?:Vol\.?(?:ume)?)\s*([0-9]+))?.*(?:Ch\.?(?:apter)?)\s*([0-9\.]+)(?::\s+(.*))?"); private readonly Regex _volChTitleRex = new(@"(?:.*(?:Vol\.?(?:ume)?)\s*([0-9]+))?.*(?:Ch\.?(?:apter)?)\s*([0-9\.]+)(?::\s+(.*))?");
private (Chapter, MangaConnectorId<Chapter>) ParseChapter(Manga manga, HtmlNode chapterNode, Uri baseUri) private (Chapter, MangaConnectorId<Chapter>) ParseChapter(Manga manga, HtmlNode chapterNode, Uri baseUri)
{ {
HtmlNode linkNode = chapterNode.SelectSingleNode("/div[1]/a"); HtmlNode linkNode = chapterNode.SelectSingleNode("./div[1]/a");
Match linkMatch = _volChTitleRex.Match(linkNode.InnerText); Match linkMatch = _volChTitleRex.Match(linkNode.InnerText);
HtmlNode? titleNode = chapterNode.SelectSingleNode("/div[1]/span"); HtmlNode? titleNode = chapterNode.SelectSingleNode("./div[1]/span");
if (!linkMatch.Success || !linkMatch.Groups[2].Success) if (!linkMatch.Success || !linkMatch.Groups[2].Success)
{ {
Log.Error($"Unable to parse Chapter: {chapterNode.InnerHtml}"); Log.Debug($"Unable to parse Chapter: {chapterNode.InnerHtml}");
throw new ($"Unable to parse Chapter: {chapterNode.InnerHtml}"); throw new ($"Unable to parse Chapter: {chapterNode.InnerHtml}");
} }
@@ -196,11 +200,16 @@ public class MangaPark : MangaConnector
if (downloadClient.MakeRequest(requestUri.ToString(), RequestType.Default) is if (downloadClient.MakeRequest(requestUri.ToString(), RequestType.Default) is
{ statusCode: >= HttpStatusCode.OK and < HttpStatusCode.Ambiguous } result) { statusCode: >= HttpStatusCode.OK and < HttpStatusCode.Ambiguous } result)
{ {
HtmlDocument document= result.CreateDocument(); HtmlDocument document = result.CreateDocument();
HtmlNodeCollection imageNodes = document.GetNodesWith("8X_2"); if (document.DocumentNode.SelectSingleNode("//script[@type='qwik/json']")?.InnerText is not { } imageJson)
{
Log.Debug("No images found.");
return null;
}
return imageNodes.Select(n => n.SelectSingleNode("/div/img").GetAttributeValue("src", "")).ToArray(); MatchCollection matchCollection = Regex.Matches(imageJson, @"https?:\/\/[^,]*\.webp");
return matchCollection.Select(m => m.Value).ToArray();
} }
else return null; else return null;
} }
@@ -220,6 +229,7 @@ internal static class MangaParkHelper
internal static HtmlNode? GetNodeWith(this HtmlDocument document, string search) => document.DocumentNode.SelectSingleNode("/html").GetNodeWith(search); internal static HtmlNode? GetNodeWith(this HtmlDocument document, string search) => document.DocumentNode.SelectSingleNode("/html").GetNodeWith(search);
internal static HtmlNode? GetNodeWith(this HtmlNode node, string search) => node.SelectNodes($"{node.XPath}//*[@qkey='{search}']").FirstOrDefault(); internal static HtmlNode? GetNodeWith(this HtmlNode node, string search) => node.SelectNodes($"{node.XPath}//*[@qkey='{search}']").FirstOrDefault();
internal static HtmlNodeCollection GetNodesWith(this HtmlDocument document, string search) => document.DocumentNode.SelectSingleNode("/html ").GetNodesWith(search); internal static HtmlNodeCollection? GetNodesWith(this HtmlDocument document, string search) => document.DocumentNode.SelectSingleNode("/html ").GetNodesWith(search);
internal static HtmlNodeCollection GetNodesWith(this HtmlNode node, string search) => node.SelectNodes($"{node.XPath}//*[@qkey='{search}']"); // ReSharper disable once ReturnTypeCanBeNotNullable HAP nullable
internal static HtmlNodeCollection? GetNodesWith(this HtmlNode node, string search) => node.SelectNodes($"{node.XPath}//*[@qkey='{search}']");
} }