From 113a90120bca685c3a430a9fa8545ecee50c8fcc Mon Sep 17 00:00:00 2001
From: 4pr0n <admin@rarchives.com>
Date: Fri, 20 Jun 2014 01:59:01 -0700
Subject: [PATCH] 1.0.69 - Gfycat video ripper, instagram username fix

For #8
---
 pom.xml                                       |  2 +-
 .../ripper/rippers/video/GfycatRipper.java    | 69 +++++++++++++++++++
 .../com/rarchives/ripme/ui/UpdateUtils.java   |  2 +-
 3 files changed, 71 insertions(+), 2 deletions(-)
 create mode 100644 src/main/java/com/rarchives/ripme/ripper/rippers/video/GfycatRipper.java

diff --git a/pom.xml b/pom.xml
index e101c1df..24c288fb 100644
--- a/pom.xml
+++ b/pom.xml
@@ -4,7 +4,7 @@
   <groupId>com.rarchives.ripme</groupId>
   <artifactId>ripme</artifactId>
   <packaging>jar</packaging>
-  <version>1.0.68</version>
+  <version>1.0.69</version>
   <name>ripme</name>
   <url>http://rip.rarchives.com</url>
   <properties>
diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/video/GfycatRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/video/GfycatRipper.java
new file mode 100644
index 00000000..4b9c6455
--- /dev/null
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/video/GfycatRipper.java
@@ -0,0 +1,69 @@
+package com.rarchives.ripme.ripper.rippers.video;
+
+import java.io.IOException;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+import org.jsoup.select.Elements;
+
+import com.rarchives.ripme.ripper.VideoRipper;
+
+public class GfycatRipper extends VideoRipper {
+
+    private static final String HOST = "gfycat.com";
+
+    public GfycatRipper(URL url) throws IOException {
+        super(url);
+    }
+
+    @Override
+    public String getHost() {
+        return HOST;
+    }
+
+    @Override
+    public boolean canRip(URL url) {
+        return url.getHost().endsWith(HOST);
+    }
+    
+    @Override
+    public URL sanitizeURL(URL url) throws MalformedURLException {
+        return url;
+    }
+
+    @Override
+    public String getGID(URL url) throws MalformedURLException {
+        Pattern p = Pattern.compile("^https?://[wm.]*gfycat\\.com/([a-zA-Z0-9]+).*$");
+        Matcher m = p.matcher(url.toExternalForm());
+        if (m.matches()) {
+            return m.group(1);
+        }
+
+        throw new MalformedURLException(
+                "Expected gfycat.com format:"
+                        + "gfycat.com/id"
+                        + " Got: " + url);
+    }
+
+    @Override
+    public void rip() throws IOException {
+        logger.info("    Retrieving " + this.url.toExternalForm());
+        Document doc = Jsoup.connect(this.url.toExternalForm())
+                            .userAgent(USER_AGENT)
+                            .get();
+        Elements videos = doc.select("source#mp4source");
+        if (videos.size() == 0) {
+            throw new IOException("Could not find source#mp4source at " + url);
+        }
+        String vidUrl = videos.first().attr("src");
+        if (vidUrl.startsWith("//")) {
+            vidUrl = "http:" + vidUrl;
+        }
+        addURLToDownload(new URL(vidUrl), "gfycat_" + getGID(this.url));
+        waitForThreads();
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
index 0dc87c58..6327e870 100644
--- a/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
+++ b/src/main/java/com/rarchives/ripme/ui/UpdateUtils.java
@@ -21,7 +21,7 @@ import com.rarchives.ripme.utils.Utils;
 public class UpdateUtils {
 
     private static final Logger logger = Logger.getLogger(UpdateUtils.class);
-    private static final String DEFAULT_VERSION = "1.0.68";
+    private static final String DEFAULT_VERSION = "1.0.69";
     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";