Fix regex

This commit is contained in:
t1254362
2018-04-27 21:45:38 +02:00
parent bc34fec50f
commit 7de3711614
+2 -2
View File
@@ -65,7 +65,7 @@ def links(item):
logger.info() logger.info()
data = httptools.downloadpage(item.url).data data = httptools.downloadpage(item.url).data
reExpr = "<img\s+src=['\"](?P<img>[^'\"]+)[^>]+title[^'\"]*['\"](?P<title>[^\"]+)[^>]+id[^'\"]*['\"](?P<id>[^'\"]+)[^>]*>(?:[^<]*<[^>]+>(?P<quality>[^<]+)<)?[^<]*<[^>]*duration[^>]*>(?P<duration>[^<]+)" reExpr = "<img\s+src=['\"](?P<img>[^'\"]+)[^>]+(?:title|alt)[^'\"]*['\"](?P<title>[^\"]+)[^>]+id[^'\"]*['\"](?P<id>[^'\"]+)[^>]*>(?:[^<]*<[^>]+>(?P<quality>[^<]+)<)?[^<]*<[^>]*duration[^>]*>(?P<duration>[^<]+)"
reResults = re.findall(reExpr, data, re.MULTILINE | re.DOTALL) reResults = re.findall(reExpr, data, re.MULTILINE | re.DOTALL)
result = [] result = []
@@ -95,6 +95,6 @@ def links(item):
def play(item): def play(item):
logger.info(item) logger.info(item)
embededURL = urljoin(item.url, "/e/%s/width-650/height-400/autoplay-0/" % (item.vID)) embededURL = urljoin(item.url, "/view/%s" % (item.vID))
itemlist = servertools.find_video_items(item.clone(url = embededURL)) itemlist = servertools.find_video_items(item.clone(url = embededURL))
return itemlist return itemlist