From 28b81a0db0d133a9cfde7033890aad20e188bb3a Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Thu, 7 Apr 2016 02:16:13 +0800
Subject: [PATCH] Fix parse gallery page error in e-hentai

---
 .../hippo/ehviewer/client/parser/GalleryPageParser.java  | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java
index d631f1233..015a77d98 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/parser/GalleryPageParser.java
@@ -26,9 +26,9 @@ import java.util.regex.Pattern;
 
 public class GalleryPageParser {
 
-    private static final Pattern PATTERN_IMAGE_URL = Pattern.compile("<div id=\"i3\"><a[^>]+><img id=\"img\" src=\"([^\"]+)\"");
+    private static final Pattern PATTERN_IMAGE_URL = Pattern.compile("<(?:/iframe|div id=\"i3\")[^>]*><a[^>]+><img[^>]*src=\"(.+?)\"");
     private static final Pattern PATTERN_SKIP_HATH_KEY = Pattern.compile("onclick=\"return nl\\('([^\\)]+)'\\)");
-    private static final Pattern PATTERN_ORIGIN_IMAGE_URL = Pattern.compile("<div id=\"i7\" class=\"if\"> &nbsp; <img[^>]+/> <a href=\"([^\"]+)\">");
+    private static final Pattern PATTERN_ORIGIN_IMAGE_URL = Pattern.compile("<a href=\"([^\"]+)fullimg.php([^\"]+)\">");
 
     public static Result parse(String body) throws ParseException {
         Matcher m;
@@ -43,9 +43,10 @@ public class GalleryPageParser {
         }
         m = PATTERN_ORIGIN_IMAGE_URL.matcher(body);
         if (m.find()) {
-            result.originImageUrl = StringUtils.unescapeXml(StringUtils.trim(m.group(1)));
+            result.originImageUrl = StringUtils.unescapeXml(m.group(1)) + "fullimg.php" + StringUtils.unescapeXml(m.group(2));
         }
-        if (!TextUtils.isEmpty(result.imageUrl) && !TextUtils.isEmpty(result.skipHathKey)) {
+
+        if (!TextUtils.isEmpty(result.imageUrl)) {
             return result;
         } else {
             throw new ParseException("Parse image url and skip hath key error", body);