From af45f7ca39f7ed5689d3f7838b49381425b26dec Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 11:47:14 -0500 Subject: [PATCH 01/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 4749d7c2..56a99324 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -241,6 +241,10 @@ public class App { logger.error("[!] Failed reading file containing list of URLs. Cannot continue."); } } + + if (cl.hasOption('H')) { + String historylocation = cl.getOptionValue('H'); + } //The URL to rip. if (cl.hasOption('u')) { @@ -303,6 +307,7 @@ public class App { 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"); + opts.addOption("H", "history", false, "Set history file location."); return opts; } From 97238c46210aa8db3daec3f2566803685b077f40 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 11:54:52 -0500 Subject: [PATCH 02/20] Adding history config cli option --- src/main/java/com/rarchives/ripme/utils/Utils.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java index 32a5c70c..b0c3afef 100644 --- a/src/main/java/com/rarchives/ripme/utils/Utils.java +++ b/src/main/java/com/rarchives/ripme/utils/Utils.java @@ -42,6 +42,7 @@ public class Utils { private static final String OS = System.getProperty("os.name").toLowerCase(); private static final Logger LOGGER = Logger.getLogger(Utils.class); private static final int SHORTENED_PATH_LENGTH = 12; + private static final String HISTORY_FILE = ""; private static PropertiesConfiguration config; private static HashMap> cookieCache; @@ -803,4 +804,4 @@ public class Utils { return new File(fullPath); } -} \ No newline at end of file +} From 4242ceb46299bb2b508861f0f3d8ad03ea32d57e Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 12:01:27 -0500 Subject: [PATCH 03/20] Update Utils.java --- src/main/java/com/rarchives/ripme/utils/Utils.java | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java index b0c3afef..1f0e7898 100644 --- a/src/main/java/com/rarchives/ripme/utils/Utils.java +++ b/src/main/java/com/rarchives/ripme/utils/Utils.java @@ -270,7 +270,11 @@ public class Utils { * Return the path of the url history file */ public static String getURLHistoryFile() { - return getConfigDir() + File.separator + "url_history.txt"; + if(HISTORY_FILE.length()==0) { + return getConfigDir() + File.separator + "url_history.txt"; + }else{ + return HISTORY_FILE; + } } /** From 2de2b4a0faaf15f4a99844c6a786500dcf3242e7 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 12:06:42 -0500 Subject: [PATCH 04/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 56a99324..8ceab562 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -115,6 +115,10 @@ public class App { Utils.configureLogger(); logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); + + if (cl.hasOption('H')) { + Utils.setConfigString("history.location", cl.getOptionValue('H')) + } //Allow file overwriting if (cl.hasOption('w')) { @@ -241,10 +245,6 @@ public class App { logger.error("[!] Failed reading file containing list of URLs. Cannot continue."); } } - - if (cl.hasOption('H')) { - String historylocation = cl.getOptionValue('H'); - } //The URL to rip. if (cl.hasOption('u')) { From 04f87be5c025d9b2af6af32d76e4bf9005fbe9c1 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 12:08:58 -0500 Subject: [PATCH 05/20] Update Utils.java --- src/main/java/com/rarchives/ripme/utils/Utils.java | 5 ++--- 1 file changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java index 1f0e7898..bfe8a23a 100644 --- a/src/main/java/com/rarchives/ripme/utils/Utils.java +++ b/src/main/java/com/rarchives/ripme/utils/Utils.java @@ -42,7 +42,6 @@ public class Utils { private static final String OS = System.getProperty("os.name").toLowerCase(); private static final Logger LOGGER = Logger.getLogger(Utils.class); private static final int SHORTENED_PATH_LENGTH = 12; - private static final String HISTORY_FILE = ""; private static PropertiesConfiguration config; private static HashMap> cookieCache; @@ -270,10 +269,10 @@ public class Utils { * Return the path of the url history file */ public static String getURLHistoryFile() { - if(HISTORY_FILE.length()==0) { + if(getConfigString("history.location", "").length()==0) { return getConfigDir() + File.separator + "url_history.txt"; }else{ - return HISTORY_FILE; + return getConfigString("history.location"); } } From 56ad263d11bc1f0cf68fd9f561c1235160ed8ae8 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 12:18:24 -0500 Subject: [PATCH 06/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 8ceab562..a7762561 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -117,7 +117,7 @@ public class App { logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); if (cl.hasOption('H')) { - Utils.setConfigString("history.location", cl.getOptionValue('H')) + Utils.setConfigString("history.location", cl.getOptionValue('H')); } //Allow file overwriting From 9a7a85cb9658db5d665fa6cf80253dc940bc7256 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 12:23:28 -0500 Subject: [PATCH 07/20] Update Utils.java --- src/main/java/com/rarchives/ripme/utils/Utils.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/utils/Utils.java b/src/main/java/com/rarchives/ripme/utils/Utils.java index bfe8a23a..a15503d2 100644 --- a/src/main/java/com/rarchives/ripme/utils/Utils.java +++ b/src/main/java/com/rarchives/ripme/utils/Utils.java @@ -272,7 +272,7 @@ public class Utils { if(getConfigString("history.location", "").length()==0) { return getConfigDir() + File.separator + "url_history.txt"; }else{ - return getConfigString("history.location"); + return getConfigString("history.location", ""); } } From 6b088b94907a7c5272f27f9b94c9436c96cb5d9e Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 12:52:53 -0500 Subject: [PATCH 08/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index a7762561..0d0177bc 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -118,6 +118,7 @@ public class App { if (cl.hasOption('H')) { Utils.setConfigString("history.location", cl.getOptionValue('H')); + System.out.print(cl.getOptionValue('H')); } //Allow file overwriting From 9822003f3d8f703792737cf24f90e0fd93c5996a Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 12:59:31 -0500 Subject: [PATCH 09/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 0d0177bc..c1c2b778 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -118,7 +118,7 @@ public class App { if (cl.hasOption('H')) { Utils.setConfigString("history.location", cl.getOptionValue('H')); - System.out.print(cl.getOptionValue('H')); + logger.info("Set history file to " + cl.getOptionValue('H')); } //Allow file overwriting From 6c86e27c1774c86affa8c729d53abda845960f07 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 13:12:24 -0500 Subject: [PATCH 10/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index c1c2b778..7d09dc77 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -116,9 +116,9 @@ public class App { Utils.configureLogger(); logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); - if (cl.hasOption('H')) { - Utils.setConfigString("history.location", cl.getOptionValue('H')); - logger.info("Set history file to " + cl.getOptionValue('H')); + if (cl.hasOption('z')) { + Utils.setConfigString("history.location", cl.getOptionValue('z')); + logger.info("Set history file to " + cl.getOptionValue('z')); } //Allow file overwriting From d9af919bf7282cc178fb9fb4e9689f95c9beb4bf Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 13:16:01 -0500 Subject: [PATCH 11/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 7d09dc77..f116fb4a 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -117,8 +117,9 @@ public class App { logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); if (cl.hasOption('z')) { - Utils.setConfigString("history.location", cl.getOptionValue('z')); - logger.info("Set history file to " + cl.getOptionValue('z')); + String historyLocation = cl.getOptionValue('z'); + Utils.setConfigString("history.location", historyLocation); + logger.info("Set history file to " + historyLocation); } //Allow file overwriting @@ -308,7 +309,7 @@ public class App { 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"); - opts.addOption("H", "history", false, "Set history file location."); + opts.addOption("z", "history", false, "Set history file location."); return opts; } From d25279d9de938328a2a958cecec137589e84955c Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 13:47:29 -0500 Subject: [PATCH 12/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index f116fb4a..24c70ef3 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -117,7 +117,7 @@ public class App { logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); if (cl.hasOption('z')) { - String historyLocation = cl.getOptionValue('z'); + String historyLocation = cl.getOption('z'); Utils.setConfigString("history.location", historyLocation); logger.info("Set history file to " + historyLocation); } From 2c05bdd9965d3049397144b9296930efb05d50aa Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 13:47:49 -0500 Subject: [PATCH 13/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 24c70ef3..faa40d9d 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -117,7 +117,7 @@ public class App { logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); if (cl.hasOption('z')) { - String historyLocation = cl.getOption('z'); + String historyLocation = cl.getOption('z').trim(); Utils.setConfigString("history.location", historyLocation); logger.info("Set history file to " + historyLocation); } From deb2b94d465704385adc338cc171004c0f9ff8b0 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 14:02:30 -0500 Subject: [PATCH 14/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index faa40d9d..99545784 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -117,9 +117,10 @@ public class App { logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); if (cl.hasOption('z')) { - String historyLocation = cl.getOption('z').trim(); + String historyLocation = cl.getOptionValue('z').trim(); Utils.setConfigString("history.location", historyLocation); logger.info("Set history file to " + historyLocation); + logger.info(args['z']); } //Allow file overwriting From 926b9e98983a8aeafecf7c184a0fb7484dae4745 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 14:10:10 -0500 Subject: [PATCH 15/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 99545784..353dc7af 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -120,7 +120,6 @@ public class App { String historyLocation = cl.getOptionValue('z').trim(); Utils.setConfigString("history.location", historyLocation); logger.info("Set history file to " + historyLocation); - logger.info(args['z']); } //Allow file overwriting From bac9bcea637f13c86a1d3154caef9ed55a35436b Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 14:11:45 -0500 Subject: [PATCH 16/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 353dc7af..bb0eea68 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -69,6 +69,12 @@ public class App { logger.info(cl.getOptionValue("a")); stringToAppendToFoldername = cl.getOptionValue("a"); } + + if (cl.hasOption('z')) { + String historyLocation = cl.getOptionValue('z').trim(); + Utils.setConfigString("history.location", historyLocation); + logger.info("Set history file to " + historyLocation); + } if (GraphicsEnvironment.isHeadless() || args.length > 0) { handleArguments(args); @@ -115,12 +121,6 @@ public class App { Utils.configureLogger(); logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); - - if (cl.hasOption('z')) { - String historyLocation = cl.getOptionValue('z').trim(); - Utils.setConfigString("history.location", historyLocation); - logger.info("Set history file to " + historyLocation); - } //Allow file overwriting if (cl.hasOption('w')) { From 1d3815d27461187fd167d5d4e903ea484a0f8761 Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 14:16:34 -0500 Subject: [PATCH 17/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index bb0eea68..e697a24f 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -69,12 +69,6 @@ public class App { logger.info(cl.getOptionValue("a")); stringToAppendToFoldername = cl.getOptionValue("a"); } - - if (cl.hasOption('z')) { - String historyLocation = cl.getOptionValue('z').trim(); - Utils.setConfigString("history.location", historyLocation); - logger.info("Set history file to " + historyLocation); - } if (GraphicsEnvironment.isHeadless() || args.length > 0) { handleArguments(args); @@ -122,6 +116,13 @@ public class App { Utils.configureLogger(); logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); + //Set history file + if (cl.hasOption("z")) { + String historyLocation = cl.getOptionValue("z").trim(); + Utils.setConfigString("history.location", historyLocation); + logger.info("Set history file to " + historyLocation); + } + //Allow file overwriting if (cl.hasOption('w')) { Utils.setConfigBoolean("file.overwrite", true); From 67be6aab8fadc4081d6a515b07fc669c224a53bd Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 14:23:51 -0500 Subject: [PATCH 18/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index e697a24f..738477fb 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -117,8 +117,8 @@ public class App { logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); //Set history file - if (cl.hasOption("z")) { - String historyLocation = cl.getOptionValue("z").trim(); + if (cl.hasOption('z')) { + String historyLocation = cl.getOptionValue('z'); Utils.setConfigString("history.location", historyLocation); logger.info("Set history file to " + historyLocation); } From 4e1b1d0142a1e2bea8ec6cde7c9f783708b8abfd Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 14:31:16 -0500 Subject: [PATCH 19/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 738477fb..f3130063 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -310,7 +310,7 @@ public class App { 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"); - opts.addOption("z", "history", false, "Set history file location."); + opts.addOption("z", "history", true, "Set history file location."); return opts; } From a66d53f453466faf25e05f2a1fdf142f785a828d Mon Sep 17 00:00:00 2001 From: inthebrilliantblue Date: Tue, 2 Jul 2019 14:44:19 -0500 Subject: [PATCH 20/20] Update App.java --- src/main/java/com/rarchives/ripme/App.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index f3130063..e4289e49 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -117,8 +117,8 @@ public class App { logger.info("Initialized ripme v" + UpdateUtils.getThisJarVersion()); //Set history file - if (cl.hasOption('z')) { - String historyLocation = cl.getOptionValue('z'); + if (cl.hasOption('H')) { + String historyLocation = cl.getOptionValue('H'); Utils.setConfigString("history.location", historyLocation); logger.info("Set history file to " + historyLocation); } @@ -310,7 +310,7 @@ public class App { 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"); - opts.addOption("z", "history", true, "Set history file location."); + opts.addOption("H", "history", true, "Set history file location."); return opts; }