rebase servers

2020-03-06 20:50:52 +01:00
parent a2c4aeb93b
commit 2ecdf23042
193 changed files with 5798 additions and 509 deletions
@@ -4,7 +4,6 @@
 # --------------------------------------------------------

 from core import httptools
-from core import jsontools
 from core import scrapertools
 from platformcode import logger

@@ -22,10 +21,10 @@ def get_video_url(page_url, user="", password="", video_password=""):
    video_urls = []
    id = scrapertools.find_single_match("v/(\w+)", page_url)
    post = "r=&d=videobb.ru"
-    data = httptools.downloadpage(page_url, post=post).data
-    data = jsontools.load(data)["data"]
-    for url in data:
-        video_urls.append([url["label"] + "p [videobb]", url["file"]])
-    logger.info("Intel11 %s" %data)
+    headers = {"x-requested-with":"XMLHttpRequest"}
+    data = httptools.downloadpage(page_url, post=post, headers=headers).json
+    for url in data["data"]:
+        video_urls.append([url["label"] + " [videobb]", url["file"]])
+    #logger.info("Intel11 %s" %data)

    return video_urls