1
0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-22 21:43:06 +02:00

update class for command line properties to DefaultParser, remove unused imports

This commit is contained in:
soloturn
2023-06-11 23:54:52 +02:00
parent 726e02347e
commit 9a2ee24ab0
21 changed files with 10 additions and 43 deletions

View File

@@ -8,8 +8,9 @@ import com.rarchives.ripme.ui.UpdateUtils;
import com.rarchives.ripme.utils.Proxy; import com.rarchives.ripme.utils.Proxy;
import com.rarchives.ripme.utils.RipUtils; import com.rarchives.ripme.utils.RipUtils;
import com.rarchives.ripme.utils.Utils; import com.rarchives.ripme.utils.Utils;
import org.apache.commons.cli.BasicParser;
import org.apache.commons.cli.CommandLine; import org.apache.commons.cli.CommandLine;
import org.apache.commons.cli.DefaultParser;
import org.apache.commons.cli.HelpFormatter; import org.apache.commons.cli.HelpFormatter;
import org.apache.commons.cli.Options; import org.apache.commons.cli.Options;
import org.apache.commons.cli.ParseException; import org.apache.commons.cli.ParseException;
@@ -285,7 +286,7 @@ public class App {
/** /**
* Attempt to rip targetURL. * Attempt to rip targetURL.
* @param targetURL URL to rip * @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) { private static void ripURL(String targetURL, boolean saveConfig) {
try { try {
@@ -334,7 +335,7 @@ public class App {
* @return CommandLine object containing arguments. * @return CommandLine object containing arguments.
*/ */
private static CommandLine getArgs(String[] args) { private static CommandLine getArgs(String[] args) {
BasicParser parser = new BasicParser(); var parser = new DefaultParser();
try { try {
return parser.parse(getOptions(), args, false); return parser.parse(getOptions(), args, false);
} catch (ParseException e) { } catch (ParseException e) {

View File

@@ -2,7 +2,6 @@ package com.rarchives.ripme.ripper;
import java.io.File; import java.io.File;
import java.io.FileOutputStream; import java.io.FileOutputStream;
import java.io.FileWriter;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;
import java.net.URL; import java.net.URL;

View File

@@ -14,7 +14,6 @@ import org.jsoup.nodes.Element;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.utils.Http;
import java.util.HashMap; import java.util.HashMap;
public class AerisdiesRipper extends AbstractHTMLRipper { public class AerisdiesRipper extends AbstractHTMLRipper {

View File

@@ -12,7 +12,6 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.utils.Http;
public class AllporncomicRipper extends AbstractHTMLRipper { public class AllporncomicRipper extends AbstractHTMLRipper {

View File

@@ -18,7 +18,6 @@ import java.util.ArrayList;
import java.util.Arrays; import java.util.Arrays;
import java.util.Base64; import java.util.Base64;
import java.util.HashMap; import java.util.HashMap;
import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
import java.util.regex.Matcher; import java.util.regex.Matcher;
@@ -28,7 +27,6 @@ import org.jsoup.Connection;
import org.jsoup.Connection.Method; import org.jsoup.Connection.Method;
import org.jsoup.Connection.Response; import org.jsoup.Connection.Response;
import org.jsoup.HttpStatusException; import org.jsoup.HttpStatusException;
import org.jsoup.Jsoup;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;

View File

@@ -1,11 +1,9 @@
package com.rarchives.ripme.ripper.rippers; package com.rarchives.ripme.ripper.rippers;
import com.rarchives.ripme.ripper.AbstractRipper;
import com.rarchives.ripme.ripper.AbstractSingleFileRipper; import com.rarchives.ripme.ripper.AbstractSingleFileRipper;
import com.rarchives.ripme.utils.Http; import com.rarchives.ripme.utils.Http;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;

View File

@@ -24,11 +24,6 @@ import com.rarchives.ripme.utils.Http;
public class EightmusesRipper extends AbstractHTMLRipper { public class EightmusesRipper extends AbstractHTMLRipper {
private Map<String,String> cookies = new HashMap<>(); private Map<String,String> 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<URL,String> urlTitles = new HashMap<>();
private Boolean rippingSubalbums = false;
public EightmusesRipper(URL url) throws IOException { public EightmusesRipper(URL url) throws IOException {
super(url); super(url);

View File

@@ -119,7 +119,6 @@ public class EroShareRipper extends AbstractHTMLRipper {
for (Element img : imgs) { for (Element img : imgs) {
if (img.hasClass("album-image")) { if (img.hasClass("album-image")) {
String imageURL = img.attr("src"); String imageURL = img.attr("src");
imageURL = imageURL;
URLs.add(imageURL); URLs.add(imageURL);
} }
} }

View File

@@ -13,7 +13,6 @@ import com.rarchives.ripme.utils.Utils;
import org.jsoup.Connection.Response; import org.jsoup.Connection.Response;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.utils.Http; import com.rarchives.ripme.utils.Http;
@@ -92,7 +91,6 @@ public class EromeRipper extends AbstractHTMLRipper {
@Override @Override
public List<String> getURLsFromPage(Document doc) { public List<String> getURLsFromPage(Document doc) {
List<String> URLs = new ArrayList<>();
return getMediaFromPage(doc); return getMediaFromPage(doc);
} }

View File

@@ -11,7 +11,6 @@ import java.util.regex.Pattern;
import org.jsoup.Connection.Response; import org.jsoup.Connection.Response;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import org.jsoup.select.Elements;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.utils.Http; import com.rarchives.ripme.utils.Http;

View File

@@ -12,7 +12,6 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.utils.Http;
public class FemjoyhunterRipper extends AbstractHTMLRipper { public class FemjoyhunterRipper extends AbstractHTMLRipper {

View File

@@ -13,7 +13,6 @@ import org.jsoup.nodes.Element;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.utils.Http;
public class FitnakedgirlsRipper extends AbstractHTMLRipper { public class FitnakedgirlsRipper extends AbstractHTMLRipper {

View File

@@ -10,16 +10,9 @@ import java.util.regex.Pattern;
import com.rarchives.ripme.ripper.AbstractSingleFileRipper; import com.rarchives.ripme.ripper.AbstractSingleFileRipper;
import org.jsoup.nodes.Document; 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 { public class FooktubeRipper extends AbstractSingleFileRipper {
private static final String HOST = "mulemax";
public FooktubeRipper(URL url) throws IOException { public FooktubeRipper(URL url) throws IOException {
super(url); super(url);
} }

View File

@@ -11,8 +11,6 @@ import java.util.regex.Pattern;
import com.rarchives.ripme.ripper.AbstractSingleFileRipper; import com.rarchives.ripme.ripper.AbstractSingleFileRipper;
import org.jsoup.nodes.Document; import org.jsoup.nodes.Document;
import com.rarchives.ripme.utils.Http;
public class GfycatporntubeRipper extends AbstractSingleFileRipper { public class GfycatporntubeRipper extends AbstractSingleFileRipper {
public GfycatporntubeRipper(URL url) throws IOException { public GfycatporntubeRipper(URL url) throws IOException {

View File

@@ -13,7 +13,6 @@ import org.jsoup.nodes.Element;
import org.jsoup.select.Elements; import org.jsoup.select.Elements;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.utils.Http;
public class GirlsOfDesireRipper extends AbstractHTMLRipper { public class GirlsOfDesireRipper extends AbstractHTMLRipper {

View File

@@ -12,7 +12,6 @@ import org.jsoup.nodes.Document;
import org.jsoup.nodes.Element; import org.jsoup.nodes.Element;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.utils.Http;
public class HentaifoxRipper extends AbstractHTMLRipper { public class HentaifoxRipper extends AbstractHTMLRipper {

View File

@@ -126,9 +126,8 @@ public class MangadexRipper extends AbstractJSONRipper {
String server; String server;
JSONObject chapterJSON = null; JSONObject chapterJSON = null;
TreeMap<Double, String> treeMap = new TreeMap<>(chapterIDs); TreeMap<Double, String> treeMap = new TreeMap<>(chapterIDs);
Iterator it = treeMap.keySet().iterator(); for (Double aDouble : treeMap.keySet()) {
while (it.hasNext()) { double key = (double) aDouble;
double key = (double) it.next();
try { try {
chapterJSON = Http.url(new URL(chapterApiEndPoint + treeMap.get(key))).getJSON(); chapterJSON = Http.url(new URL(chapterApiEndPoint + treeMap.get(key))).getJSON();
} catch (IOException e) { } catch (IOException e) {

View File

@@ -1,7 +1,6 @@
package com.rarchives.ripme.ripper.rippers; package com.rarchives.ripme.ripper.rippers;
import com.rarchives.ripme.ripper.AbstractHTMLRipper; import com.rarchives.ripme.ripper.AbstractHTMLRipper;
import com.rarchives.ripme.ripper.AbstractRipper;
import com.rarchives.ripme.utils.Http; import com.rarchives.ripme.utils.Http;
import java.io.IOException; import java.io.IOException;
import java.net.MalformedURLException; import java.net.MalformedURLException;

View File

@@ -1,6 +1,5 @@
package com.rarchives.ripme.ui; package com.rarchives.ripme.ui;
import java.io.IOException;
import java.nio.file.Path; import java.nio.file.Path;
public class RipStatusComplete { public class RipStatusComplete {

View File

@@ -4,7 +4,6 @@ import java.io.IOException;
import java.net.URL; import java.net.URL;
import com.rarchives.ripme.ripper.rippers.XvideosRipper; import com.rarchives.ripme.ripper.rippers.XvideosRipper;
import com.rarchives.ripme.tst.ripper.rippers.RippersTest;
import org.junit.jupiter.api.Test; import org.junit.jupiter.api.Test;
public class XvideosRipperTest extends RippersTest { public class XvideosRipperTest extends RippersTest {

View File

@@ -7,11 +7,10 @@ public class UpdateUtilsTest {
@Test @Test
public void testIsNewerVersion() { public void testIsNewerVersion() {
UpdateUtils updateUtils = new UpdateUtils(); Assertions.assertFalse(UpdateUtils.isNewerVersion("1.7.94"));
Assertions.assertFalse(updateUtils.isNewerVersion("1.7.94")); Assertions.assertFalse(UpdateUtils.isNewerVersion("1.7.94-9-asdf"));
Assertions.assertFalse(updateUtils.isNewerVersion("1.7.94-9-asdf")); Assertions.assertTrue(UpdateUtils.isNewerVersion("1.7.94-11-asdf"));
Assertions.assertTrue(updateUtils.isNewerVersion("1.7.94-11-asdf")); Assertions.assertTrue(UpdateUtils.isNewerVersion("1.7.95"));
Assertions.assertTrue(updateUtils.isNewerVersion("1.7.95"));
} }
} }