diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java index e5ad4fa7..c391123f 100644 --- a/src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java +++ b/src/main/java/com/rarchives/ripme/ripper/rippers/VineboxRipper.java @@ -31,12 +31,7 @@ public class VineboxRipper extends AbstractRipper { @Override public URL sanitizeURL(URL url) throws MalformedURLException { - Pattern p = Pattern.compile("^https?://(www\\.)?vinebox\\.co/u/([a-zA-Z0-9]{1,}).*$"); - Matcher m = p.matcher(url.toExternalForm()); - if (!m.matches()) { - throw new MalformedURLException("Expected format: http://vinebox.co/u/USERNAME"); - } - return new URL("http://vinebox.co/u/" + m.group(m.groupCount())); + return new URL("http://vinebox.co/u/" + getGID(url)); } @Override @@ -74,7 +69,6 @@ public class VineboxRipper extends AbstractRipper { @Override public String getGID(URL url) throws MalformedURLException { Pattern p = Pattern.compile("^https?://(www\\.)?vinebox\\.co/u/([a-zA-Z0-9]{1,}).*$"); - System.err.println(url); Matcher m = p.matcher(url.toExternalForm()); if (!m.matches()) { throw new MalformedURLException("Expected format: http://vinebox.co/u/USERNAME"); diff --git a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VineboxRipperTest.java b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VineboxRipperTest.java index 845745dd..734d4cbd 100644 --- a/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VineboxRipperTest.java +++ b/src/test/java/com/rarchives/ripme/tst/ripper/rippers/VineboxRipperTest.java @@ -10,11 +10,11 @@ import com.rarchives.ripme.ripper.rippers.VineboxRipper; public class VineboxRipperTest extends RippersTest { public void testVineboxAlbums() throws IOException { - if (false && !DOWNLOAD_CONTENT) { + if (DOWNLOAD_CONTENT) { return; } List contentURLs = new ArrayList(); - contentURLs.add(new URL("http://vinebox.co/u/wiZS1MvkgEo")); + contentURLs.add(new URL("http://vinebox.co/u/wi57hMjc2Ka")); for (URL url : contentURLs) { try { VineboxRipper ripper = new VineboxRipper(url);