From d25caafc8b3a6f0981d904e1e2a0cfc209d43647 Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Sat, 30 Aug 2014 00:12:59 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=20g=20=E7=9A=84=E8=A7=A3?=
 =?UTF-8?q?=E6=9E=90=E9=94=99=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ehviewer/ehclient/EdDetailParser.java     | 49 ++++++++++++++-----
 1 file changed, 37 insertions(+), 12 deletions(-)

diff --git a/src/com/hippo/ehviewer/ehclient/EdDetailParser.java b/src/com/hippo/ehviewer/ehclient/EdDetailParser.java
index c735df765..0b2644aa5 100644
--- a/src/com/hippo/ehviewer/ehclient/EdDetailParser.java
+++ b/src/com/hippo/ehviewer/ehclient/EdDetailParser.java
@@ -21,6 +21,8 @@ import java.util.List;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.hippo.ehviewer.util.Log;
+
 public class EdDetailParser {
 
     int previewPageNum;
@@ -73,32 +75,55 @@ public class EdDetailParser {
                 m = p.matcher(body);
                 if (m.find())
                     previewPageNum = Integer.valueOf(m.group(1).replace(",", ""));
-                else
+                else {
+                    Log.e("TAG", "get needPreviewInfo failed");
                     return false;
+                }
 
                 p = Pattern.compile("<td class=\"gdt1\">Images:</td><td class=\"gdt2\">([\\d,]+) ");
                 m = p.matcher(body);
                 if (m.find())
                     imageNum = Integer.valueOf(m.group(1).replace(",", ""));
-                else
+                else {
+                    Log.e("TAG", "get needPreviewInfo failed");
                     return false;
+                }
             }
 
             // Parser preview
-            p = Pattern.compile("<div class=\"gdtm\"[^>]*><div[^>]*><a href=\"http://exhentai.org/s/(\\w+)/\\d+-(\\d+)\">");
-            m = p.matcher(body);
+
             boolean first = true;
-            while(m.find()) {
-                if (first) {
-                    pageTokenArray = new LinkedList<String>();
-                    previewStartIndex = Integer.parseInt(m.group(2)) - 1;
-                    first = false;
+            if (body.contains("<div class=\"gdtl\"")) {
+                p = Pattern.compile("<div class=\"gdtl\"[^>]*><a href=\"http://[^/]+/s/(\\w+)/\\d+-(\\d+)\">");
+                m = p.matcher(body);
+                while(m.find()) {
+                    if (first) {
+                        pageTokenArray = new LinkedList<String>();
+                        previewStartIndex = Integer.parseInt(m.group(2)) - 1;
+                        first = false;
+                    }
+                    pageTokenArray.add(m.group(1));
+                }
+
+            } else {
+                p = Pattern.compile("<div class=\"gdtm\"[^>]*><div[^>]*><a href=\"http://[^/]+/s/(\\w+)/\\d+-(\\d+)\">");
+                m = p.matcher(body);
+                while(m.find()) {
+                    if (first) {
+                        pageTokenArray = new LinkedList<String>();
+                        previewStartIndex = Integer.parseInt(m.group(2)) - 1;
+                        first = false;
+                    }
+                    pageTokenArray.add(m.group(1));
                 }
-                pageTokenArray.add(m.group(1));
             }
-            if (first)
+
+
+
+            if (first) {
+                Log.e("TAG", "get gdtm");
                 return false;
-            else
+            } else
                 return true;
         }
     }