diff --git a/script/download.js b/script/download.js
index 18c0d62..27091d3 100644
--- a/script/download.js
+++ b/script/download.js
@@ -1,4 +1,5 @@
var mark = {
+ original : ['http://exhentai.org/fullimg.php', '">Download original'],
realUrl : ['
param = new HashMap();
param.put("htmlSource", source);
+ param.put("down_original", setting.isDownloadOriginal());//是否下载原图
url = parseJsScript(param, getDownloadScriptFile(setting.getDownloadScriptPath())).toString();
} catch (Exception e) {
+ e.printStackTrace();
Tracker.println(ScriptParser.class, taskName + ":getdownloadUrl异常,请检查" + setting.getDownloadScriptPath() + "脚本是否出现问题!");
return null;
}
diff --git a/src/org/arong/egdownloader/model/Setting.java b/src/org/arong/egdownloader/model/Setting.java
index 036caa7..bce1a32 100644
--- a/src/org/arong/egdownloader/model/Setting.java
+++ b/src/org/arong/egdownloader/model/Setting.java
@@ -16,6 +16,7 @@ public class Setting {
private String defaultSaveDir = "save";//默认保存路劲
private boolean saveAsName = false;//是否以真实名称保存
private boolean autoDownload;//创建任务后是否自动下载
+ private boolean downloadOriginal = true;//下载原图
private int maxThread = 5;
private String cookieInfo = "igneous=4baadb8381b3bb5c20257b33b725e4ec93f51b4fe2ab7e97621c9fe260bbda7de47a44d6394b31783a0af329a20197c80d2ab687ccf0b667ca5c558ee1b9310b;ipb_member_id=1059070;ipb_pass_hash=e8e36f507753214279ee9df5d98c476c;";
@@ -382,4 +383,10 @@ public String getProxyPwd() {
public void setProxyPwd(String proxyPwd) {
this.proxyPwd = proxyPwd;
}
+ public boolean isDownloadOriginal() {
+ return downloadOriginal;
+ }
+ public void setDownloadOriginal(boolean downloadOriginal) {
+ this.downloadOriginal = downloadOriginal;
+ }
}
diff --git a/src/org/arong/egdownloader/spider/WebClient.java b/src/org/arong/egdownloader/spider/WebClient.java
index ecf31a1..db28f9a 100644
--- a/src/org/arong/egdownloader/spider/WebClient.java
+++ b/src/org/arong/egdownloader/spider/WebClient.java
@@ -52,8 +52,10 @@ public static String postRequest(String url, String encoding) throws ConnectTime
public static String postRequestWithCookie(String url, String cookieInfo) throws ConnectTimeoutException, SocketTimeoutException, WebClientException{
return postRequestWithCookie(url, "utf-8", null, cookieInfo);
}
+ public static String postRequestWithCookie(String url, String encoding, Map rawParams, String cookieInfo) throws WebClientException, ConnectTimeoutException, SocketTimeoutException {
+ return postRequestWithCookie( url, encoding, rawParams, cookieInfo, true);
+ }
-
/**
* @param url
* 发送请求的URL
@@ -64,7 +66,7 @@ public static String postRequestWithCookie(String url, String cookieInfo) throws
* @throws ConnectTimeoutException
* @throws SocketTimeoutException
*/
- public static String postRequestWithCookie(String url, String encoding, Map rawParams, String cookieInfo) throws WebClientException, ConnectTimeoutException, SocketTimeoutException {
+ public static String postRequestWithCookie(String url, String encoding, Map rawParams, String cookieInfo, boolean requestLocation) throws WebClientException, ConnectTimeoutException, SocketTimeoutException {
HttpClient httpClient = Proxy.getHttpClient();
// 创建HttpPost对象。
PostMethod postMethod = new PostMethod(url);
@@ -105,7 +107,12 @@ public static String postRequestWithCookie(String url, String encoding, Map