From a0c044f0c955712a666354fcc8649dbbc7892610 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Mon, 3 Oct 2016 16:13:05 +0200
Subject: [PATCH] [rapidimg] add extractor

---
 gallery_dl/extractor/__init__.py |  1 +
 gallery_dl/extractor/imgyt.py    |  8 +++++---
 gallery_dl/extractor/rapidimg.py | 18 ++++++++++++++++++
 3 files changed, 24 insertions(+), 3 deletions(-)
 create mode 100644 gallery_dl/extractor/rapidimg.py

diff --git a/gallery_dl/extractor/__init__.py b/gallery_dl/extractor/__init__.py
index d5eeddb5..16003bea 100644
--- a/gallery_dl/extractor/__init__.py
+++ b/gallery_dl/extractor/__init__.py
@@ -56,6 +56,7 @@ modules = [
     "nijie",
     "pinterest",
     "powermanga",
+    "rapidimg",
     "rule34",
     "safebooru",
     "sankaku",
diff --git a/gallery_dl/extractor/imgyt.py b/gallery_dl/extractor/imgyt.py
index 61f0362c..6f10a7fa 100644
--- a/gallery_dl/extractor/imgyt.py
+++ b/gallery_dl/extractor/imgyt.py
@@ -19,11 +19,13 @@ class ImgytImageExtractor(Extractor):
     directory_fmt = ["{category}"]
     filename_fmt = "{filename}"
     pattern = [r"(?:https?://)?(?:www\.)?img\.yt/img-([a-z0-9]+)\.html"]
-    test = [("http://img.yt/img-57a2050547b97.html", {
+    test = [("https://img.yt/img-57a2050547b97.html", {
         "url": "6801fac1ff8335bd27a1665ad27ad64cace2cd84",
         "keyword": "7548cc9915f90f5d7ffbafa079085457ae34562c",
         "content": "54592f2635674c25677c6872db3709d343cdf92f",
     })]
+    url = "https://img.yt"
+    https = True
 
     def __init__(self, match):
         Extractor.__init__(self)
@@ -31,13 +33,13 @@ class ImgytImageExtractor(Extractor):
 
     def items(self):
         params = {"imgContinue": "Continue+to+image+...+"}
-        page = self.request("https://img.yt/img-" + self.token + ".html",
+        page = self.request(self.url + "/img-" + self.token + ".html",
                             method="post", data=params).text
         url     , pos = text.extract(page, "<img class='centred' src='", "'")
         filename, pos = text.extract(page, " alt='", "'", pos)
         data = {"token": self.token}
         text.nameext_from_url(filename + splitext(url)[1], data)
-        if url.startswith("http:"):
+        if self.https and url.startswith("http:"):
             url = "https:" + url[5:]
         yield Message.Version, 1
         yield Message.Directory, data
diff --git a/gallery_dl/extractor/rapidimg.py b/gallery_dl/extractor/rapidimg.py
new file mode 100644
index 00000000..f808550c
--- /dev/null
+++ b/gallery_dl/extractor/rapidimg.py
@@ -0,0 +1,18 @@
+# -*- coding: utf-8 -*-
+
+# Copyright 2016 Mike Fährmann
+#
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License version 2 as
+# published by the Free Software Foundation.
+
+"""Extract images from http://rapidimg.net/"""
+
+from . import imgyt
+
+class RapidimgImageExtractor(imgyt.ImgytImageExtractor):
+    """Extractor for single images from rapidimg.net"""
+    category = "rapidimg"
+    pattern = [r"(?:https?://)?(?:www\.)?rapidimg\.net/img-([a-z0-9]+)\.html"]
+    url = "http://rapidimg.net"
+    https = False