github-com-ytdl-org/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-01-07 17:16:08 +00:00
Code Issues Releases Wiki Activity

[cliphunter] Fix extraction (Closes #7796)

Browse source
This commit is contained in:
Sergey M․ 2015-12-08 21:56:00 +06:00
parent b09c122373
commit 39fa4cc107
1 changed files with 19 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

41
youtube_dl/extractor/cliphunter.py
View file

@ -1,7 +1,7 @@
from __future__ import unicode_literals from __future__ import unicode_literals
from .common import InfoExtractor from .common import InfoExtractor
from ..utils import determine_ext from ..utils import int_or_none
_translation_table = { _translation_table = {
@ -42,31 +42,26 @@ class CliphunterIE(InfoExtractor):
video_title = self._search_regex( video_title = self._search_regex(
r'mediaTitle = "([^"]+)"', webpage, 'title') r'mediaTitle = "([^"]+)"', webpage, 'title')
fmts = {} gexo_files = self._parse_json(
for fmt in ('mp4', 'flv'): self._search_regex(
fmt_list = self._parse_json(self._search_regex( r'var\s+gexoFiles\s*=\s*({.+?});', webpage, 'gexo files'),
r'var %sjson\s*=\s*(\[.*?\]);' % fmt, webpage, '%s formats' % fmt), video_id) video_id)
for f in fmt_list:
fmts[f['fname']] = _decode(f['sUrl'])
qualities = self._parse_json(self._search_regex(
r'var player_btns\s*=\s*(.*?);\n', webpage, 'quality info'), video_id)
formats = [] formats = []
for fname, url in fmts.items(): for format_id, f in gexo_files.items():
f = { video_url = f.get('url')
'url': url, if not video_url:
} continue
if fname in qualities: fmt = f.get('fmt')
qual = qualities[fname] height = f.get('h')
f.update({ format_id = '%s_%sp' % (fmt, height) if fmt and height else format_id
'format_id': '%s_%sp' % (determine_ext(url), qual['h']), formats.append({
'width': qual['w'], 'url': _decode(video_url),
'height': qual['h'], 'format_id': format_id,
'tbr': qual['br'], 'width': int_or_none(f.get('w')),
'height': int_or_none(height),
'tbr': int_or_none(f.get('br')),
}) })
formats.append(f)
self._sort_formats(formats) self._sort_formats(formats)
thumbnail = self._search_regex( thumbnail = self._search_regex(