mirror/ripme
1
0
Fork 0
mirror of https://github.com/RipMeApp/ripme.git synced 2025-08-29 16:50:10 +02:00
Code Issues Releases Wiki Activity

Merge pull request #1064 from PwnicornDev/patch-1

Browse Source 
Update userRegex, fixes #1063
This commit is contained in:
cyian-1756
2018-11-24 09:06:31 -05:00
committed by GitHub
parent 6344e47b44 a4117133f8
commit d79b54f7ca
1 changed files with 3 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/FlickrRipper.java
View File

@@ -129,7 +129,7 @@ public class FlickrRipper extends AbstractHTMLRipper {
// Album: https://www.flickr.com/photos/115858035@N04/sets/72157644042355643/ // Album: https://www.flickr.com/photos/115858035@N04/sets/72157644042355643/
final String domainRegex = "https?://[wm.]*flickr.com"; final String domainRegex = "https?://[wm.]*flickr.com";
final String userRegex = "[a-zA-Z0-9@]+"; final String userRegex = "[a-zA-Z0-9@_-]+";
// Album // Album
p = Pattern.compile("^" + domainRegex + "/photos/(" + userRegex + ")/(sets|albums)/([0-9]+)/?.*$"); p = Pattern.compile("^" + domainRegex + "/photos/(" + userRegex + ")/(sets|albums)/([0-9]+)/?.*$");
m = p.matcher(url); m = p.matcher(url);
@@ -168,7 +168,7 @@ public class FlickrRipper extends AbstractHTMLRipper {
// Album: https://www.flickr.com/photos/115858035@N04/sets/72157644042355643/ // Album: https://www.flickr.com/photos/115858035@N04/sets/72157644042355643/
final String domainRegex = "https?://[wm.]*flickr.com"; final String domainRegex = "https?://[wm.]*flickr.com";
final String userRegex = "[a-zA-Z0-9@]+"; final String userRegex = "[a-zA-Z0-9@_-]+";
// Album // Album
p = Pattern.compile("^" + domainRegex + "/photos/(" + userRegex + ")/sets/([0-9]+)/?.*$"); p = Pattern.compile("^" + domainRegex + "/photos/(" + userRegex + ")/sets/([0-9]+)/?.*$");
m = p.matcher(url.toExternalForm()); m = p.matcher(url.toExternalForm());
@@ -250,4 +250,4 @@ public class FlickrRipper extends AbstractHTMLRipper {
public void downloadURL(URL url, int index) { public void downloadURL(URL url, int index) {
addURLToDownload(url, getPrefix(index)); addURLToDownload(url, getPrefix(index));
} }
} }