paradizelost/youtube-dl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[ATV.at] Fix extractor for ATV.at

Browse Source 
Fixes: https://github.com/ytdl-org/youtube-dl/issues/29079
This commit is contained in:
Reinhold Gschweicher 2021-05-19 23:15:07 +02:00
parent dfbbe2902f
commit 156c58b07f
1 changed files with 41 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
youtube_dl/extractor/atvat.py
View File

@ -12,15 +12,15 @@ from ..utils import (
class ATVAtIE(InfoExtractor): class ATVAtIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?atv\.at/(?:[^/]+/){2}(?P<id>[dv]\d+)' _VALID_URL = r'https?://(?:www\.)?atv\.at/(?:[^/]+/){2}(?P<id>[dv]\d+)'
_TESTS = [{ _TESTS = [{
'url': 'http://atv.at/aktuell/di-210317-2005-uhr/v1698449/', 'url': 'https://www.atv.at/bauer-sucht-frau-die-zweite-chance/folge-1/d3390693/',
'md5': 'c3b6b975fb3150fc628572939df205f2', 'md5': 'c471605591009dfb6e6c54f7e62e2807',
'info_dict': { 'info_dict': {
'id': '1698447', 'id': '3390684',
'ext': 'mp4', 'ext': 'mp4',
'title': 'DI, 21.03.17 | 20:05 Uhr 1/1', 'title': 'Bauer sucht Frau - Die zweite Chance Folge 1',
} }
}, { }, {
'url': 'http://atv.at/aktuell/meinrad-knapp/d8416/', 'url': 'https://www.atv.at/bauer-sucht-frau-staffel-17/fuenfte-eventfolge/d3339537/',
'only_matching': True, 'only_matching': True,
}] }]
@ -28,48 +28,52 @@ class ATVAtIE(InfoExtractor):
display_id = self._match_id(url) display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id) webpage = self._download_webpage(url, display_id)
video_data = self._parse_json(unescapeHTML(self._search_regex( video_data = self._parse_json(unescapeHTML(self._search_regex(
[r'flashPlayerOptions\s*=\s*(["\'])(?P<json>(?:(?!\1).)+)\1', r'var\splaylist\s*=\s*(?P<json>\[.*\]);',
r'class="[^"]*jsb_video/FlashPlayer[^"]*"[^>]+data-jsb="(?P<json>[^"]+)"'],
webpage, 'player data', group='json')), webpage, 'player data', group='json')),
display_id)['config']['initial_video'] display_id)
video_id = video_data['id'] first_video = video_data[0]
video_title = video_data['title'] video_id = first_video['id']
video_title = first_video.get('tvShowTitle', first_video['title'])
parts = [] def process_source_entry(self, source, part_id):
for part in video_data.get('parts', []): source_url = source.get('url')
part_id = part['id'] if not source_url:
part_title = part['title'] return None
ext = determine_ext(source_url)
if ext == 'm3u8':
return self._extract_m3u8_formats(
source_url, part_id, 'mp4', 'm3u8_native',
m3u8_id='hls', fatal=False)
else:
return {
'url': source_url,
}
formats = [] def process_entry(self, entry):
for source in part.get('sources', []): part_id = entry['id']
source_url = source.get('src') formats = [process_source_entry(self, source, part_id) for source in entry["sources"]]
if not source_url: formats_flat = []
for f in formats:
if f is None:
continue continue
ext = determine_ext(source_url) elif type(f) is list:
if ext == 'm3u8': formats_flat.extend(f)
formats.extend(self._extract_m3u8_formats(
source_url, part_id, 'mp4', 'm3u8_native',
m3u8_id='hls', fatal=False))
else: else:
formats.append({ formats_flat.append(f)
'format_id': source.get('delivery'), self._sort_formats(formats_flat)
'url': source_url, return {
}) 'id': entry['id'],
self._sort_formats(formats) 'title': entry['title'],
'duration': int_or_none(entry.get('duration')),
'formats': formats_flat
}
parts.append({ entries = [process_entry(self, entry) for entry in video_data]
'id': part_id,
'title': part_title,
'thumbnail': part.get('preview_image_url'),
'duration': int_or_none(part.get('duration')),
'is_live': part.get('is_livestream'),
'formats': formats,
})
return { return {
'_type': 'multi_video', '_type': 'multi_video',
'id': video_id, 'id': video_id,
'title': video_title, 'title': video_title,
'entries': parts, 'entries': entries,
} }