Gurkengewuerz/ImgScroll
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Added better url sanitization for DeviantartRipper and some unit tests

Browse Source
This commit is contained in:
cyian-1756 2018-07-01 19:25:32 -04:00
parent 0ed2a7ddac
commit d0960fad75
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
src/main/java/com/rarchives/ripme/ripper/rippers/DeviantartRipper.java
View File

@ -64,8 +64,10 @@ public class DeviantartRipper extends AbstractJSONRipper {
public URL sanitizeURL(URL url) throws MalformedURLException { public URL sanitizeURL(URL url) throws MalformedURLException {
String u = url.toExternalForm(); String u = url.toExternalForm();
if (!u.endsWith("/gallery/")) { if (!u.endsWith("/gallery/") && !u.endsWith("/gallery")) {
if (!u.endsWith("/gallery")) { if (!u.endsWith("/")) {
u += "/gallery/";
} else {
u += "gallery/"; u += "gallery/";
} }
} }

14
src/test/java/com/rarchives/ripme/tst/ripper/rippers/DeviantartRipperTest.java
View File

@ -2,6 +2,8 @@ package com.rarchives.ripme.tst.ripper.rippers;
import java.io.IOException; import java.io.IOException;
import java.net.URL; import java.net.URL;
import java.util.ArrayList;
import java.util.List;
import com.rarchives.ripme.ripper.rippers.DeviantartRipper; import com.rarchives.ripme.ripper.rippers.DeviantartRipper;
import com.rarchives.ripme.utils.Http; import com.rarchives.ripme.utils.Http;
@ -32,4 +34,16 @@ public class DeviantartRipperTest extends RippersTest {
assertEquals("airgee", ripper.getUsername(doc)); assertEquals("airgee", ripper.getUsername(doc));
assertEquals("714589", ripper.getGalleryID(doc)); assertEquals("714589", ripper.getGalleryID(doc));
} }
public void testSanitizeURL() throws IOException {
List<URL> urls = new ArrayList<URL>();
urls.add(new URL("https://www.deviantart.com/airgee/"));
urls.add(new URL("https://www.deviantart.com/airgee"));
urls.add(new URL("https://www.deviantart.com/airgee/gallery/"));
for (URL url : urls) {
DeviantartRipper ripper = new DeviantartRipper(url);
assertEquals("https://www.deviantart.com/airgee/gallery/", ripper.sanitizeURL(url).toExternalForm());
}
}
} }