From bf821813595275bccc9c3123233ca3120fde8068 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mike=20F=C3=A4hrmann?= <mike_faehrmann@web.de>
Date: Sat, 21 Oct 2017 16:42:45 +0200
Subject: [PATCH] [jaiminisbox] fix extraction

---
 gallery_dl/extractor/foolslide.py   | 17 ++++++++++-------
 gallery_dl/extractor/gomanga.py     |  3 +--
 gallery_dl/extractor/jaiminisbox.py |  1 +
 3 files changed, 12 insertions(+), 9 deletions(-)

diff --git a/gallery_dl/extractor/foolslide.py b/gallery_dl/extractor/foolslide.py
index 20799a61..41bbc7e4 100644
--- a/gallery_dl/extractor/foolslide.py
+++ b/gallery_dl/extractor/foolslide.py
@@ -10,6 +10,7 @@
 
 from .common import SharedConfigExtractor, MangaExtractor, Message
 from .. import text, util
+import base64
 import json
 
 
@@ -60,7 +61,7 @@ class FoolslideChapterExtractor(FoolslideExtractor):
     directory_fmt = ["{category}", "{manga}", "{chapter_string}"]
     filename_fmt = (
         "{manga}_c{chapter:>03}{chapter_minor}_{page:>03}.{extension}")
-    single = True
+    method = "default"
 
     def __init__(self, match, url=None):
         FoolslideExtractor.__init__(self)
@@ -104,13 +105,15 @@ class FoolslideChapterExtractor(FoolslideExtractor):
 
     def get_images(self, page):
         """Return a list of all images in this chapter"""
-        if self.single:
-            pos = 0
-            needle = "var pages = "
-        else:
+        if self.method == "base64":
+            base64_data = text.extract(page, 'atob("', '"')[0].encode()
+            data = base64.b64decode(base64_data).decode()
+        elif self.method == "double":
             pos = page.find("[{")
-            needle = " = "
-        return json.loads(text.extract(page, needle, ";", pos)[0])
+            data = text.extract(page, " = ", ";", pos)[0]
+        else:
+            data = text.extract(page, "var pages = ", ";")[0]
+        return json.loads(data)
 
 
 class FoolslideMangaExtractor(FoolslideExtractor, MangaExtractor):
diff --git a/gallery_dl/extractor/gomanga.py b/gallery_dl/extractor/gomanga.py
index 172c14a6..0e547a74 100644
--- a/gallery_dl/extractor/gomanga.py
+++ b/gallery_dl/extractor/gomanga.py
@@ -25,7 +25,7 @@ class GomangaChapterExtractor(foolslide.FoolslideChapterExtractor):
             "keyword": "a355cd3197e70c24b84d3885e8a5ff0ac22537bf",
         }),
     ]
-    single = False
+    method = "double"
 
 
 class GomangaMangaExtractor(foolslide.FoolslideMangaExtractor):
@@ -36,4 +36,3 @@ class GomangaMangaExtractor(foolslide.FoolslideMangaExtractor):
         "url": "bd1c82d70838d54140a8209296e789f27ceab7cd",
         "keyword": "fb1fd14548602dbe4f6e70a633429762972c1d5d",
     })]
-    single = False
diff --git a/gallery_dl/extractor/jaiminisbox.py b/gallery_dl/extractor/jaiminisbox.py
index ee33bf99..e25b260e 100644
--- a/gallery_dl/extractor/jaiminisbox.py
+++ b/gallery_dl/extractor/jaiminisbox.py
@@ -23,6 +23,7 @@ class JaiminisboxChapterExtractor(foolslide.FoolslideChapterExtractor):
             "keyword": "faa77b1f6ff462cd5e01511ab55b8c2d6ec42c3e",
         }),
     ]
+    method = "base64"
 
 
 class JaiminisboxMangaExtractor(foolslide.FoolslideMangaExtractor):