From bbef5ed76eec96d38c13dc8b415ae8b3c19613fc Mon Sep 17 00:00:00 2001 From: cyian-1756 Date: Sun, 24 Jun 2018 03:05:22 -0400 Subject: [PATCH] Added flag for appending a string to folder name --- src/main/java/com/rarchives/ripme/App.java | 8 ++++++++ .../java/com/rarchives/ripme/ripper/AbstractRipper.java | 7 ++++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 81dafce5..4749d7c2 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -41,6 +41,7 @@ import com.rarchives.ripme.utils.Utils; public class App { public static final Logger logger = Logger.getLogger(App.class); + public static String stringToAppendToFoldername = null; private static final History HISTORY = new History(); /** @@ -63,6 +64,12 @@ public class App { Proxy.setSocks(Utils.getConfigString("proxy.socks", null)); } + // This has to be here instead of handleArgs because handleArgs isn't parsed until after a item is ripper + if (cl.hasOption("a")) { + logger.info(cl.getOptionValue("a")); + stringToAppendToFoldername = cl.getOptionValue("a"); + } + if (GraphicsEnvironment.isHeadless() || args.length > 0) { handleArguments(args); } else { @@ -295,6 +302,7 @@ public class App { opts.addOption("s", "socks-server", true, "Use socks server ([user:password]@host[:port])"); opts.addOption("p", "proxy-server", true, "Use HTTP Proxy server ([user:password]@host[:port])"); opts.addOption("j", "update", false, "Update ripme"); + opts.addOption("a","append-to-folder", true, "Append a string to the output folder name"); return opts; } diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java index 87d8bd46..b4ec5ced 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractRipper.java @@ -10,6 +10,7 @@ import java.util.List; import java.util.Map; import java.util.Observable; +import com.rarchives.ripme.App; import org.apache.log4j.FileAppender; import org.apache.log4j.Logger; import org.jsoup.HttpStatusException; @@ -258,8 +259,12 @@ public abstract class AbstractRipper subdirectory = File.separator + subdirectory; } prefix = Utils.filesystemSanitized(prefix); + String topFolderName = workingDir.getCanonicalPath(); + if (App.stringToAppendToFoldername != null) { + topFolderName = topFolderName + App.stringToAppendToFoldername; + } saveFileAs = new File( - workingDir.getCanonicalPath() + topFolderName + subdirectory + File.separator + prefix