1.0.41 - Properly strip out https flickr links #32

4pr0n · May 16, 2014 · 8aa8eaa · 8aa8eaa
1 parent 0722667
commit 8aa8eaa
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 3 deletions.
diff --git a/pom.xml b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.40</version>
+  <version>1.0.41</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/FlickrRipper.java
@@ -44,7 +44,9 @@ public String getHost() {
 
     public URL sanitizeURL(URL url) throws MalformedURLException {
         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.endsWith("/")) {
                 sUrl += "/";

diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@
 public class UpdateUtils {
 
     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 updateJarURL = "http://rarchives.com/ripme.jar";
     private static final String mainFileName = "ripme.jar";