Date: Mon, 22 Jan 2018 12:12:20 -0500
Subject: [PATCH 13/14] fixed
---
plugin.video.alfa/channels/pelisgratis.py | 5 +-
plugin.video.alfa/channels/plusdede.py | 8 +-
plugin.video.alfa/servers/openload.py | 238 ++++++++++++----------
plugin.video.alfa/servers/powvideo.py | 74 ++++---
plugin.video.alfa/servers/streamplay.py | 85 ++++----
5 files changed, 217 insertions(+), 193 deletions(-)
diff --git a/plugin.video.alfa/channels/pelisgratis.py b/plugin.video.alfa/channels/pelisgratis.py
index 4426a861..7b0036b5 100755
--- a/plugin.video.alfa/channels/pelisgratis.py
+++ b/plugin.video.alfa/channels/pelisgratis.py
@@ -135,9 +135,8 @@ def lista(item):
logger.info()
itemlist = []
data = get_source(item.url)
- patron = 'class=(?:MvTbImg|TPostMv).*?href=(.*?)\/(?:>| class).*?src=(.*?) class=attachment.*?'
- patron += '(?:strong|class=Title)>(.*?)<.*?(?:| (.*?)<.*?'
- patron += '(?: | (.*?)<(?:\/td|\/p)>'
+ patron = 'class=(?:MvTbImg|TPostMv).*?href=(.*?)\/(?:>| class).*?src=(.*?) '
+ patron += 'class=Title>(.*?)<.*?(?: | (.*?)<.*?(?: | (.*?)<(?:\/td|\/p)>'
matches = re.compile(patron, re.DOTALL).findall(data)
for scrapedurl, scrapedthumbnail, scrapedtitle, scrapedyear, scrapedplot in matches:
diff --git a/plugin.video.alfa/channels/plusdede.py b/plugin.video.alfa/channels/plusdede.py
index 4334ea4a..b3380d66 100644
--- a/plugin.video.alfa/channels/plusdede.py
+++ b/plugin.video.alfa/channels/plusdede.py
@@ -34,7 +34,7 @@ def login():
config.get_setting("plusdedeuser", "plusdede")) + "&password=" + str(
config.get_setting("plusdedepassword", "plusdede")) + "&app=2131296469"
url = "https://www.plusdede.com/"
- headers = {"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+ headers = {"User-Agent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/61.0.3163.100 Safari/537.36","Referer": url, "X-Requested-With": "XMLHttpRequest", "X-CSRF-TOKEN": token}
data = httptools.downloadpage("https://www.plusdede.com/login", post=post, headers=headers,
replace_headers=False).data
@@ -772,13 +772,13 @@ def checkseen(item):
if item.tipo == "8":
url_temp = "https://www.plusdede.com/set/episode/" + item.data_id + "/seen"
tipo_str = "series"
- headers = {"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+ headers = {"User-Agent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/61.0.3163.100 Safari/537.36", "Referer": "https://www.plusdede.com/serie/",
"X-Requested-With": "XMLHttpRequest", "X-CSRF-TOKEN": item.token}
else:
url_temp = "https://www.plusdede.com/set/usermedia/" + item.tipo + "/" + item.data_id + "/seen"
tipo_str = "pelis"
- headers = {"User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+ headers = {"User-Agent": "Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/61.0.3163.100 Safari/537.36", "Referer": "https://www.plusdede.com/serie/",
"X-Requested-With": "XMLHttpRequest", "X-CSRF-TOKEN": item.token}
data = httptools.downloadpage(url_temp, post="id=" + item.idtemp, headers=headers, replace_headers=True).data
@@ -931,7 +931,7 @@ def plusdede_check(item):
tipo_str = "listas"
else:
tipo_str = "pelis"
- headers = {"User-Agent":"Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) "
+ headers = {"User-Agent":"Mozilla/5.0 AppleWebKit/537.36 (KHTML, like Gecko) "
"Chrome/61.0.3163.100 Safari/537.36","Referer": "https://www.plusdede.com/" + tipo_str, "X-Requested-With": "XMLHttpRequest",
"X-CSRF-TOKEN": item.token}
data = httptools.downloadpage(url_temp, post="id=" + item.idtemp, headers=headers,
diff --git a/plugin.video.alfa/servers/openload.py b/plugin.video.alfa/servers/openload.py
index 692f57c3..452355f6 100644
--- a/plugin.video.alfa/servers/openload.py
+++ b/plugin.video.alfa/servers/openload.py
@@ -3,9 +3,7 @@
from core import httptools
from core import scrapertools
from platformcode import config, logger
-
-headers = {'User-Agent': 'Mozilla/5.0 (Windows NT 10.0; WOW64; rv:51.0) Gecko/20100101 Firefox/51.0'}
-
+from core import jsontools
def test_video_exists(page_url):
logger.info("(page_url='%s')" % page_url)
@@ -22,132 +20,154 @@ def test_video_exists(page_url):
return True, ""
-
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
- logger.info("url=" + page_url)
- video_urls = []
+ logger.info()
+ itemlist = []
+
+ data = httptools.downloadpage(page_url, cookies=False).data
+
- header = {}
- if "|" in page_url:
- page_url, referer = page_url.split("|", 1)
- header = {'Referer': referer}
- data = httptools.downloadpage(page_url, headers=header, cookies=False).data
subtitle = scrapertools.find_single_match(data, ' |