diff --git a/src/main/java/com/rarchives/ripme/App.java b/src/main/java/com/rarchives/ripme/App.java index 5456a312..890883ee 100644 --- a/src/main/java/com/rarchives/ripme/App.java +++ b/src/main/java/com/rarchives/ripme/App.java @@ -8,8 +8,9 @@ import com.rarchives.ripme.ui.UpdateUtils; import com.rarchives.ripme.utils.Proxy; import com.rarchives.ripme.utils.RipUtils; import com.rarchives.ripme.utils.Utils; -import org.apache.commons.cli.BasicParser; + import org.apache.commons.cli.CommandLine; +import org.apache.commons.cli.DefaultParser; import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.Options; import org.apache.commons.cli.ParseException; @@ -285,7 +286,7 @@ public class App { /** * Attempt to rip targetURL. * @param targetURL URL to rip - * @param saveConfig Whether or not you want to save the config (?) + * @param saveConfig Whether you want to save the config (?) */ private static void ripURL(String targetURL, boolean saveConfig) { try { @@ -334,7 +335,7 @@ public class App { * @return CommandLine object containing arguments. */ private static CommandLine getArgs(String[] args) { - BasicParser parser = new BasicParser(); + var parser = new DefaultParser(); try { return parser.parse(getOptions(), args, false); } catch (ParseException e) { diff --git a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java index 1a5d2bb4..83276aea 100644 --- a/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/AbstractHTMLRipper.java @@ -2,7 +2,6 @@ package com.rarchives.ripme.ripper; import java.io.File; import java.io.FileOutputStream; -import java.io.FileWriter; import java.io.IOException; import java.net.MalformedURLException; import java.net.URL; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/AerisdiesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/AerisdiesRipper.java index c68d9784..4558f15e 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/AerisdiesRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/AerisdiesRipper.java @@ -14,7 +14,6 @@ import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import com.rarchives.ripme.ripper.AbstractHTMLRipper; -import com.rarchives.ripme.utils.Http; import java.util.HashMap; public class AerisdiesRipper extends AbstractHTMLRipper { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/AllporncomicRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/AllporncomicRipper.java index f0a31ed1..da8c7bd7 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/AllporncomicRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/AllporncomicRipper.java @@ -12,7 +12,6 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import com.rarchives.ripme.ripper.AbstractHTMLRipper; -import com.rarchives.ripme.utils.Http; public class AllporncomicRipper extends AbstractHTMLRipper { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java index d701f1f0..3fc34ef3 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java @@ -18,7 +18,6 @@ import java.util.ArrayList; import java.util.Arrays; import java.util.Base64; import java.util.HashMap; -import java.util.Iterator; import java.util.List; import java.util.Map; import java.util.regex.Matcher; @@ -28,7 +27,6 @@ import org.jsoup.Connection; import org.jsoup.Connection.Method; import org.jsoup.Connection.Response; import org.jsoup.HttpStatusException; -import org.jsoup.Jsoup; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import org.jsoup.select.Elements; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/DuckmoviesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/DuckmoviesRipper.java index e07cb683..b9cb368b 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/DuckmoviesRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/DuckmoviesRipper.java @@ -1,11 +1,9 @@ package com.rarchives.ripme.ripper.rippers; -import com.rarchives.ripme.ripper.AbstractRipper; import com.rarchives.ripme.ripper.AbstractSingleFileRipper; import com.rarchives.ripme.utils.Http; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; import java.io.IOException; import java.net.MalformedURLException; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java index f34fb504..c9984569 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EightmusesRipper.java @@ -24,11 +24,6 @@ import com.rarchives.ripme.utils.Http; public class EightmusesRipper extends AbstractHTMLRipper { private Map cookies = new HashMap<>(); - // TODO put up a wiki page on using maps to store titles - // the map for storing the title of each album when downloading sub albums - private Map urlTitles = new HashMap<>(); - - private Boolean rippingSubalbums = false; public EightmusesRipper(URL url) throws IOException { super(url); diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EroShareRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EroShareRipper.java index d4386f3c..bcdca5e4 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EroShareRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EroShareRipper.java @@ -119,7 +119,6 @@ public class EroShareRipper extends AbstractHTMLRipper { for (Element img : imgs) { if (img.hasClass("album-image")) { String imageURL = img.attr("src"); - imageURL = imageURL; URLs.add(imageURL); } } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/EromeRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/EromeRipper.java index 8e5e57d5..eb5ad8ea 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/EromeRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/EromeRipper.java @@ -13,7 +13,6 @@ import com.rarchives.ripme.utils.Utils; import org.jsoup.Connection.Response; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.utils.Http; @@ -92,7 +91,6 @@ public class EromeRipper extends AbstractHTMLRipper { @Override public List getURLsFromPage(Document doc) { - List URLs = new ArrayList<>(); return getMediaFromPage(doc); } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/ErotivRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/ErotivRipper.java index 10e73346..a8cd58c2 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/ErotivRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/ErotivRipper.java @@ -11,7 +11,6 @@ import java.util.regex.Pattern; import org.jsoup.Connection.Response; import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.utils.Http; diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FemjoyhunterRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FemjoyhunterRipper.java index 2d1a0eb9..2661d055 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FemjoyhunterRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FemjoyhunterRipper.java @@ -12,7 +12,6 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import com.rarchives.ripme.ripper.AbstractHTMLRipper; -import com.rarchives.ripme.utils.Http; public class FemjoyhunterRipper extends AbstractHTMLRipper { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FitnakedgirlsRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FitnakedgirlsRipper.java index 19afdf3c..3c0a68f0 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FitnakedgirlsRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FitnakedgirlsRipper.java @@ -13,7 +13,6 @@ import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import com.rarchives.ripme.ripper.AbstractHTMLRipper; -import com.rarchives.ripme.utils.Http; public class FitnakedgirlsRipper extends AbstractHTMLRipper { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FooktubeRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FooktubeRipper.java index 180dc20c..fed1abe0 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/FooktubeRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/FooktubeRipper.java @@ -10,16 +10,9 @@ import java.util.regex.Pattern; import com.rarchives.ripme.ripper.AbstractSingleFileRipper; import org.jsoup.nodes.Document; -import org.jsoup.nodes.Element; -import org.jsoup.select.Elements; - -import com.rarchives.ripme.ripper.VideoRipper; -import com.rarchives.ripme.utils.Http; public class FooktubeRipper extends AbstractSingleFileRipper { - private static final String HOST = "mulemax"; - public FooktubeRipper(URL url) throws IOException { super(url); } diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/GfycatporntubeRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/GfycatporntubeRipper.java index 73669104..bdb58ad2 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/GfycatporntubeRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/GfycatporntubeRipper.java @@ -11,8 +11,6 @@ import java.util.regex.Pattern; import com.rarchives.ripme.ripper.AbstractSingleFileRipper; import org.jsoup.nodes.Document; -import com.rarchives.ripme.utils.Http; - public class GfycatporntubeRipper extends AbstractSingleFileRipper { public GfycatporntubeRipper(URL url) throws IOException { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/GirlsOfDesireRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/GirlsOfDesireRipper.java index 664828f7..a5d14e98 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/GirlsOfDesireRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/GirlsOfDesireRipper.java @@ -13,7 +13,6 @@ import org.jsoup.nodes.Element; import org.jsoup.select.Elements; import com.rarchives.ripme.ripper.AbstractHTMLRipper; -import com.rarchives.ripme.utils.Http; public class GirlsOfDesireRipper extends AbstractHTMLRipper { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/HentaifoxRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/HentaifoxRipper.java index a6652b41..086596a2 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/HentaifoxRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/HentaifoxRipper.java @@ -12,7 +12,6 @@ import org.jsoup.nodes.Document; import org.jsoup.nodes.Element; import com.rarchives.ripme.ripper.AbstractHTMLRipper; -import com.rarchives.ripme.utils.Http; public class HentaifoxRipper extends AbstractHTMLRipper { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java index d9a80080..1e845d61 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/MangadexRipper.java @@ -126,9 +126,8 @@ public class MangadexRipper extends AbstractJSONRipper { String server; JSONObject chapterJSON = null; TreeMap treeMap = new TreeMap<>(chapterIDs); - Iterator it = treeMap.keySet().iterator(); - while (it.hasNext()) { - double key = (double) it.next(); + for (Double aDouble : treeMap.keySet()) { + double key = (double) aDouble; try { chapterJSON = Http.url(new URL(chapterApiEndPoint + treeMap.get(key))).getJSON(); } catch (IOException e) { diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/MrCongRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/MrCongRipper.java index 209db9cf..d0a7b571 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/MrCongRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/MrCongRipper.java @@ -1,7 +1,6 @@ package com.rarchives.ripme.ripper.rippers; import com.rarchives.ripme.ripper.AbstractHTMLRipper; -import com.rarchives.ripme.ripper.AbstractRipper; import com.rarchives.ripme.utils.Http; import java.io.IOException; import java.net.MalformedURLException; diff --git a/src/main/java/com/rarchives/ripme/ui/RipStatusComplete.java b/src/main/java/com/rarchives/ripme/ui/RipStatusComplete.java index 418da9d0..2b8058bb 100644 --- a/src/main/java/com/rarchives/ripme/ui/RipStatusComplete.java +++ b/src/main/java/com/rarchives/ripme/ui/RipStatusComplete.java @@ -1,6 +1,5 @@ package com.rarchives.ripme.ui; -import java.io.IOException; import java.nio.file.Path; public class RipStatusComplete { diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/XvideosRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/XvideosRipperTest.java index 9446b640..3c76c362 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/XvideosRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/XvideosRipperTest.java @@ -4,7 +4,6 @@ import java.io.IOException; import java.net.URL; import com.rarchives.ripme.ripper.rippers.XvideosRipper; -import com.rarchives.ripme.tst.ripper.rippers.RippersTest; import org.junit.jupiter.api.Test; public class XvideosRipperTest extends RippersTest { diff --git a/src/test/java/com/rarchives/ripme/ui/UpdateUtilsTest.java b/src/test/java/com/rarchives/ripme/ui/UpdateUtilsTest.java index 2f9ba697..d28e6b07 100644 --- a/src/test/java/com/rarchives/ripme/ui/UpdateUtilsTest.java +++ b/src/test/java/com/rarchives/ripme/ui/UpdateUtilsTest.java @@ -7,11 +7,10 @@ public class UpdateUtilsTest { @Test public void testIsNewerVersion() { - UpdateUtils updateUtils = new UpdateUtils(); - Assertions.assertFalse(updateUtils.isNewerVersion("1.7.94")); - Assertions.assertFalse(updateUtils.isNewerVersion("1.7.94-9-asdf")); - Assertions.assertTrue(updateUtils.isNewerVersion("1.7.94-11-asdf")); - Assertions.assertTrue(updateUtils.isNewerVersion("1.7.95")); + Assertions.assertFalse(UpdateUtils.isNewerVersion("1.7.94")); + Assertions.assertFalse(UpdateUtils.isNewerVersion("1.7.94-9-asdf")); + Assertions.assertTrue(UpdateUtils.isNewerVersion("1.7.94-11-asdf")); + Assertions.assertTrue(UpdateUtils.isNewerVersion("1.7.95")); } } \ No newline at end of file