From 76825ad66e3653d234ad26df394fc98e9259479b Mon Sep 17 00:00:00 2001
From: seven332 <seven332@163.com>
Date: Wed, 5 Aug 2015 16:09:35 +0800
Subject: [PATCH] Skip hath when download image failed

---
 .../ehviewer/client/GalleryPageParser.java    |  28 +++--
 .../hippo/ehviewer/gallery/SpiderQueen.java   | 100 +++++++++++-------
 2 files changed, 81 insertions(+), 47 deletions(-)

diff --git a/app/src/main/java/com/hippo/ehviewer/client/GalleryPageParser.java b/app/src/main/java/com/hippo/ehviewer/client/GalleryPageParser.java
index a7639f46f..34d7db554 100644
--- a/app/src/main/java/com/hippo/ehviewer/client/GalleryPageParser.java
+++ b/app/src/main/java/com/hippo/ehviewer/client/GalleryPageParser.java
@@ -16,7 +16,6 @@
 
 package com.hippo.ehviewer.client;
 
-import com.hippo.yorozuya.Say;
 import com.hippo.yorozuya.StringUtils;
 
 import java.util.regex.Matcher;
@@ -24,14 +23,29 @@ import java.util.regex.Pattern;
 
 public class GalleryPageParser {
 
-    public static String parse(String body) throws ParseException {
-        Pattern p = Pattern.compile("<div id=\"i3\"><a[^>]+><img id=\"img\" src=\"([^\"]+)\"");
-        Matcher m = p.matcher(body);
+    private static Pattern IMAGE_URL_PATTERN = Pattern.compile("<div id=\"i3\"><a[^>]+><img id=\"img\" src=\"([^\"]+)\"");
+    private static Pattern SKIP_HATH_KEY_PATTERN = Pattern.compile("onclick=\"return nl\\('([^\\)]+)'\\)");
+
+    public static Result parse(String body) throws ParseException {
+        Matcher m;
+        Result result = new Result();
+        m = IMAGE_URL_PATTERN.matcher(body);
         if (m.find()) {
-            return StringUtils.unescapeXml(m.group(1));
+            result.imageUrl = StringUtils.unescapeXml(m.group(1));
+        }
+        m = SKIP_HATH_KEY_PATTERN.matcher(body);
+        if (m.find()) {
+            result.skipHathKey = m.group(1);
+        }
+        if (result.imageUrl != null && result.skipHathKey != null) {
+            return result;
         } else {
-            Say.f("s", body);
-            throw new ParseException("Parse gallery page error", body);
+            throw new ParseException("Parse image url and skip hath key error", body);
         }
     }
+
+    public static class Result {
+        public String imageUrl;
+        public String skipHathKey;
+    }
 }
diff --git a/app/src/main/java/com/hippo/ehviewer/gallery/SpiderQueen.java b/app/src/main/java/com/hippo/ehviewer/gallery/SpiderQueen.java
index 2d4e2cd94..f47d782d1 100644
--- a/app/src/main/java/com/hippo/ehviewer/gallery/SpiderQueen.java
+++ b/app/src/main/java/com/hippo/ehviewer/gallery/SpiderQueen.java
@@ -705,27 +705,80 @@ public class SpiderQueen implements Runnable {
             }
         }
 
-        private String getImageUrl(int gid, String token, int index) throws Exception {
+        private GalleryPageParser.Result getImageUrl(int gid, String token, int index, String skipHathKey) throws Exception {
+            String url = EhUrl.getPageUrl(mSource, gid, token, index);
+            if (skipHathKey != null) {
+                url = url + "?nl=" + skipHathKey;
+            }
             HttpRequest request = new HttpRequest();
-            request.setUrl(EhUrl.getPageUrl(mSource, gid, token, index));
+            request.setUrl(url);
             try {
                 mCurrentHttpRequest = request;
                 HttpResponse response = mHttpClient.execute(request);
                 String body = response.getString();
-                String imageUrl = GalleryPageParser.parse(body);
+                GalleryPageParser.Result result = GalleryPageParser.parse(body);
                 for (String suffix : URL_509_SUFFIX_ARRAY) {
-                    if (imageUrl.endsWith(suffix)) {
+                    if (result.imageUrl.endsWith(suffix)) {
                         // Get 509 gif here
                         throw new Image509Expection();
                     }
                 }
-                return imageUrl;
+                return result;
             } finally {
                 mCurrentHttpRequest = null;
                 request.disconnect();
             }
         }
 
+        private void downloadPage(int gid, final int index, String token) {
+            String skipHathKey = null;
+            String imageUrl;
+            Exception exception = null;
+
+            for (int i = 0; i < 2; i++) {
+                // Get image url
+                GalleryPageParser.Result result;
+                try {
+                    result = getImageUrl(gid, token, index, skipHathKey);
+                } catch (Exception e) {
+                    exception = e;
+                    break;
+                }
+                imageUrl = result.imageUrl;
+                skipHathKey = result.skipHathKey;
+
+                Log.d("TAG", "index = " + index + ", imageUrl = " + imageUrl + ", skipHathKey = " + skipHathKey);
+
+                // Download image
+                try {
+                    mCurrentSaveHelper = new ImageHandler.SaveHelper() {
+                        @Override
+                        public void onStartSaving(long totalSize) {
+                            mSpiderListener.onSpiderStart(index, totalSize);
+                        }
+
+                        @Override
+                        public void onSave(long receivedSize) {
+                            mSpiderListener.onSpiderPage(index, receivedSize);
+                        }
+                    };
+                    mImageHandler.save(mHttpClient, imageUrl, index, mCurrentSaveHelper);
+                    mPageStates.set(index, PAGE_STATE_SUCCEED);
+                    mSpiderListener.onSpiderSucceed(index);
+                    return;
+                } catch (Exception e) {
+                    exception = e;
+                } finally {
+                    mCurrentSaveHelper = null;
+                }
+            }
+
+            mPageStates.lazySet(index, PAGE_STATE_FAILED);
+            mSpiderListener.onSpiderFailed(index, exception);
+        }
+
+
+
         @Override
         public void run() {
             TAG = Thread.currentThread().getName();
@@ -778,44 +831,11 @@ public class SpiderQueen implements Runnable {
                 }
                 // For stop
                 if (mStop) {
+                    mPageStates.lazySet(index, PAGE_STATE_NONE);
                     break;
                 }
 
-                // Get image url
-                String imageUrl;
-                try {
-                    imageUrl = getImageUrl(gb.gid, token, index);
-                } catch (Exception e) {
-                    mPageStates.lazySet(index, PAGE_STATE_FAILED);
-                    // Listener
-                    mSpiderListener.onSpiderFailed(index, e);
-                    continue;
-                }
-
-                // Download image
-                try {
-                    mCurrentSaveHelper = new ImageHandler.SaveHelper() {
-                        @Override
-                        public void onStartSaving(long totalSize) {
-                            mSpiderListener.onSpiderStart(index, totalSize);
-                        }
-
-                        @Override
-                        public void onSave(long receivedSize) {
-                            mSpiderListener.onSpiderPage(index, receivedSize);
-                        }
-                    };
-                    handler.save(mHttpClient, imageUrl, index, mCurrentSaveHelper);
-                    mPageStates.set(index, PAGE_STATE_SUCCEED);
-                    // Listener
-                    mSpiderListener.onSpiderSucceed(index);
-                } catch (Exception e) {
-                    mPageStates.set(index, PAGE_STATE_FAILED);
-                    // Listener
-                    mSpiderListener.onSpiderFailed(index, e);
-                } finally {
-                    mCurrentSaveHelper = null;
-                }
+                downloadPage(gb.gid, index, token);
             }
 
             // TODO this lock is not right, we need to lock when before check it is over