From 681072504c9cd9094ab3ed95bc16373de96d364a Mon Sep 17 00:00:00 2001 From: sgerwk Date: Thu, 10 Oct 2019 18:51:08 +0200 Subject: [PATCH] [la7] fix extractor --- youtube_dl/extractor/la7.py | 17 +++++++++++------ 1 file changed, 11 insertions(+), 6 deletions(-) diff --git a/youtube_dl/extractor/la7.py b/youtube_dl/extractor/la7.py index da5a5de4a..33ddb3032 100644 --- a/youtube_dl/extractor/la7.py +++ b/youtube_dl/extractor/la7.py @@ -4,7 +4,6 @@ from __future__ import unicode_literals from .common import InfoExtractor from ..utils import ( js_to_json, - smuggle_url, ) @@ -49,14 +48,20 @@ class LA7IE(InfoExtractor): webpage = self._download_webpage(url, video_id) player_data = self._parse_json( - self._search_regex(r'videoLa7\(({[^;]+})\);', webpage, 'player data'), + self._search_regex( + [r'(?s)videoParams\s*=\s*({.+?});', r'videoLa7\(({[^;]+})\);'], + webpage, 'player data'), video_id, transform_source=js_to_json) + url = player_data['src']['m3u8'] + url = url.replace('http://la7-vh.akamaihd.net/i/', + 'https://vodpkg.iltrovatore.it/local/dash/') + url = url.replace('csmil/master.m3u8', 'urlset/manifest.mpd') + + formats = self._extract_mpd_formats(url, video_id) + return { - '_type': 'url_transparent', - 'url': smuggle_url('kaltura:103:%s' % player_data['vid'], { - 'service_url': 'http://kdam.iltrovatore.it', - }), + 'formats': formats, 'id': video_id, 'title': player_data['title'], 'description': self._og_search_description(webpage, default=None),