fix per speedvideo
This commit is contained in:
@@ -53,6 +53,8 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
|
|||||||
from lib import unshortenit
|
from lib import unshortenit
|
||||||
data, status = unshortenit.unshorten(url)
|
data, status = unshortenit.unshorten(url)
|
||||||
logger.info("Data - Status zcrypt linkup : [%s] [%s] " %(data, status))
|
logger.info("Data - Status zcrypt linkup : [%s] [%s] " %(data, status))
|
||||||
|
if '/speedx/' in data: # aggiunto per server speedvideo
|
||||||
|
data = data.replace('http://linkup.pro/speedx', 'http://speedvideo.net')
|
||||||
# fix by greko fine
|
# fix by greko fine
|
||||||
else:
|
else:
|
||||||
data = ""
|
data = ""
|
||||||
|
|||||||
@@ -5,8 +5,8 @@
|
|||||||
"patterns": [
|
"patterns": [
|
||||||
{
|
{
|
||||||
"pattern": "speedvideo.net/(?:embed-|)([A-Z0-9a-z]+)",
|
"pattern": "speedvideo.net/(?:embed-|)([A-Z0-9a-z]+)",
|
||||||
"url": "http://speedvideo.net/embed-\\1.html"
|
"url": "https:\/\/speedvideo.net\/embed-\\1.html"
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"free": true,
|
"free": true,
|
||||||
@@ -38,4 +38,4 @@
|
|||||||
"visible": false
|
"visible": false
|
||||||
}
|
}
|
||||||
]
|
]
|
||||||
}
|
}
|
||||||
|
|||||||
+12
-10
@@ -1,9 +1,9 @@
|
|||||||
# -*- coding: utf-8 -*-
|
# -*- coding: utf-8 -*-
|
||||||
|
##
|
||||||
|
|
||||||
from core import httptools, scrapertools
|
from core import httptools, scrapertools
|
||||||
from platformcode import config, logger
|
from platformcode import config, logger
|
||||||
|
|
||||||
|
|
||||||
def test_video_exists(page_url):
|
def test_video_exists(page_url):
|
||||||
logger.info("(page_url='%s')" % page_url)
|
logger.info("(page_url='%s')" % page_url)
|
||||||
|
|
||||||
@@ -14,23 +14,25 @@ def test_video_exists(page_url):
|
|||||||
|
|
||||||
return True, ""
|
return True, ""
|
||||||
|
|
||||||
|
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
|
||||||
def get_video_url(page_url,
|
|
||||||
premium=False,
|
|
||||||
user="",
|
|
||||||
password="",
|
|
||||||
video_password=""):
|
|
||||||
logger.info("url=" + page_url)
|
logger.info("url=" + page_url)
|
||||||
video_urls = []
|
video_urls = []
|
||||||
|
|
||||||
data = httptools.downloadpage(page_url).data
|
data = httptools.downloadpage(page_url).data
|
||||||
|
|
||||||
media_urls = scrapertools.find_multiple_matches(data, r"file:[^']'([^']+)',\s*label:[^\"]\"([^\"]+)\"")
|
media_urls = scrapertools.find_multiple_matches(data, r"file:[^']'([^']+)',\s*label:[^\"]\"([^\"]+)\"")
|
||||||
|
logger.info("speed video - media urls: %s " % media_urls)
|
||||||
for media_url, label in media_urls:
|
for media_url, label in media_urls:
|
||||||
media_url = httptools.downloadpage(media_url, only_headers=True, follow_redirects=False).headers.get("location", "")
|
media_url = httptools.downloadpage(media_url, only_headers=True, follow_redirects=False).headers.get("location", "")
|
||||||
|
|
||||||
if media_url:
|
if media_url:
|
||||||
video_urls.append([label + " " + media_url.rsplit('.', 1)[1] + ' [speedvideo]', media_url])
|
video_urls.append([label + " " + media_url.rsplit('.', 1)[1] + ' [speedvideo]', media_url])
|
||||||
|
logger.info("speed video - media urls: %s " % video_urls)
|
||||||
return video_urls
|
return video_urls
|
||||||
|
|
||||||
|
|
||||||
|
##,
|
||||||
|
## {
|
||||||
|
## "pattern": "speedvideo.net/([A-Z0-9a-z]+)",
|
||||||
|
## "url": "https:\/\/speedvideo.net\/\\1"
|
||||||
|
## }
|
||||||
|
|||||||
Reference in New Issue
Block a user