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

Guess history based on rip folders, for #166

Browse Source 
Still some work to do, but handles common rippers
This commit is contained in:
4pr0n 2015-02-09 22:18:09 -08:00
parent 069ad13f07
commit 41842c0850
3 changed files with 157 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
src/main/java/com/rarchives/ripme/ripper/AlbumRipper.java
View File

@ -209,5 +209,4 @@ public abstract class AlbumRipper extends AbstractRipper {
.append(", Errored: " ).append(itemsErrored.size()); .append(", Errored: " ).append(itemsErrored.size());
return sb.toString(); return sb.toString();
} }
} }

23
src/main/java/com/rarchives/ripme/ui/MainWindow.java
View File

@ -23,10 +23,12 @@ import java.awt.event.MouseEvent;
import java.awt.event.WindowAdapter; import java.awt.event.WindowAdapter;
import java.awt.event.WindowEvent; import java.awt.event.WindowEvent;
import java.io.File; import java.io.File;
import java.io.FilenameFilter;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URI; import java.net.URI;
import java.net.URL; import java.net.URL;
import java.util.Collections;
import java.util.Date; import java.util.Date;
import java.util.List; import java.util.List;
@ -64,6 +66,7 @@ import org.apache.log4j.Level;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import com.rarchives.ripme.ripper.AbstractRipper; import com.rarchives.ripme.ripper.AbstractRipper;
import com.rarchives.ripme.utils.RipUtils;
import com.rarchives.ripme.utils.Utils; import com.rarchives.ripme.utils.Utils;
/** /**
@ -891,12 +894,32 @@ public class MainWindow implements Runnable, RipStatusHandler {
else { else {
logger.info("Loading history from configuration"); logger.info("Loading history from configuration");
HISTORY.fromList(Utils.getConfigList("download.history")); HISTORY.fromList(Utils.getConfigList("download.history"));
if (HISTORY.toList().size() == 0) {
// Loaded from config, still no entries.
// Guess rip history based on rip folder
String[] dirs = Utils.getWorkingDirectory().list(new FilenameFilter() {
@Override
public boolean accept(File dir, String file) {
return new File(dir.getAbsolutePath() + File.separator + file).isDirectory();
}
});
for (String dir : dirs) {
String url = RipUtils.urlFromDirectoryName(dir);
if (url != null) {
// We found one, add it to history
HistoryEntry entry = new HistoryEntry();
entry.url = url;
HISTORY.add(entry);
}
}
}
} }
} }
private void saveHistory() { private void saveHistory() {
try { try {
HISTORY.toFile("history.json"); HISTORY.toFile("history.json");
Utils.setConfigList("download.history", Collections.emptyList());
} catch (IOException e) { } catch (IOException e) {
logger.error("Failed to save history to file history.json", e); logger.error("Failed to save history to file history.json", e);
} }

135
src/main/java/com/rarchives/ripme/utils/RipUtils.java
View File

@ -4,10 +4,12 @@ import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.Arrays;
import java.util.List; import java.util.List;
import java.util.regex.Matcher; import java.util.regex.Matcher;
import java.util.regex.Pattern; import java.util.regex.Pattern;
import org.apache.commons.lang.math.NumberUtils;
import org.apache.log4j.Logger; import org.apache.log4j.Logger;
import org.jsoup.Jsoup; import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
@ -15,9 +17,9 @@ import org.jsoup.nodes.Element;
import com.rarchives.ripme.ripper.AbstractRipper; import com.rarchives.ripme.ripper.AbstractRipper;
import com.rarchives.ripme.ripper.rippers.ImgurRipper; import com.rarchives.ripme.ripper.rippers.ImgurRipper;
import com.rarchives.ripme.ripper.rippers.VidbleRipper;
import com.rarchives.ripme.ripper.rippers.ImgurRipper.ImgurAlbum; import com.rarchives.ripme.ripper.rippers.ImgurRipper.ImgurAlbum;
import com.rarchives.ripme.ripper.rippers.ImgurRipper.ImgurImage; import com.rarchives.ripme.ripper.rippers.ImgurRipper.ImgurImage;
import com.rarchives.ripme.ripper.rippers.VidbleRipper;
import com.rarchives.ripme.ripper.rippers.video.GfycatRipper; import com.rarchives.ripme.ripper.rippers.video.GfycatRipper;
public class RipUtils { public class RipUtils {
@ -99,4 +101,135 @@ public class RipUtils {
public static Pattern getURLRegex() { public static Pattern getURLRegex() {
return Pattern.compile("(https?://[a-zA-Z0-9\\-\\.]+\\.[a-zA-Z]{2,3}(/\\S*))"); return Pattern.compile("(https?://[a-zA-Z0-9\\-\\.]+\\.[a-zA-Z]{2,3}(/\\S*))");
} }
public static String urlFromDirectoryName(String dir) {
String url = null;
if (url == null) url = urlFromImgurDirectoryName(dir);
if (url == null) url = urlFromImagefapDirectoryName(dir);
if (url == null) url = urlFromDeviantartDirectoryName(dir);
if (url == null) url = urlFromRedditDirectoryName(dir);
if (url == null) url = urlFromSiteDirectoryName(dir, "bfcakes", "http://www.bcfakes.com/celebritylist/", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "butttoucher", "http://butttoucher.com/users/", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "cheeby", "http://cheeby.com/u/", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "datwin", "http://datw.in/", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "drawcrowd", "http://drawcrowd.com/", "");
if (url == null) url = urlFromSiteDirectoryName(dir.replace("-", "/"), "ehentai", "http://g.e-hentai.org/g/", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "8muses", "http://www.8muses.com/index/category/", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "fapproved", "http://fapproved.com/users/", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "vinebox", "http://finebox.co/u/", "");
/*
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
if (url == null) url = urlFromSiteDirectoryName(dir, "", "", "");
*/
return url;
}
private static String urlFromSiteDirectoryName(String dir, String site, String before, String after) {
if (!dir.startsWith(site + "_")) {
return null;
}
dir = dir.substring((site + "_").length());
return before + dir + after;
}
private static String urlFromRedditDirectoryName(String dir) {
if (!dir.startsWith("reddit_")) {
return null;
}
String url = null;
String[] fields = dir.split("_");
if (fields[0].equals("sub")) {
url = "http://reddit.com/r/" + dir;
}
else if (fields[0].equals("user")) {
url = "http://reddit.com/user/" + dir;
}
else if (fields[0].equals("post")) {
url = "http://reddit.com/comments/" + dir;
}
return url;
}
private static String urlFromImagefapDirectoryName(String dir) {
if (!dir.startsWith("imagefap")) {
return null;
}
String url = null;
dir = dir.substring("imagefap_".length());
if (NumberUtils.isDigits(dir)) {
url = "http://www.imagefap.com/gallery.php?gid=" + dir;
}
else {
url = "http://www.imagefap.com/gallery.php?pgid=" + dir;
}
return url;
}
private static String urlFromDeviantartDirectoryName(String dir) {
if (!dir.startsWith("deviantart")) {
return null;
}
dir = dir.substring("deviantart_".length());
String url = null;
if (!dir.contains("_")) {
url = "http://" + dir + ".deviantart.com/";
}
else {
String[] fields = dir.split("_");
url = "http://" + fields[0] + ".deviantart.com/gallery/" + fields[1];
}
return url;
}
private static String urlFromImgurDirectoryName(String dir) {
if (!dir.startsWith("imgur_")) {
return null;
}
if (dir.contains(" ")) {
dir = dir.substring(0, dir.indexOf(" "));
}
List<String> fields = Arrays.asList(dir.split("_"));
String album = fields.get(1);
String url = "http://";
if ( (fields.contains("top") || fields.contains("new"))
&& (fields.contains("year") || fields.contains("month") || fields.contains("week") || fields.contains("all"))
) {
// Subreddit
fields.remove(0); // "imgur"
String sub = "";
while (fields.size() > 2) {
if (!sub.equals("")) {
sub += "_";
}
sub = fields.remove(0); // Subreddit that may contain "_"
}
url += "imgur.com/r/" + sub + "/";
url += fields.remove(0) + "/";
url += fields.remove(0);
}
else if (album.contains("-")) {
// Series of images
url += "imgur.com/" + album.replaceAll("-", ",");
}
else if (album.length() == 5 || album.length() == 6) {
// Album
url += "imgur.com/a/" + album;
}
else {
// User account
url += album + ".imgur.com/";
if (fields.size() > 2) {
url += fields.get(2);
}
}
return url;
}
} }