mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-26 23:34:53 +02:00
Code Issues Releases Wiki Activity

Fixed ArtStation landing on cf page and failing.

Browse Source
This commit is contained in:
Tushar
2019-02-18 00:58:47 +05:30
parent 6c9e4200e2
commit 8456f4f64d
1 changed files with 31 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
src/main/java/com/rarchives/ripme/ripper/rippers/ArtStationRipper.java
View File

@@ -12,6 +12,9 @@ import com.rarchives.ripme.ripper.AbstractJSONRipper;
import com.rarchives.ripme.utils.Http; import com.rarchives.ripme.utils.Http;
import org.json.JSONObject; import org.json.JSONObject;
import org.jsoup.Connection;
import org.jsoup.Connection.Method;
import org.jsoup.Connection.Response;
public class ArtStationRipper extends AbstractJSONRipper { public class ArtStationRipper extends AbstractJSONRipper {
enum URL_TYPE { enum URL_TYPE {
@@ -67,7 +70,7 @@ public class ArtStationRipper extends AbstractJSONRipper {
// No JSON found in the URL entered, can't rip // No JSON found in the URL entered, can't rip
throw new MalformedURLException( throw new MalformedURLException(
"Expected URL to an ArtStation project or user profile - got " + url + " instead"); "Expected URL to an ArtStation 'project url' or 'user profile url' - got " + url + " instead");
} }
@Override @Override
@@ -181,9 +184,12 @@ public class ArtStationRipper extends AbstractJSONRipper {
/** /**
* Construct a new ParsedURL object. * Construct a new ParsedURL object.
* *
* @param urlType URL_TYPE enum containing the URL type * @param urlType
* @param jsonURL String containing the JSON URL location * URL_TYPE enum containing the URL type
* @param urlID String containing the ID of this URL * @param jsonURL
* String containing the JSON URL location
* @param urlID
* String containing the ID of this URL
* *
*/ */
ParsedURL(URL_TYPE urlType, String jsonURL, String urlID) { ParsedURL(URL_TYPE urlType, String jsonURL, String urlID) {
@@ -226,7 +232,8 @@ public class ArtStationRipper extends AbstractJSONRipper {
/** /**
* Parses an ArtStation URL. * Parses an ArtStation URL.
* *
* @param url URL to an ArtStation user profile * @param url
* URL to an ArtStation user profile
* (https://www.artstation.com/username) or single project * (https://www.artstation.com/username) or single project
* (https://www.artstation.com/artwork/projectid) * (https://www.artstation.com/artwork/projectid)
* @return ParsedURL object containing URL type, JSON location and ID (stores * @return ParsedURL object containing URL type, JSON location and ID (stores
@@ -239,7 +246,25 @@ public class ArtStationRipper extends AbstractJSONRipper {
// Load HTML Source of the specified URL // Load HTML Source of the specified URL
try { try {
htmlSource = Http.url(url).get().html(); // htmlSource = Http.url(url).get().html();
Connection con = Http.url(url).method(Method.GET).connection();
con.ignoreHttpErrors(true);
Response res = con.execute();
int status = res.statusCode();
if (status / 100 == 2) {
htmlSource = res.parse().html();
} else if (status == 403 && url.toString().contains("artwork/")) {
// Catches cloudflare page. Error 403.
// Usually caused by artwork URLs( arstation.com/artwork/someProjectId)
String urlId = url.toString().substring(url.toString().lastIndexOf("/") + 1);
String jsonURL = "https://www.artstation.com/projects/" + urlId + ".json";
parsedURL = new ParsedURL(URL_TYPE.SINGLE_PROJECT, jsonURL, urlId);
return parsedURL;
} else {
LOGGER.error("Couldnt fetch URL: " + url);
throw new IOException("Error fetching URL: " + url + " Status Code: " + status);
}
} catch (IOException e) { } catch (IOException e) {
htmlSource = ""; htmlSource = "";
} }