merged from develop
This commit is contained in:
@@ -1,10 +1,9 @@
|
||||
# -*- coding: utf-8 -*-
|
||||
|
||||
import re
|
||||
|
||||
from core import logger
|
||||
from core import scrapertools
|
||||
from core import httptools
|
||||
from core import scrapertools
|
||||
from platformcode import logger
|
||||
|
||||
|
||||
def get_video_url(page_url, premium=False, user="", password="", video_password=""):
|
||||
logger.info("(page_url='%s')" % page_url)
|
||||
@@ -16,14 +15,14 @@ def get_video_url(page_url, premium=False, user="", password="", video_password=
|
||||
if not page_url.endswith("/config"):
|
||||
page_url = scrapertools.find_single_match(page_url, ".*?video/[0-9]+")
|
||||
|
||||
data = httptools.downloadpage(page_url, headers = headers).data
|
||||
patron = 'mime":"([^"]+)"'
|
||||
data = httptools.downloadpage(page_url, headers=headers).data
|
||||
patron = 'mime":"([^"]+)"'
|
||||
patron += '.*?url":"([^"]+)"'
|
||||
patron += '.*?quality":"([^"]+)"'
|
||||
match = scrapertools.find_multiple_matches(data, patron)
|
||||
for mime, media_url, calidad in match:
|
||||
title = "%s (%s) [vimeo]" % (mime.replace("video/", "."), calidad)
|
||||
video_urls.append([title, media_url, int(calidad.replace("p",""))])
|
||||
video_urls.append([title, media_url, int(calidad.replace("p", ""))])
|
||||
|
||||
video_urls.sort(key=lambda x: x[2])
|
||||
for video_url in video_urls:
|
||||
|
||||
Reference in New Issue
Block a user