WIP: www.sanka

comiccrawler/mods/sankaku_beta.py

@@ -8,64 +8,83 @@
 from ..error import SkipPageError
 from ..url import update_qs
 from ..grabber import grabhtml
+from ..session_manager import session_manager
+from ..util import get_cookie
 
-domain = ["beta.sankakucomplex.com"]
+domain = ["beta.sankakucomplex.com", "www.sankakucomplex.com"]
 name = "Sankaku Beta"
 noepfolder = True
 
 class ExpireError(Exception):
-	pass
+    pass
+
+def session_key(url):
+    r = urlparse(url)
+    if r.path.startswith("/post/keyset"):
+        return (r.scheme, r.netloc, "/post/keyset")
+
+def load_config():
+	s = session_manager.get("https://www.sankakucomplex.com/posts/keyset")
+	access_token = get_cookie(s.cookies, "accessToken", domain="www.sankakucomplex.com")
+	s.headers.update({
+		"Accept": "application/vnd.sankaku.api+json;v=2",
+		"Client-Type": "non-premium",
+		"Platform": "web-app",
+		"Api-Version": "2",
+		"Enable-New-Tag-Type": "true",
+		"Authorization": f'Bearer {access_token}'
+		})
 
 def get_query(url, name):
-	query = urlparse(url).query
-	return parse_qs(query)[name][0]
+    query = urlparse(url).query
+    return parse_qs(query)[name][0]
 
 def get_title(html, url):
-	return "[sankaku] {}".format(get_query(url, "tags"))
+    return "[sankaku] {}".format(get_query(url, "tags"))
 
 next_page_cache = {}
 
 def get_episodes(html, url):
-	if re.match(r"https://beta\.sankakucomplex\.com/\?", url):
-		next_page_cache[url] = update_qs("https://capi-v2.sankakucomplex.com/posts/keyset?lang=en&default_threshold=1&hide_posts_in_books=never&limit=40", {
-			"tags": get_query(url, "tags")
-		})
-		raise SkipPageError
-		
-	data = json.loads(html)
-	next = data["meta"]["next"]
-	# data_len_cache[url] = len(data)
-	eps = [
-		Episode(
-			str(e["id"]),
-			"https://beta.sankakucomplex.com/post/show/{}".format(e["id"]),
-			image=e["file_url"]
-		) for e in data["data"]
-	]
-	
-	if next:
-		next_page_cache[url] = update_qs(url, {
-			"next": next
-		})
-	
-	return eps[::-1]
+    if re.match(r"https://(beta|www)\.sankakucomplex\.com/", url):
+        next_page_cache[url] = update_qs("https://sankakuapi.com/posts/keyset?default_threshold=0&hide_posts_in_books=never&limit=40", {
+            "tags": get_query(url, "tags")
+            })
+        raise SkipPageError
+
+    data = json.loads(html)
+    next = data["meta"]["next"]
+    # data_len_cache[url] = len(data)
+    eps = [
+        Episode(
+            str(e["id"]),
+            "https://www.sankakucomplex.com/post/show/{}".format(e["id"]),
+            image=e["file_url"]
+            ) for e in data["data"]
+        ]
+
+    if next:
+        next_page_cache[url] = update_qs(url, {
+            "next": next
+            })
+
+    return eps[::-1]
 
 def get_images(html, url):
-	id = re.search("post/show/(\d+)", url).group(1)
-	data = grabhtml("https://capi-v2.sankakucomplex.com/posts?lang=english&page=1&limit=1&tags=id_range:{}".format(id))
-	data = json.loads(data)
-	return data[0]["file_url"]
-	
+    id = re.search("post/show/(\d+)", url).group(1)
+    data = grabhtml("https://capi-v2.sankakucomplex.com/posts?lang=english&page=1&limit=1&tags=id_range:{}".format(id))
+    data = json.loads(data)
+    return data[0]["file_url"]
+
 def get_next_page(html, url):
-	if url in next_page_cache:
-		return next_page_cache.pop(url)
-			
+    if url in next_page_cache:
+        return next_page_cache.pop(url)
+
 def redirecthandler(response, crawler):
-	if re.match(r"https://chan\.sankakucomplex\.com/.+\.(png|jpg)", response.url):
-		raise ExpireError
+    if re.match(r"https://chan\.sankakucomplex\.com/.+\.(png|jpg)", response.url):
+        raise ExpireError
 
 def errorhandler(err, crawler):
-	if isinstance(err, ExpireError):
-		crawler.ep.image = None
-		crawler.html = None
-		
+    if isinstance(err, ExpireError):
+        crawler.ep.image = None
+        crawler.html = None
+