RadarNyan
commented
1 day ago The regex won't match since there's another nested layer of <div>, not sure if it's added after exzhawk made the fix.
Here's my fix, simply changing PATTERN_LARGE_PREVIEW_NEW would already fix the problem, but I didn't really like the idea of parsing the entire page of HTML with regex, so I tried to limit the amount of HTML code being parsed.
- app/src/main/java/com/hippo/ehviewer/client/parser/GalleryDetailParser.java -
index dfdb862a..62b22667 100644
@@ -70,7 +70,8 @@ public class GalleryDetailParser {
private static final Pattern PATTERN_NORMAL_PREVIEW = Pattern.compile("<div class=\"gdtm\"[^<>]*><div[^<>]*width:(\\d+)[^<>]*height:(\\d+)[^<>]*\\((.+?)\\)[^<>]*-(\\d+)px[^<>]*><a[^<>]*href=\"(.+?)\"[^<>]*><img alt=\"([\\d,]+)\"");
private static final Pattern PATTERN_NORMAL_PREVIEW_NEW=Pattern.compile("<a[^<>]*href=\"([^\"]+)\"><div title=\"Page (\\d+): [^\"]+\" style=\"width:(\\d+)[^<>]*height:(\\d+)[^<>]*\\((.+?)\\)[^<>]*-(\\d+)px");
private static final Pattern PATTERN_LARGE_PREVIEW = Pattern.compile("<div class=\"gdtl\".+?<a href=\"(.+?)\"><img alt=\"([\\d,]+)\".+?src=\"(.+?)\"");
- private static final Pattern PATTERN_LARGE_PREVIEW_NEW = Pattern.compile("<a[^<>]*href=\"([^\"]+)\"><div title=\"Page (\\d+): [^\"]+\"[^<>]*\\((.+?)\\)[^<>]*\">");
+ private static final Pattern PATTERN_LARGE_PREVIEW_NEW = Pattern.compile("f=\"([^\"]+)\"[^\"]+\"Page (\\d+)[^(]+\\(([^)]+)");
+ private static final Pattern PATTERN_PREVIEW_RN = Pattern.compile("(\\d+)[^(]+\\(([^)]+)");
private static final GalleryTagGroup[] EMPTY_GALLERY_TAG_GROUP_ARRAY = new GalleryTagGroup[0];
private static final GalleryCommentList EMPTY_GALLERY_COMMENT_ARRAY = new GalleryCommentList(new GalleryComment[0], false);
@@ -601,7 +602,8 @@ public class GalleryDetailParser {
public static PreviewSet parsePreviewSet(String body) throws ParseException {
try {
- return parseLargePreviewSet(body);
+ return parseLargePreviewSet(Jsoup.parse(body), body);
} catch (ParseException e) {
try {
return parseNormalPreviewSet(body);
@@ -621,7 +623,22 @@ public class GalleryDetailParser {
Elements gdtls = gdt.getElementsByClass("gdtl");
int n = gdtls.size();
if (n <= 0) {
- throw new ParseException("Can't parse large preview", body);
+ if (gdt.childNodeSize() <= 0) {
+ throw new ParseException("Can't parse large preview", body);
+ }
+ for (Node previewNode : gdt.childNodes()) {
+ String pageUrl = previewNode.attr("href");
+ String imageNode = previewNode.childNode(0).toString();
+ Matcher m = PATTERN_PREVIEW_RN.matcher(imageNode);
+ while (m.find()){
+ int index = Integer.parseInt(m.group(1));
+ String imageUrl = m.group(2);
+ largePreviewSet.addItem(index - 1, imageUrl, pageUrl);
+ }
+ }
+ return largePreviewSet;
}
for (int i = 0; i < n; i++) {
Element element = gdtls.get(i).child(0);
exzhawk
Linnest2020
S52968
简略描述 / Describe the bug Parse error when trying to view a gallery.
如何重现 / To Reproduce Steps to reproduce the behavior:
预期行为 / Expected behavior Gallery should be viewable
截图 / Screenshots None
设备型号与 Android 版本 / Device model and Android version
备注 / Additional context Same issue as https://github.com/exzhawk/EhViewer/issues/32, but the latest update did not fix it for me.