Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fixing reddit ripper for single posts

Browse Source
This commit is contained in:
4pr0n 2015-01-13 00:27:04 -08:00
parent 72f1864e4e
commit 8bb9a8d1c0
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
src/main/java/com/rarchives/ripme/ripper/rippers/RedditRipper.java
View File

@ -121,24 +121,27 @@ public class RedditRipper extends AlbumRipper {
int attempts = 0; int attempts = 0;
logger.info(" Retrieving " + url); logger.info(" Retrieving " + url);
JSONObject json = null; String jsonString = null;
while(json == null && attempts++ < 3) { while(jsonString == null && attempts++ < 3) {
try { try {
json = Http.url(url).getJSON(); jsonString = Http.url(url)
.ignoreContentType()
.response()
.body();
} catch(SocketTimeoutException ex) { } catch(SocketTimeoutException ex) {
if(attempts >= 3) throw ex; if(attempts >= 3) throw ex;
logger.warn(String.format("[!] Connection timed out (attempt %d)", attempts)); logger.warn(String.format("[!] Connection timed out (attempt %d)", attempts));
} }
} }
Object jsonObj = new JSONTokener(json.toString()).nextValue(); Object jsonObj = new JSONTokener(jsonString).nextValue();
JSONArray jsonArray = new JSONArray(); JSONArray jsonArray = new JSONArray();
if (jsonObj instanceof JSONObject) { if (jsonObj instanceof JSONObject) {
jsonArray.put( (JSONObject) jsonObj); jsonArray.put( (JSONObject) jsonObj);
} else if (jsonObj instanceof JSONArray){ } else if (jsonObj instanceof JSONArray){
jsonArray = (JSONArray) jsonObj; jsonArray = (JSONArray) jsonObj;
} else { } else {
logger.warn("[!] Unable to parse child: " + json.toString()); logger.warn("[!] Unable to parse JSON: " + jsonString);
} }
return jsonArray; return jsonArray;
} }