Mirrors
/
youtube-dl
mirror of https://github.com/ytdl-org/youtube-dl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[tele5] Improve extraction (closes #7805, closes #7922, closes #17331, closes #17414)

This commit is contained in:
Sergey M․ 2018-09-08 16:04:39 +07:00
parent d0de6a287a
commit ae2384ff5f
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 22 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
youtube_dl/extractor/tele5.py
View File

@ -1,38 +1,43 @@
# coding: utf-8 # coding: utf-8
from __future__ import unicode_literals from __future__ import unicode_literals
import re
from .common import InfoExtractor from .common import InfoExtractor
from .nexx import NexxIE from .nexx import NexxIE
from ..compat import compat_urlparse
class Tele5IE(InfoExtractor): class Tele5IE(InfoExtractor):
_VALID_URL = r'https://www\.tele5\.de/(?:mediathek/filme-online/videos\?vid=|tv/)(?P<display_id>[\w-]+)' _VALID_URL = r'https?://(?:www\.)?tele5\.de/(?:mediathek|tv)/(?P<id>[^?#&]+)'
_TESTS = [{ _TESTS = [{
'url': 'https://www.tele5.de/mediathek/filme-online/videos?vid=1550589', 'url': 'https://www.tele5.de/mediathek/filme-online/videos?vid=1549416',
'info_dict': { 'info_dict': {
'id': '1550589', 'id': '1549416',
'ext': 'mp4', 'ext': 'mp4',
'upload_date': '20180822', 'upload_date': '20180814',
'timestamp': 1534927316, 'timestamp': 1534290623,
'title': 'SchleFaZ: Atomic Shark', 'title': 'Pandorum',
} },
'params': {
'skip_download': True,
},
}, {
'url': 'https://www.tele5.de/tv/kalkofes-mattscheibe/video-clips/politik-und-gesellschaft?ve_id=1551191',
'only_matching': True,
}, { }, {
'url': 'https://www.tele5.de/tv/dark-matter/videos', 'url': 'https://www.tele5.de/tv/dark-matter/videos',
'only_matching': True, 'only_matching': True,
}] }]
def _real_extract(self, url): def _real_extract(self, url):
mobj = re.match(self._VALID_URL, url) qs = compat_urlparse.parse_qs(compat_urlparse.urlparse(url).query)
display_id = mobj.group('display_id') video_id = (qs.get('vid') or qs.get('ve_id') or [None])[0]
webpage = self._download_webpage(url, display_id) if not video_id:
display_id = self._match_id(url)
video_id = self._html_search_regex( webpage = self._download_webpage(url, display_id)
r'id\s*=\s*["\']video-player["\']\s*data-id\s*=\s*["\']([0-9]+)["\']', video_id = self._html_search_regex(
webpage, 'video_id') r'id\s*=\s*["\']video-player["\'][^>]+data-id\s*=\s*["\'](\d+)',
webpage, 'video id')
return self.url_result( return self.url_result(
'https://api.nexx.cloud/v3/759/videos/byid/%s' % video_id, 'https://api.nexx.cloud/v3/759/videos/byid/%s' % video_id,