mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-14 01:44:12 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1331 from jbatesy/flickr-fix

Browse Source 
Added method to determine best quality image for flickr ripper [#1324]
This commit is contained in:
cyian-1756
2019-06-22 02:33:55 -05:00
committed by GitHub
parent bcaaa4fa32 81293b53ed
commit 55c1d54ee1
1 changed files with 29 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

42
src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java
View File

@@ -207,10 +207,10 @@ public class FlickrRipper extends AbstractHTMLRipper {
@Override @Override
public List<String> getURLsFromPage(Document doc) { public List<String> getURLsFromPage(Document doc) {
List<String> imageURLs = new ArrayList<>(); List<String> imageURLs = new ArrayList<>();
String apiKey = getAPIKey(doc);
int x = 1; int x = 1;
while (true) { while (true) {
JSONObject jsonData = getJSON(String.valueOf(x), getAPIKey(doc)); JSONObject jsonData = getJSON(String.valueOf(x), apiKey);
if (jsonData.has("stat") && jsonData.getString("stat").equals("fail")) { if (jsonData.has("stat") && jsonData.getString("stat").equals("fail")) {
break; break;
} else { } else {
@@ -220,18 +220,12 @@ public class FlickrRipper extends AbstractHTMLRipper {
for (int i = 0; i < pictures.length(); i++) { for (int i = 0; i < pictures.length(); i++) {
LOGGER.info(i); LOGGER.info(i);
JSONObject data = (JSONObject) pictures.get(i); JSONObject data = (JSONObject) pictures.get(i);
// TODO this is a total hack, we should loop over all image sizes and pick the biggest one and not try {
// just assume addURLToDownload(getLargestImageURL(data.getString("id"), apiKey));
List<String> imageSizes = Arrays.asList("k", "h", "l", "n", "c", "z", "t"); } catch (MalformedURLException e) {
for ( String imageSize : imageSizes) { LOGGER.error("Flickr MalformedURLException: " + e.getMessage());
try {
addURLToDownload(new URL(data.getString("url_" + imageSize)));
LOGGER.info("Adding picture " + data.getString("url_" + imageSize));
break;
} catch (org.json.JSONException ignore) {
// TODO warn the user when we hit a Malformed url
} catch (MalformedURLException e) {}
} }
} }
if (x >= totalPages) { if (x >= totalPages) {
// The rips done // The rips done
@@ -250,4 +244,26 @@ public class FlickrRipper extends AbstractHTMLRipper {
public void downloadURL(URL url, int index) { public void downloadURL(URL url, int index) {
addURLToDownload(url, getPrefix(index)); addURLToDownload(url, getPrefix(index));
} }
private URL getLargestImageURL(String imageID, String apiKey) throws MalformedURLException {
TreeMap<Integer, String> imageURLMap = new TreeMap<>();
try {
URL imageAPIURL = new URL("https://www.flickr.com/services/rest/?method=flickr.photos.getSizes&api_key=" + apiKey + "&photo_id=" + imageID + "&format=json&nojsoncallback=1");
JSONArray imageSizes = new JSONObject(Http.url(imageAPIURL).ignoreContentType().get().text()).getJSONObject("sizes").getJSONArray("size");
for (int i = 0; i < imageSizes.length(); i++) {
JSONObject imageInfo = imageSizes.getJSONObject(i);
imageURLMap.put(imageInfo.getInt("width") * imageInfo.getInt("height"), imageInfo.getString("source"));
}
} catch (org.json.JSONException e) {
LOGGER.error("Error in parsing of Flickr API: " + e.getMessage());
} catch (MalformedURLException e) {
LOGGER.error("Malformed URL returned by API");
} catch (IOException e) {
LOGGER.error("IOException while looking at image sizes: " + e.getMessage());
}
return new URL(imageURLMap.lastEntry().getValue());
}
} }