mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-25 06:41:20 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1818 from PaaaulZ/fix-1795

Browse Source 
Fixed #1795 and added new test
This commit is contained in:
cyian-1756
2021-04-26 05:22:25 +00:00
committed by GitHub
parent 7bb2486a68 10c3624876
commit 0478b5456a
2 changed files with 12 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -57,7 +57,7 @@ public class GfycatRipper extends AbstractHTMLRipper {
} }
public boolean isProfile() { public boolean isProfile() {
Pattern p = Pattern.compile("^https?://[wm.]*gfycat\\.com/@([a-zA-Z0-9]+).*$"); Pattern p = Pattern.compile("^https?://[wm.]*gfycat\\.com/@([a-zA-Z0-9\\.\\-\\_]+).*$");
Matcher m = p.matcher(url.toExternalForm()); Matcher m = p.matcher(url.toExternalForm());
return m.matches(); return m.matches();
} }
@@ -79,11 +79,11 @@ public class GfycatRipper extends AbstractHTMLRipper {
@Override @Override
public String getGID(URL url) throws MalformedURLException { public String getGID(URL url) throws MalformedURLException {
Pattern p = Pattern.compile("^https?://(thumbs\\.|[wm\\.]*)gfycat\\.com/@?([a-zA-Z0-9]+).*$"); Pattern p = Pattern.compile("^https?://(?:thumbs\\.|[wm\\.]*)gfycat\\.com/@?([a-zA-Z0-9\\.\\-\\_]+).*$");
Matcher m = p.matcher(url.toExternalForm()); Matcher m = p.matcher(url.toExternalForm());
if (m.matches()) if (m.matches())
return m.group(2); return m.group(1);
throw new MalformedURLException( throw new MalformedURLException(
"Expected gfycat.com format: " "Expected gfycat.com format: "

9
src/test/java/com/rarchives/ripme/tst/ripper/rippers/GfycatRipperTest.java
View File

@@ -44,4 +44,13 @@ public class GfycatRipperTest extends RippersTest {
GfycatRipper ripper = new GfycatRipper(new URL("https://gfycat.com/amp/TemptingExcellentIchthyosaurs")); GfycatRipper ripper = new GfycatRipper(new URL("https://gfycat.com/amp/TemptingExcellentIchthyosaurs"));
testRipper(ripper); testRipper(ripper);
} }
/**
* Rips a Gfycat profile with special characters in username
* @throws IOException
*/
public void testGfycatSpecialChar() throws IOException {
GfycatRipper ripper = new GfycatRipper(new URL("https://gfycat.com/@rsss.kr"));
testRipper(ripper);
}
} }