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

1.0.26 - Ability to rerip history from command-line

Browse Source 
"-r" command-line option

Try "-h" for help and other options

Closes #23
This commit is contained in:
4pr0n 2014-04-22 21:16:23 -07:00
parent 2875ee8d41
commit b62c2248a0
3 changed files with 51 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
pom.xml
View File

@ -4,7 +4,7 @@
<groupId>com.rarchives.ripme</groupId>
<artifactId>ripme</artifactId>
<packaging>jar</packaging>
<version>1.0.25</version>
<version>1.0.26</version>
<name>ripme</name>
<url>http://rip.rarchives.com</url>
<properties>

65
src/main/java/com/rarchives/ripme/App.java
View File

@ -2,6 +2,8 @@ package com.rarchives.ripme;
import java.net.MalformedURLException;
import java.net.URL;
import java.util.Arrays;
import java.util.List;
import javax.swing.SwingUtilities;
@ -30,36 +32,23 @@ public class App {
logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion());
if (args.length > 0) {
CommandLine cl = handleArguments(args);
try {
URL url = new URL(cl.getOptionValue('u'));
rip(url);
} catch (MalformedURLException e) {
logger.error("[!] Given URL is not valid. Expected URL format is http://domain.com/...");
System.exit(-1);
}
handleArguments(args);
} else {
MainWindow mw = new MainWindow();
SwingUtilities.invokeLater(mw);
}
}
public static void rip(URL url) {
try {
public static void rip(URL url) throws Exception {
AbstractRipper ripper = AbstractRipper.getRipper(url);
ripper.rip();
} catch (Exception e) {
logger.error("[!] Error while ripping: " + e.getMessage(), e);
System.exit(-1);
}
}
public static CommandLine handleArguments(String[] args) {
public static void handleArguments(String[] args) {
CommandLine cl = getArgs(args);
if (cl.hasOption('h')) {
HelpFormatter hf = new HelpFormatter();
hf.printHelp("asdf", getOptions());
hf.printHelp("java -jar ripme.jar [OPTIONS]", getOptions());
System.exit(0);
}
if (cl.hasOption('w')) {
@ -68,12 +57,51 @@ public class App {
if (cl.hasOption('t')) {
Utils.setConfigInteger("threads.size", Integer.parseInt(cl.getOptionValue('t')));
}
if (cl.hasOption('r')) {
// Re-rip all via command-line
List<String> history = Utils.getConfigList("download.history");
for (String urlString : history) {
try {
URL url = new URL(urlString.trim());
rip(url);
} catch (Exception e) {
logger.error("[!] Failed to rip URL " + urlString, e);
continue;
}
try {
Thread.sleep(500);
} catch (InterruptedException e) {
logger.warn("[!] Interrupted while re-ripping history");
System.exit(-1);
}
}
// Exit
System.exit(0);
}
if (cl.hasOption('u')) {
// User provided URL, rip it.
try {
URL url = new URL(cl.getOptionValue('u').trim());
rip(url);
List<String> history = Utils.getConfigList("download.history");
if (!history.contains(url.toExternalForm())) {
history.add(url.toExternalForm());
Utils.setConfigList("download.history", Arrays.asList(history.toArray()));
Utils.saveConfig();
}
} catch (MalformedURLException e) {
logger.error("[!] Given URL is not valid. Expected URL format is http://domain.com/...");
System.exit(-1);
} catch (Exception e) {
logger.error("[!] Error while ripping URL " + cl.getOptionValue('u'), e);
System.exit(-1);
}
}
if (!cl.hasOption('u')) {
System.err.println("\nRequired URL ('-u' or '--url') not provided");
System.err.println("\n\tExample: java -jar ripme.jar -u http://imgur.com/a/abcde");
System.exit(-1);
}
return cl;
}
public static Options getOptions() {
@ -82,6 +110,7 @@ public class App {
opts.addOption("u", "url", true, "URL of album to rip");
opts.addOption("t", "threads", true, "Number of download threads per rip");
opts.addOption("w", "overwrite", false, "Overwrite existing files");
opts.addOption("r", "rerip", false, "Re-rip all ripped albums");
return opts;
}

2
src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
View File

@ -19,7 +19,7 @@ import org.jsoup.nodes.Document;
public class UpdateUtils {
private static final Logger logger = Logger.getLogger(UpdateUtils.class);
private static final String DEFAULT_VERSION = "1.0.25";
private static final String DEFAULT_VERSION = "1.0.26";
private static final String updateJsonURL = "http://rarchives.com/ripme.json";
private static final String updateJarURL = "http://rarchives.com/ripme.jar";
private static final String mainFileName = "ripme.jar";