jon1scr
/
yt-dlc
forked from minhngoc25a/yt-dlc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[clipfish] Fix extraction, minimize requests, get rid of drm hds, extract m3u8 and more metadata

This commit is contained in:
Sergey M․ 2015-08-08 01:10:41 +06:00
parent be612d9e0c
commit fd5d8270dc
1 changed files with 35 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

56
youtube_dl/extractor/clipfish.py
View File

@ -1,18 +1,19 @@
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 (
ExtractorError, determine_ext,
int_or_none, int_or_none,
js_to_json, js_to_json,
determine_ext, parse_iso8601,
remove_end,
) )
class ClipfishIE(InfoExtractor): class ClipfishIE(InfoExtractor):
IE_NAME = 'clipfish' _VALID_URL = r'https?://(?:www\.)?clipfish\.de/(?:[^/]+/)+video/(?P<id>[0-9]+)'
_VALID_URL = r'^https?://(?:www\.)?clipfish\.de/.*?/video/(?P<id>[0-9]+)/'
_TEST = { _TEST = {
'url': 'http://www.clipfish.de/special/game-trailer/video/3966754/fifa-14-e3-2013-trailer/', 'url': 'http://www.clipfish.de/special/game-trailer/video/3966754/fifa-14-e3-2013-trailer/',
'md5': '79bc922f3e8a9097b3d68a93780fd475', 'md5': '79bc922f3e8a9097b3d68a93780fd475',
@ -20,35 +21,48 @@ class ClipfishIE(InfoExtractor):
'id': '3966754', 'id': '3966754',
'ext': 'mp4', 'ext': 'mp4',
'title': 'FIFA 14 - E3 2013 Trailer', 'title': 'FIFA 14 - E3 2013 Trailer',
'timestamp': 1370938118,
'upload_date': '20130611',
'duration': 82, 'duration': 82,
} }
} }
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
webpage = self._download_webpage(url, video_id)
video_info = self._parse_json(
js_to_json(self._html_search_regex('var videoObject = ({[^}]+?})', webpage, 'videoObject')),
video_id
)
info_url = self._parse_json(
js_to_json(self._html_search_regex('var globalFlashvars = ({[^}]+?})', webpage, 'globalFlashvars')),
video_id
)['data']
doc = self._download_xml( webpage = self._download_webpage(url, video_id)
info_url, video_id, note='Downloading info page')
title = doc.find('title').text video_info = self._parse_json(
video_url = doc.find('filename').text js_to_json(self._html_search_regex(
thumbnail = doc.find('imageurl').text '(?s)videoObject\s*=\s*({.+?});', webpage, 'video object')),
duration = int_or_none(video_info['length']) video_id)
formats = [{'url': video_info['videourl']},{'url': video_url}]
formats = []
for video_url in re.findall(r'var\s+videourl\s*=\s*"([^"]+)"', webpage):
ext = determine_ext(video_url)
if ext == 'm3u8':
formats.append({
'url': video_url.replace('de.hls.fra.clipfish.de', 'hls.fra.clipfish.de'),
'ext': 'mp4',
'format_id': 'hls',
})
else:
formats.append({
'url': video_url,
'format_id': ext,
})
self._sort_formats(formats) self._sort_formats(formats)
title = remove_end(self._og_search_title(webpage), ' - Video')
thumbnail = self._og_search_thumbnail(webpage)
duration = int_or_none(video_info.get('length'))
timestamp = parse_iso8601(self._html_search_meta('uploadDate', webpage, 'upload date'))
return { return {
'id': video_id, 'id': video_id,
'title': title, 'title': title,
'formats': formats, 'formats': formats,
'thumbnail': thumbnail, 'thumbnail': thumbnail,
'duration': duration, 'duration': duration,
'timestamp': timestamp,
} }