#571 fix spell mistake
parent
f375b9fdba
commit
65049baca4
|
@ -8,6 +8,7 @@ import us.codecraft.webmagic.utils.HttpConstant;
|
||||||
import us.codecraft.webmagic.utils.UrlUtils;
|
import us.codecraft.webmagic.utils.UrlUtils;
|
||||||
|
|
||||||
import java.util.ArrayList;
|
import java.util.ArrayList;
|
||||||
|
import java.util.Arrays;
|
||||||
import java.util.List;
|
import java.util.List;
|
||||||
import java.util.Map;
|
import java.util.Map;
|
||||||
|
|
||||||
|
@ -49,6 +50,8 @@ public class Page {
|
||||||
private byte[] bytes;
|
private byte[] bytes;
|
||||||
|
|
||||||
private List<Request> targetRequests = new ArrayList<Request>();
|
private List<Request> targetRequests = new ArrayList<Request>();
|
||||||
|
|
||||||
|
private String charset;
|
||||||
|
|
||||||
public Page() {
|
public Page() {
|
||||||
}
|
}
|
||||||
|
@ -238,6 +241,14 @@ public class Page {
|
||||||
this.bytes = bytes;
|
this.bytes = bytes;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
public String getCharset() {
|
||||||
|
return charset;
|
||||||
|
}
|
||||||
|
|
||||||
|
public void setCharset(String charset) {
|
||||||
|
this.charset = charset;
|
||||||
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
public String toString() {
|
public String toString() {
|
||||||
return "Page{" +
|
return "Page{" +
|
||||||
|
@ -249,8 +260,10 @@ public class Page {
|
||||||
", url=" + url +
|
", url=" + url +
|
||||||
", headers=" + headers +
|
", headers=" + headers +
|
||||||
", statusCode=" + statusCode +
|
", statusCode=" + statusCode +
|
||||||
", success=" + downloadSuccess +
|
", downloadSuccess=" + downloadSuccess +
|
||||||
", targetRequests=" + targetRequests +
|
", targetRequests=" + targetRequests +
|
||||||
|
", charset='" + charset + '\'' +
|
||||||
|
", bytes=" + Arrays.toString(bytes) +
|
||||||
'}';
|
'}';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -49,7 +49,7 @@ public class Request implements Serializable {
|
||||||
* When it is set to TRUE, the downloader will not try to parse response body to text.
|
* When it is set to TRUE, the downloader will not try to parse response body to text.
|
||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
private boolean binarayContent = false;
|
private boolean binaryContent = false;
|
||||||
|
|
||||||
public Request() {
|
public Request() {
|
||||||
}
|
}
|
||||||
|
@ -168,12 +168,12 @@ public class Request implements Serializable {
|
||||||
this.requestBody = requestBody;
|
this.requestBody = requestBody;
|
||||||
}
|
}
|
||||||
|
|
||||||
public boolean isBinarayContent() {
|
public boolean isBinaryContent() {
|
||||||
return binarayContent;
|
return binaryContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void setBinarayContent(boolean binarayContent) {
|
public void setBinaryContent(boolean binaryContent) {
|
||||||
this.binarayContent = binarayContent;
|
this.binaryContent = binaryContent;
|
||||||
}
|
}
|
||||||
|
|
||||||
@Override
|
@Override
|
||||||
|
|
|
@ -112,7 +112,7 @@ public class HttpClientDownloader extends AbstractDownloader {
|
||||||
String contentType = httpResponse.getEntity().getContentType() == null ? "" : httpResponse.getEntity().getContentType().getValue();
|
String contentType = httpResponse.getEntity().getContentType() == null ? "" : httpResponse.getEntity().getContentType().getValue();
|
||||||
Page page = new Page();
|
Page page = new Page();
|
||||||
page.setBytes(bytes);
|
page.setBytes(bytes);
|
||||||
if (!request.isBinarayContent()){
|
if (!request.isBinaryContent()){
|
||||||
page.setRawText(getResponseContent(charset, contentType, bytes));
|
page.setRawText(getResponseContent(charset, contentType, bytes));
|
||||||
}
|
}
|
||||||
page.setUrl(new PlainText(request.getUrl()));
|
page.setUrl(new PlainText(request.getUrl()));
|
||||||
|
|
|
@ -280,7 +280,7 @@ public class HttpClientDownloaderTest {
|
||||||
public void run() throws Exception {
|
public void run() throws Exception {
|
||||||
final HttpClientDownloader httpClientDownloader = new HttpClientDownloader();
|
final HttpClientDownloader httpClientDownloader = new HttpClientDownloader();
|
||||||
Request request = new Request();
|
Request request = new Request();
|
||||||
request.setBinarayContent(true);
|
request.setBinaryContent(true);
|
||||||
request.setUrl("http://127.0.0.1:13423/");
|
request.setUrl("http://127.0.0.1:13423/");
|
||||||
Page page = httpClientDownloader.download(request, Site.me().toTask());
|
Page page = httpClientDownloader.download(request, Site.me().toTask());
|
||||||
assertThat(page.getRawText()).isNull();
|
assertThat(page.getRawText()).isNull();
|
||||||
|
|
Loading…
Reference in New Issue