Akkariin/youtube-dl
1
0
Fork 0
mirror of https://github.com/l1ving/youtube-dl synced 2025-03-11 03:37:23 +08:00
Code Issues Releases Wiki Activity

[alphaporno] Fix test errors

Browse Source 
This also allows selection of different formats when available
This commit is contained in:
Jiří Paleček 2018-05-30 15:14:51 +02:00
parent 9d082e7cb8
commit 4de58cdf6d
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
youtube_dl/extractor/alphaporno.py
View File

@ -1,11 +1,14 @@
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import ( from ..utils import (
parse_iso8601, parse_iso8601,
parse_duration, parse_duration,
parse_filesize, parse_filesize,
int_or_none, int_or_none,
js_to_json,
) )
@ -35,11 +38,21 @@ class AlphaPornoIE(InfoExtractor):
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
video_id = self._search_regex( video_id = re.sub(r'^https?://.*/embed/', '', self._html_search_meta('embedUrl', webpage, 'video id'))
r"video_id\s*:\s*'([^']+)'", webpage, 'video id', default=None)
sources = self._parse_json(
self._search_regex(r'sources\s*:\s*(\[[^\]]*\])', webpage, 'source data'), video_id,
transform_source=js_to_json
)
formats = []
for s in sources:
video_url = s['file']
formats.append({
'url': video_url,
'height': int_or_none(re.sub('^(\d+)[pi].*', r'\1', s.get('label') or ''))
})
video_url = self._search_regex(
r"video_url\s*:\s*'([^']+)'", webpage, 'video url')
ext = self._html_search_meta( ext = self._html_search_meta(
'encodingFormat', webpage, 'ext', default='.mp4')[1:] 'encodingFormat', webpage, 'ext', default='.mp4')[1:]
@ -64,7 +77,6 @@ class AlphaPornoIE(InfoExtractor):
return { return {
'id': video_id, 'id': video_id,
'display_id': display_id, 'display_id': display_id,
'url': video_url,
'ext': ext, 'ext': ext,
'title': title, 'title': title,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
@ -74,4 +86,5 @@ class AlphaPornoIE(InfoExtractor):
'tbr': bitrate, 'tbr': bitrate,
'categories': categories, 'categories': categories,
'age_limit': age_limit, 'age_limit': age_limit,
'formats': formats,
} }