[untested] Removed references in VkRipper

src/main/java/com/rarchives/ripme/ripper/rippers/VkRipper.java

@@ -3,62 +3,50 @@ package com.rarchives.ripme.ripper.rippers;
 import java.io.IOException;
 import java.net.MalformedURLException;
 import java.net.URL;
-import java.util.HashMap;
+import java.util.*;
-import java.util.HashSet;
-import java.util.List;
-import java.util.Map;
-import java.util.Set;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
+import com.rarchives.ripme.ripper.AbstractJSONRipper;
 import org.json.JSONArray;
 import org.json.JSONObject;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 import org.jsoup.nodes.Element;
 
-import com.rarchives.ripme.ripper.AlbumRipper;
 import com.rarchives.ripme.utils.Http;
 import com.rarchives.ripme.utils.Utils;
 
-public class VkRipper extends AlbumRipper {
+public class VkRipper extends AbstractJSONRipper {
 
     private static final String DOMAIN = "vk.com",
                                 HOST   = "vk";
 
+    enum RipType { VIDEO, IMAGE }
+
+    private RipType RIP_TYPE;
+    private String oid;
+
     public VkRipper(URL url) throws IOException {
         super(url);
     }
 
     @Override
-    public boolean canRip(URL url) {
+    public String getHost() {
-        if (!url.getHost().endsWith(DOMAIN)) {
+        return HOST;
-            return false;
-        }
-        // Ignore /video pages (but not /videos pages)
-        String u = url.toExternalForm();
-        return !u.contains("/video") || u.contains("videos");
     }
 
     @Override
-    public URL sanitizeURL(URL url) throws MalformedURLException {
+    protected String getDomain() {
-        return url;
+        return DOMAIN;
     }
 
     @Override
-    public void rip() throws IOException {
+    protected JSONObject getFirstPage() throws IOException {
-        if (this.url.toExternalForm().contains("/videos")) {
+        if (RIP_TYPE == RipType.VIDEO) {
-            ripVideos();
+            oid = getGID(this.url).replace("videos", "");
-        }
-        else {
-            ripImages();
-        }
-    }
-
-    private void ripVideos() throws IOException {
-        String oid = getGID(this.url).replace("videos", "");
             String u = "http://vk.com/al_video.php";
-        Map<String,String> postData = new HashMap<>();
+            Map<String, String> postData = new HashMap<>();
             postData.put("al", "1");
             postData.put("act", "load_videos_silent");
             postData.put("offset", "0");
@@ -69,36 +57,12 @@ public class VkRipper extends AlbumRipper {
                     .data(postData)
                     .post();
             String[] jsonStrings = doc.toString().split("<!>");
-        JSONObject json = new JSONObject(jsonStrings[jsonStrings.length - 1]);
+            return new JSONObject(jsonStrings[jsonStrings.length - 1]);
-        JSONArray videos = json.getJSONArray("all");
+        } else {
-        LOGGER.info("Found " + videos.length() + " videos");
-        for (int i = 0; i < videos.length(); i++) {
-            JSONArray jsonVideo = videos.getJSONArray(i);
-            int vidid = jsonVideo.getInt(1);
-            String videoURL = com.rarchives.ripme.ripper.rippers.video.VkRipper.getVideoURLAtPage(
-                    "http://vk.com/video" + oid + "_" + vidid);
-            String prefix = "";
-            if (Utils.getConfigBoolean("download.save_order", true)) {
-                prefix = String.format("%03d_", i + 1);
-            }
-            addURLToDownload(new URL(videoURL), prefix);
-            try {
-                Thread.sleep(500);
-            } catch (InterruptedException e) {
-                LOGGER.error("Interrupted while waiting to fetch next video URL", e);
-                break;
-            }
-        }
-        waitForThreads();
-    }
-
-    private void ripImages() throws IOException {
             Map<String,String> photoIDsToURLs = new HashMap<>();
             int offset = 0;
             while (true) {
                 LOGGER.info("    Retrieving " + this.url);
-
-            // al=1&offset=80&part=1
                 Map<String,String> postData = new HashMap<>();
                 postData.put("al", "1");
                 postData.put("offset", Integer.toString(offset));
@@ -142,8 +106,6 @@ public class VkRipper extends AlbumRipper {
                         LOGGER.error("Could not find URL for photo ID: " + photoID);
                         continue;
                     }
-                String url = photoIDsToURLs.get(photoID);
-                addURLToDownload(new URL(url));
                     if (isStopped() || isThisATest()) {
                         break;
                     }
@@ -154,8 +116,88 @@ public class VkRipper extends AlbumRipper {
                 }
                 offset += elements.size();
             }
+            // Slight hack to make this into effectively a JSON ripper
+            return new JSONObject(photoIDsToURLs);
+        }
+    }
+
+    @Override
+    protected List<String> getURLsFromJSON(JSONObject page) {
+        List<String> pageURLs = new ArrayList<>();
+        if (RIP_TYPE == RipType.VIDEO) {
+            JSONArray videos = page.getJSONArray("all");
+            LOGGER.info("Found " + videos.length() + " videos");
+
+            for (int i = 0; i < videos.length(); i++) {
+                JSONArray jsonVideo = videos.getJSONArray(i);
+                int vidid = jsonVideo.getInt(1);
+                String videoURL;
+                try {
+                    videoURL = com.rarchives.ripme.ripper.rippers.video.VkRipper.getVideoURLAtPage(
+                            "http://vk.com/video" + oid + "_" + vidid);
+                } catch (IOException e) {
+                    LOGGER.error("Error while ripping video id: " + vidid);
+                    return pageURLs;
+                }
+                pageURLs.add(videoURL);
+            }
+        } else {
+            Iterator keys = page.keys();
+            while (keys.hasNext()) {
+                pageURLs.add(page.getString((String) keys.next()));
+            }
+        }
+        return pageURLs;
+    }
+
+    @Override
+    protected void downloadURL(URL url, int index) {
+        if (RIP_TYPE == RipType.VIDEO) {
+            String prefix = "";
+            if (Utils.getConfigBoolean("download.save_order", true)) {
+                prefix = String.format("%03d_", index + 1);
+            }
+            addURLToDownload(url, prefix);
+            try {
+                Thread.sleep(500);
+            } catch (InterruptedException e) {
+                LOGGER.error("Interrupted while waiting to fetch next video URL", e);
+            }
+        } else {
+            addURLToDownload(url);
+        }
+    }
+
+    @Override
+    public boolean canRip(URL url) {
+        if (!url.getHost().endsWith(DOMAIN)) {
+            return false;
+        }
+        // Ignore /video pages (but not /videos pages)
+        String u = url.toExternalForm();
+        return !u.contains("/video") || u.contains("videos");
+    }
+
+    @Override
+    public URL sanitizeURL(URL url) throws MalformedURLException {
+        return url;
+    }
+
+    @Override
+    public void rip() throws IOException {
+        if (this.url.toExternalForm().contains("/videos")) {
+            RIP_TYPE = RipType.VIDEO;
+            JSONObject json = getFirstPage();
+            List<String> URLs = getURLsFromJSON(json);
+            for (int index = 0; index < URLs.size(); index ++) {
+                downloadURL(new URL(URLs.get(index)), index);
+            }
             waitForThreads();
         }
+        else {
+            RIP_TYPE = RipType.IMAGE;
+        }
+    }
 
     private Map<String,String> getPhotoIDsToURLs(String photoID) throws IOException {
         Map<String,String> photoIDsToURLs = new HashMap<>();
@@ -191,11 +233,6 @@ public class VkRipper extends AlbumRipper {
         return photoIDsToURLs;
     }
 
-    @Override
-    public String getHost() {
-        return HOST;
-    }
-
     @Override
     public String getGID(URL url) throws MalformedURLException {
         Pattern p = Pattern.compile("^https?://(www\\.)?vk\\.com/(photos|album|videos)-?([a-zA-Z0-9_]+).*$");