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

Subreddit-scoped album URLs (partial support for #395). Other fixes.

Browse Source 
* No need to set upper bound for number of characters in a GID, will
just cause maintenance headache down the road when GIDs get longer.
* Subreddit aggregator now supports scope /day

Note: This does not completely resolve subreddit-scoped URLs. Some of
them can be single images and the imgur ripper does not yet support
those. Support single-image rips first. Then, the page will need to be
loaded to dynamically detect whether it is a single-image or album
layout.
This commit is contained in:
MetaPrime 2016-12-21 07:35:17 -08:00
parent 40adcf245f
commit 8a70adbb05
1 changed files with 13 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
src/main/java/com/rarchives/ripme/ripper/rippers/ImgurRipper.java
View File

@ -71,7 +71,7 @@ public class ImgurRipper extends AlbumRipper {
public URL sanitizeURL(URL url) throws MalformedURLException { public URL sanitizeURL(URL url) throws MalformedURLException {
String u = url.toExternalForm(); String u = url.toExternalForm();
if (u.indexOf('#') >= 0) { if (u.indexOf('#') >= 0) {
u = u.substring(0, u.indexOf('#')); u = u.substring(0, u.indexOf('#'));
} }
u = u.replace("imgur.com/gallery/", "imgur.com/a/"); u = u.replace("imgur.com/gallery/", "imgur.com/a/");
u = u.replace("https?://m\\.imgur\\.com", "http://imgur.com"); u = u.replace("https?://m\\.imgur\\.com", "http://imgur.com");
@ -451,7 +451,7 @@ public class ImgurRipper extends AlbumRipper {
Pattern p = null; Pattern p = null;
Matcher m = null; Matcher m = null;
p = Pattern.compile("^https?://(www\\.|m\\.)?imgur\\.com/(a|gallery)/([a-zA-Z0-9]{5,8}).*$"); p = Pattern.compile("^https?://(www\\.|m\\.)?imgur\\.com/(a|gallery)/([a-zA-Z0-9]{5,}).*$");
m = p.matcher(url.toExternalForm()); m = p.matcher(url.toExternalForm());
if (m.matches()) { if (m.matches()) {
// Imgur album or gallery // Imgur album or gallery
@ -485,7 +485,7 @@ public class ImgurRipper extends AlbumRipper {
albumType = ALBUM_TYPE.USER_ALBUM; albumType = ALBUM_TYPE.USER_ALBUM;
return m.group(1) + "-" + m.group(2); return m.group(1) + "-" + m.group(2);
} }
p = Pattern.compile("^https?://(www\\.|m\\.)?imgur\\.com/r/([a-zA-Z0-9\\-_]{3,})(/top|/new)?(/all|/year|/month|/week)?/?$"); p = Pattern.compile("^https?://(www\\.|m\\.)?imgur\\.com/r/([a-zA-Z0-9\\-_]{3,})(/top|/new)?(/all|/year|/month|/week|/day)?/?$");
m = p.matcher(url.toExternalForm()); m = p.matcher(url.toExternalForm());
if (m.matches()) { if (m.matches()) {
// Imgur subreddit aggregator // Imgur subreddit aggregator
@ -498,6 +498,16 @@ public class ImgurRipper extends AlbumRipper {
} }
return album; return album;
} }
p = Pattern.compile("^https?://(i\\.|www\\.|m\\.)?imgur\\.com/r/(\\w+)/([a-zA-Z0-9,]{5,}).*$");
m = p.matcher(url.toExternalForm());
if (m.matches()) {
// Imgur subreddit album or image (treat as album)
albumType = ALBUM_TYPE.ALBUM;
String subreddit = m.group(m.groupCount() - 1);
String gid = m.group(m.groupCount());
this.url = new URL("http://imgur.com/r/" + subreddit + "/" + gid);
return "r_" + subreddit + "_" + gid;
}
p = Pattern.compile("^https?://(i\\.|www\\.|m\\.)?imgur\\.com/([a-zA-Z0-9,]{5,}).*$"); p = Pattern.compile("^https?://(i\\.|www\\.|m\\.)?imgur\\.com/([a-zA-Z0-9,]{5,}).*$");
m = p.matcher(url.toExternalForm()); m = p.matcher(url.toExternalForm());
if (m.matches()) { if (m.matches()) {