From e9e770c97435e067c333ec1cf4a530dd9a21f3b9 Mon Sep 17 00:00:00 2001
From: Tushar <tush_r67@hotmail.com.>
Date: Sun, 27 Jan 2019 22:38:08 +0530
Subject: [PATCH] Fixed GfycatRipper not not ripping gifs.

---
 .../ripme/ripper/rippers/GfycatRipper.java    | 39 +++++++++++++------
 1 file changed, 28 insertions(+), 11 deletions(-)

diff --git a/src/main/java/com/rarchives/ripme/ripper/rippers/GfycatRipper.java b/src/main/java/com/rarchives/ripme/ripper/rippers/GfycatRipper.java
index 9c2db859..2061db45 100644
--- a/src/main/java/com/rarchives/ripme/ripper/rippers/GfycatRipper.java
+++ b/src/main/java/com/rarchives/ripme/ripper/rippers/GfycatRipper.java
@@ -1,6 +1,5 @@
 package com.rarchives.ripme.ripper.rippers;
 
-
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
@@ -11,10 +10,11 @@ import java.util.regex.Pattern;
 
 import com.rarchives.ripme.ripper.AbstractSingleFileRipper;
 import org.jsoup.nodes.Document;
+import org.jsoup.nodes.Element;
 import org.jsoup.select.Elements;
 
 import com.rarchives.ripme.utils.Http;
-
+import com.rarchives.ripme.utils.Utils;
 
 public class GfycatRipper extends AbstractSingleFileRipper {
 
@@ -42,7 +42,7 @@ public class GfycatRipper extends AbstractSingleFileRipper {
     @Override
     public URL sanitizeURL(URL url) throws MalformedURLException {
         url = new URL(url.toExternalForm().replace("/gifs/detail", ""));
-        
+
         return url;
     }
 
@@ -64,17 +64,23 @@ public class GfycatRipper extends AbstractSingleFileRipper {
             return m.group(1);
         }
 
-        throw new MalformedURLException(
-                "Expected gfycat.com format:"
-                        + "gfycat.com/id"
-                        + " Got: " + url);
+        throw new MalformedURLException("Expected gfycat.com format:" + "gfycat.com/id" + " Got: " + url);
     }
 
     @Override
     public List<String> getURLsFromPage(Document doc) {
         List<String> result = new ArrayList<>();
-        Elements videos = doc.select("source");
+        Elements videos = doc.select("video source");
         String vidUrl = videos.first().attr("src");
+        // Check preference for mp4 over webm/gif.
+        if (Utils.getConfigBoolean("prefer.mp4", false)) {
+            for (Element e : videos) {
+                if (e.hasAttr("src") && e.attr("src").endsWith(".mp4")) {
+                    vidUrl = e.attr("src");
+                    break;
+                }
+            }
+        }
         if (vidUrl.startsWith("//")) {
             vidUrl = "http:" + vidUrl;
         }
@@ -84,22 +90,33 @@ public class GfycatRipper extends AbstractSingleFileRipper {
 
     /**
      * Helper method for retrieving video URLs.
-     * @param url URL to gfycat page
+     * 
+     * @param url
+     *            URL to gfycat page
      * @return URL to video
      * @throws IOException
      */
     public static String getVideoURL(URL url) throws IOException {
         LOGGER.info("Retrieving " + url.toExternalForm());
 
-        //Sanitize the URL first
+        // Sanitize the URL first
         url = new URL(url.toExternalForm().replace("/gifs/detail", ""));
 
         Document doc = Http.url(url).get();
-        Elements videos = doc.select("source");
+        Elements videos = doc.select("video source");
         if (videos.isEmpty()) {
             throw new IOException("Could not find source at " + url);
         }
         String vidUrl = videos.first().attr("src");
+        // Check preference for mp4 over webm/gif.
+        if (Utils.getConfigBoolean("prefer.mp4", false)) {
+            for (Element e : videos) {
+                if (e.hasAttr("src") && e.attr("src").endsWith(".mp4")) {
+                    vidUrl = e.attr("src");
+                    break;
+                }
+            }
+        }
         if (vidUrl.startsWith("//")) {
             vidUrl = "http:" + vidUrl;
         }