From fe39ed8ed7ada8ebe557fb6dcefc0ddf84b8c9a9 Mon Sep 17 00:00:00 2001 From: Josh Grochowski Date: Sun, 11 Oct 2015 16:19:31 -0400 Subject: [PATCH] Added the -l flag which allows the rip directory to be selected via the command line --- src/main/java/com/rarchives/ripme/App.java | 5 +++++ .../java/com/rarchives/ripme/utils/Utils.java | 16 ++++++++-------- 2 files changed, 13 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 1a8f5f3a..766ea235 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -94,6 +94,10 @@ public class App { System.err.println("\nCannot specify '-d' and '-D' simultaneously"); System.exit(-1); } + if(cl.hasOption('l')) { + // change the default rips directory + Utils.setConfigString("rips.directory", cl.getOptionValue('l')); + } if (cl.hasOption('u')) { // User provided URL, rip it. try { @@ -130,6 +134,7 @@ public class App { opts.addOption("d", "saveorder", false, "Save the order of images in album"); opts.addOption("D", "nosaveorder", false, "Don't save order of images"); opts.addOption("4", "skip404", false, "Don't retry after a 404 (not found) error"); + opts.addOption("l", "ripsdirectory", true, "Rips Directory (Default: ./rips)"); return opts; } diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java index e9d1644c..946fce54 100644 --- a/src/main/java/com/rarchives/ripme/utils/Utils.java +++ b/src/main/java/com/rarchives/ripme/utils/Utils.java @@ -152,7 +152,7 @@ public class Utils { * saveAs in relation to the CWD */ public static String removeCWD(File saveAs) { - String prettySaveAs = saveAs.toString(); + String prettySaveAs = saveAs.toString(); try { prettySaveAs = saveAs.getCanonicalPath(); String cwd = new File(".").getCanonicalPath() + File.separator; @@ -164,7 +164,7 @@ public class Utils { } return prettySaveAs; } - + public static String stripURLParameter(String url, String parameter) { int paramIndex = url.indexOf("?" + parameter); boolean wasFirstParam = true; @@ -172,7 +172,7 @@ public class Utils { wasFirstParam = false; paramIndex = url.indexOf("&" + parameter); } - + if(paramIndex > 0) { int nextParam = url.indexOf("&", paramIndex+1); if(nextParam != -1) { @@ -183,7 +183,7 @@ public class Utils { url = url.substring(0, paramIndex); } } - + return url; } @@ -271,7 +271,7 @@ public class Utils { } return classes; } - + public static final int SHORTENED_PATH_LENGTH = 12; public static String shortenPath(String path) { return shortenPath(new File(path)); @@ -285,7 +285,7 @@ public class Utils { + "..." + path.substring(path.length() - SHORTENED_PATH_LENGTH); } - + public static String filesystemSafe(String text) { text = text.replaceAll("[^a-zA-Z0-9.-]", "_") .replaceAll("__", "_") @@ -295,7 +295,7 @@ public class Utils { } return text; } - + public static String bytesToHumanReadable(int bytes) { float fbytes = (float) bytes; String[] mags = new String[] {"", "k", "m", "g", "t"}; @@ -387,4 +387,4 @@ public class Utils { } return result; } -} \ No newline at end of file +}