New upstream version 1.15.0.upstream/1.15.0

1 files changed, 1 insertions, 65 deletions

diff --git a/gallery_dl/extractor/foolslide.py b/gallery_dl/extractor/foolslide.py
index e624a65..0ab42db 100644
--- a/gallery_dl/extractor/foolslide.py
+++ b/gallery_dl/extractor/foolslide.py
@@ -17,9 +17,7 @@ from .common import (
     generate_extractors,
 )
 from .. import text, util
-import base64
 import json
-import re
 
 
 class FoolslideBase(SharedConfigMixin):
@@ -83,25 +81,7 @@ class FoolslideChapterExtractor(FoolslideBase, ChapterExtractor):
         })
 
     def images(self, page):
-        data = None
-
-        if self.decode == "base64":
-            pos = page.find("'fromCharCode'")
-            if pos >= 0:
-                blob = text.extract(page, "'", "'", pos+15)[0]
-                base64_data = re.sub(r"[a-zA-Z]", _decode_jaiminisbox, blob)
-            else:
-                base64_data = text.extract(page, 'atob("', '"')[0]
-            if base64_data:
-                data = base64.b64decode(base64_data.encode()).decode()
-        elif self.decode == "double":
-            pos = page.find("[{")
-            if pos >= 0:
-                data = text.extract(page, " = ", ";", pos)[0]
-
-        if not data:
-            data = text.extract(page, "var pages = ", ";")[0]
-        return json.loads(data)
+        return json.loads(text.extract(page, "var pages = ", ";")[0])
 
 
 class FoolslideMangaExtractor(FoolslideBase, MangaExtractor):
@@ -126,16 +106,6 @@ class FoolslideMangaExtractor(FoolslideBase, MangaExtractor):
             })))
 
 
-def _decode_jaiminisbox(match):
-    c = match.group(0)
-
-    # ord("Z") == 90, ord("z") == 122
-    N = 90 if c <= "Z" else 122
-    C = ord(c) + 13
-
-    return chr(C if N >= C else (C - 26))
-
-
 EXTRACTORS = {
     "dokireader": {
         "root": "https://kobato.hologfx.com/reader",
@@ -151,19 +121,6 @@ EXTRACTORS = {
                 "keyword": "614d89a6045b85c822cbd3e67578ea7577dfc995",
             }),
     },
-    "jaiminisbox": {
-        "root": "https://jaiminisbox.com/reader",
-        "pattern": r"(?:www\.)?jaiminisbox\.com/reader",
-        "extra": {"decode": "base64"},
-        "test-chapter":
-            ("https://jaiminisbox.com/reader/read/oshi-no-ko/en/0/1/", {
-                "keyword": "d6435cfc1522293a42517a4aadda95a8631da0b3",
-            }),
-        "test-manga":
-            ("https://jaiminisbox.com/reader/series/oshi-no-ko/", {
-                "count": ">= 10",
-            }),
-    },
     "kireicake": {
         "root": "https://reader.kireicake.com",
         "test-chapter":
@@ -220,27 +177,6 @@ EXTRACTORS = {
                 "keyword": "562fb5a7362a4cb43d59d5c8a6ea8080fc65cf99",
             }),
     },
-    "worldthree": {
-        "root": "http://www.slide.world-three.org",
-        "pattern": r"(?:www\.)?slide\.world-three\.org",
-        "test-chapter": (
-            (("http://www.slide.world-three.org"
-              "/read/black_bullet/en/2/7/page/1"), {
-                "url": "be2f04f6e2d311b35188094cfd3e768583271584",
-                "keyword": "967d536a65de4d52478d5b666a1760b181eddb6e",
-            }),
-            (("http://www.slide.world-three.org"
-              "/read/idolmster_cg_shuffle/en/0/4/2/"), {
-                "url": "6028ea5ca282744f925dfad92eeb98509f9cc78c",
-                "keyword": "f3cfe2ad3388991f1d045c85d0fa94795a7694dc",
-            }),
-        ),
-        "test-manga":
-            ("http://www.slide.world-three.org/series/black_bullet/", {
-                "url": "5743b93512d26e6b540d90a7a5d69208b6d4a738",
-                "keyword": "3a24f1088b4d7f3b798a96163f21ca251293a120",
-            }),
-    },
     "_ckey": "chapterclass",
 }