aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorcoletdjnz <colethedj@protonmail.com>2021-08-30 09:34:39 +1200
committerGitHub <noreply@github.com>2021-08-29 21:34:39 +0000
commit9a292a620cf239ad70b5fdfe6976d17a36de14b0 (patch)
tree42b5bf6fcf1344e3b8f96e13b285a33fc97249dc
parent7e558722866a0bdccaffceea8d1aa79db7dbd78f (diff)
downloadhypervideo-pre-9a292a620cf239ad70b5fdfe6976d17a36de14b0.tar.lz
hypervideo-pre-9a292a620cf239ad70b5fdfe6976d17a36de14b0.tar.xz
hypervideo-pre-9a292a620cf239ad70b5fdfe6976d17a36de14b0.zip
[ATV.at] Fix extractor for ATV.at (#816)
Authored-by: NeroBurner, coletdjnz Fixes https://github.com/ytdl-org/youtube-dl/issues/29079
-rw-r--r--yt_dlp/extractor/atvat.py83
1 files changed, 41 insertions, 42 deletions
diff --git a/yt_dlp/extractor/atvat.py b/yt_dlp/extractor/atvat.py
index 95e572d70..bfcf88f1a 100644
--- a/yt_dlp/extractor/atvat.py
+++ b/yt_dlp/extractor/atvat.py
@@ -4,6 +4,7 @@ from __future__ import unicode_literals
from .common import InfoExtractor
from ..utils import (
determine_ext,
+ dict_get,
int_or_none,
unescapeHTML,
)
@@ -12,64 +13,62 @@ from ..utils import (
class ATVAtIE(InfoExtractor):
_VALID_URL = r'https?://(?:www\.)?atv\.at/(?:[^/]+/){2}(?P<id>[dv]\d+)'
_TESTS = [{
- 'url': 'http://atv.at/aktuell/di-210317-2005-uhr/v1698449/',
- 'md5': 'c3b6b975fb3150fc628572939df205f2',
+ 'url': 'https://www.atv.at/bauer-sucht-frau-die-zweite-chance/folge-1/d3390693/',
+ 'md5': 'c471605591009dfb6e6c54f7e62e2807',
'info_dict': {
- 'id': '1698447',
+ 'id': '3390684',
'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,
}]
+ def _process_source_entry(self, source, part_id):
+ source_url = source.get('url')
+ if not source_url:
+ return
+ if determine_ext(source_url) == 'm3u8':
+ return self._extract_m3u8_formats(
+ source_url, part_id, 'mp4', 'm3u8_native',
+ m3u8_id='hls', fatal=False)
+ else:
+ return [{
+ 'url': source_url,
+ }]
+
+ def _process_entry(self, entry):
+ part_id = entry.get('id')
+ if not part_id:
+ return
+ formats = []
+ for source in entry.get('sources', []):
+ formats.extend(self._process_source_entry(source, part_id) or [])
+
+ self._sort_formats(formats)
+ return {
+ 'id': part_id,
+ 'title': entry.get('title'),
+ 'duration': int_or_none(entry.get('duration')),
+ 'formats': formats
+ }
+
def _real_extract(self, url):
display_id = self._match_id(url)
webpage = self._download_webpage(url, display_id)
video_data = self._parse_json(unescapeHTML(self._search_regex(
- [r'flashPlayerOptions\s*=\s*(["\'])(?P<json>(?:(?!\1).)+)\1',
- r'class="[^"]*jsb_video/FlashPlayer[^"]*"[^>]+data-jsb="(?P<json>[^"]+)"'],
+ r'var\splaylist\s*=\s*(?P<json>\[.*\]);',
webpage, 'player data', group='json')),
- display_id)['config']['initial_video']
-
- video_id = video_data['id']
- video_title = video_data['title']
-
- parts = []
- for part in video_data.get('parts', []):
- part_id = part['id']
- part_title = part['title']
-
- formats = []
- for source in part.get('sources', []):
- source_url = source.get('src')
- if not source_url:
- continue
- ext = determine_ext(source_url)
- if ext == 'm3u8':
- formats.extend(self._extract_m3u8_formats(
- source_url, part_id, 'mp4', 'm3u8_native',
- m3u8_id='hls', fatal=False))
- else:
- formats.append({
- 'format_id': source.get('delivery'),
- 'url': source_url,
- })
- self._sort_formats(formats)
+ display_id)
- parts.append({
- '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,
- })
+ first_video = video_data[0]
+ video_id = first_video['id']
+ video_title = dict_get(first_video, ('tvShowTitle', 'title'))
return {
'_type': 'multi_video',
'id': video_id,
'title': video_title,
- 'entries': parts,
+ 'entries': (self._process_entry(entry) for entry in video_data),
}