1.0.41 - Properly strip out https flickr links #32

This commit is contained in:
4pr0n 2014-05-15 22:47:17 -07:00
parent 0722667b4e
commit 8aa8eaade4
3 changed files with 5 additions and 3 deletions

View File

@ -4,7 +4,7 @@
<groupId>com.rarchives.ripme</groupId> <groupId>com.rarchives.ripme</groupId>
<artifactId>ripme</artifactId> <artifactId>ripme</artifactId>
<packaging>jar</packaging> <packaging>jar</packaging>
<version>1.0.40</version> <version>1.0.41</version>
<name>ripme</name> <name>ripme</name>
<url>http://rip.rarchives.com</url> <url>http://rip.rarchives.com</url>
<properties> <properties>

View File

@ -44,7 +44,9 @@ public class FlickrRipper extends AlbumRipper {
public URL sanitizeURL(URL url) throws MalformedURLException { public URL sanitizeURL(URL url) throws MalformedURLException {
String sUrl = url.toExternalForm(); String sUrl = url.toExternalForm();
sUrl = sUrl.replace("secure.flickr.com", "flickr.com"); // Strip out https
sUrl = sUrl.replace("https://secure.flickr.com", "http://www.flickr.com");
// For /groups/ links, add a /pool to the end of the URL
if (sUrl.contains("flickr.com/groups/") && !sUrl.contains("/pool")) { if (sUrl.contains("flickr.com/groups/") && !sUrl.contains("/pool")) {
if (!sUrl.endsWith("/")) { if (!sUrl.endsWith("/")) {
sUrl += "/"; sUrl += "/";

View File

@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
public class UpdateUtils { public class UpdateUtils {
private static final Logger logger = Logger.getLogger(UpdateUtils.class); private static final Logger logger = Logger.getLogger(UpdateUtils.class);
private static final String DEFAULT_VERSION = "1.0.40"; private static final String DEFAULT_VERSION = "1.0.41";
private static final String updateJsonURL = "http://rarchives.com/ripme.json"; private static final String updateJsonURL = "http://rarchives.com/ripme.json";
private static final String updateJarURL = "http://rarchives.com/ripme.jar"; private static final String updateJarURL = "http://rarchives.com/ripme.jar";
private static final String mainFileName = "ripme.jar"; private static final String mainFileName = "ripme.jar";