]*href=\"([^<>\"]+)\"[^<>]*>");
- Matcher m = p.matcher(pageContent);
- String offensiveKeystring = "(And if you choose to ignore this warning, you lose all rights to complain about it in the future.)
";
- String piningKeyString = "This gallery is pining for the fjords.
";
- if (m.find()) {
- ok = true;
- md.category = getType(m.group(1));
- md.uploader = m.group(2);
- md.posted = m.group(3);
- md.pages = m.group(4);
- md.size = m.group(5);
- md.resized = m.group(6);
- md.parent = m.group(7);
- md.visible = m.group(8);
- md.language = m.group(9);
- md.people = m.group(11);
-
- Pattern pattern = Pattern.compile("([\\d|\\.]+)");
- Matcher matcher = pattern.matcher(m.group(12));
- if (matcher.find())
- md.rating = matcher.group(1);
- else
- md.rating = mAppContext.getString(R.string.detail_not_rated);
- md.firstPage = m.group(16);
- md.previewPerPage = Integer.parseInt(m.group(14).replace(",",
- ""))
- - Integer.parseInt(m.group(13).replace(",", ""))
- + 1;
- int total = Integer.parseInt(m.group(15).replace(",", ""));
-
- md.previewSum = (total + md.previewPerPage - 1) / md.previewPerPage;
-
- // New pageListArray
- md.previewLists = new PageList[md.previewSum];
- // Add page 1 pagelist
- PageList pageList = getPageList(pageContent);
- md.previewLists[0] = pageList;
- md.tags = getTags(pageContent);
- } else if (pageContent.contains(offensiveKeystring)) {
+
+
+ ParserDetail parser = new ParserDetail();
+ int mode = ParserDetail.DETAIL | ParserDetail.TAG
+ | ParserDetail.PREVIEW_INFO | ParserDetail.PREVIEW;
+ parser.setMode(mode);
+ int result = parser.parser(pageContent);
+ if (result == ParserDetail.OFFENSIVE) {
ok = true;
md.firstPage = "offensive";
- } else if (pageContent.contains(piningKeyString)) {
+ } else if (result == ParserDetail.PINING) {
ok = true;
md.firstPage = "pining";
- } else
+ } else if ((result & (ParserDetail.DETAIL | ParserDetail.PREVIEW_INFO)) != 0) {
+ ok = true;
+ md.category = parser.category;
+ md.uploader = parser.uploader;
+ md.posted = parser.posted;
+ md.pages = parser.pages;
+ md.size = parser.size;
+ md.resized = parser.resized;
+ md.parent = parser.parent;
+ md.visible = parser.visible;
+ md.language = parser.language;
+ md.people = parser.people;
+ md.rating = parser.rating;
+ md.firstPage = parser.firstPage;
+ md.previewPerPage = parser.previewPerPage;
+ md.previewSum = parser.previewSum;
+
+ md.tags = parser.tags;
+ md.previewLists = new PreviewList[md.previewSum];
+ md.previewLists[0] = parser.previewList;
+ } else {
eMsg = mAppContext.getString(R.string.em_parser_error);
+ }
} else
eMsg = hp.getEMsg();
}
@@ -783,7 +799,7 @@ public class EhClient {
}
}
if (list.size() == 0)
- return null;
+ return new String[0][0];
String[][] groups = new String[list.size()][];
int i = 0;
for (String[] item : list) {
@@ -816,11 +832,11 @@ public class EhClient {
// Get page list
private class GetPageListPackage {
public Object checkFlag;
- public PageList pageList;
+ public PreviewList pageList;
public OnGetPageListListener listener;
public String eMsg;
- public GetPageListPackage(Object checkFlag, PageList pageList, OnGetPageListListener listener,
+ public GetPageListPackage(Object checkFlag, PreviewList pageList, OnGetPageListListener listener,
String eMsg) {
this.checkFlag = checkFlag;
this.pageList = pageList;
@@ -832,7 +848,7 @@ public class EhClient {
private class GetPageListRunnable implements Runnable {
private String url;
- public PageList pageList;
+ public PreviewList pageList;
public String eMsg;
public GetPageListRunnable(String url) {
@@ -876,14 +892,14 @@ public class EhClient {
});
}
- private PageList getPageList(String pageContent) {
- PageList pageList = null;
+ private PreviewList getPageList(String pageContent) {
+ PreviewList pageList = null;
Pattern p = Pattern
.compile("]*class=\"gdtm\"[^<>]*>]*width:(\\d+)[^<>]*height:(\\d+)[^<>]*\\((.+?)\\)[^<>]*-(\\d+)px[^<>]*>]*href=\"(.+?)\"[^<>]*>");
Matcher m = p.matcher(pageContent);
while (m.find()) {
if (pageList == null)
- pageList = new PageList();
+ pageList = new PreviewList();
pageList.addItem(m.group(3), m.group(4), "0", m.group(1),
m.group(2), m.group(5));
}
@@ -1466,6 +1482,51 @@ public class EhClient {
/********** Use E-hentai API ************/
+ public interface OnRateListener {
+ void onSuccess(float ratingAvg, int ratingCnt);
+ void onFailure(String eMsg);
+ }
+
+ public void rate(final int gid, final String token,
+ final int rating, final OnRateListener listener) {
+ final JSONObject json = new JSONObject();
+ try {
+ json.put("method", "rategallery");
+ json.put("apiuid", APIUID);
+ json.put("apikey", APIKEY);
+ json.put("gid", gid);
+ json.put("token", token);
+ json.put("rating", rating);
+ } catch (JSONException e) {
+ listener.onFailure(e.getMessage());
+ return;
+ }
+
+ new Thread(new Runnable() {
+ @Override
+ public void run() {
+ HttpHelper hp = new HttpHelper(mAppContext);
+ hp.setOnRespondListener(new HttpHelper.OnRespondListener() {
+ @Override
+ public void onSuccess(String pageContext) {
+ ParserRate parser = new ParserRate();
+ if (parser.parser(pageContext)) {
+ listener.onSuccess(parser.mRatingAvg, parser.mRatingCnt);
+ } else {
+ listener.onFailure("parser error"); // TODO
+ }
+ }
+ @Override
+ public void onFailure(String eMsg) {
+ listener.onFailure(eMsg);
+ }
+ });
+ hp.postJson(E_API, json);
+ }
+ }).start();
+ }
+
+
/*
private static class GetGalleryMetadataPackage {
public Map lmds;
diff --git a/src/com/hippo/ehviewer/ehclient/EhParser.java b/src/com/hippo/ehviewer/ehclient/EhParser.java
new file mode 100644
index 000000000..5010569c1
--- /dev/null
+++ b/src/com/hippo/ehviewer/ehclient/EhParser.java
@@ -0,0 +1,6 @@
+package com.hippo.ehviewer.ehclient;
+
+public abstract class EhParser {
+ public Object obj;
+ abstract boolean parser(String pageContext);
+}
diff --git a/src/com/hippo/ehviewer/ehclient/ParserDetail.java b/src/com/hippo/ehviewer/ehclient/ParserDetail.java
new file mode 100644
index 000000000..921b3968c
--- /dev/null
+++ b/src/com/hippo/ehviewer/ehclient/ParserDetail.java
@@ -0,0 +1,189 @@
+package com.hippo.ehviewer.ehclient;
+
+import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import com.hippo.ehviewer.ListUrls;
+import com.hippo.ehviewer.data.PreviewList;
+
+public class ParserDetail {
+
+ private static final String OFFENSIVE_STRING =
+ "(And if you choose to ignore this warning, you lose all rights to complain about it in the future.)
";
+ private static final String PINING_STRING =
+ "This gallery is pining for the fjords.
";
+
+ public static final int DETAIL = 0x1;
+ public static final int TAG = 0x2;
+ public static final int PREVIEW_INFO = 0x4;
+ public static final int PREVIEW = 0x8;
+ public static final int OFFENSIVE = 0x10;
+ public static final int PINING = 0x20;
+
+ private int mMode;
+
+ public int category;
+ public String uploader;
+ public String posted;
+ public int pages;
+ public String size;
+ public String resized;
+ public String parent;
+ public String visible;
+ public String language;
+ public int people;
+ public float rating;
+ public String firstPage;
+ public int previewPerPage;
+ public int previewSum;
+ public String[][] tags;
+ public PreviewList previewList;
+
+ public void setMode(int mode) {
+ mMode = mode;
+ }
+
+ public int parser(String pageContent) {
+ int re = 0;
+ Pattern p;
+ Matcher m;
+
+ if (pageContent.contains(OFFENSIVE_STRING)) {
+ return OFFENSIVE;
+ }
+
+ if (pageContent.contains(PINING_STRING)) {
+ return PINING;
+ }
+
+ // Get detail
+ if ((mMode & DETAIL) != 0) {
+ p = Pattern
+ .compile("