github/yt-dlp
1
0
Fork 0
mirror of https://github.com/yt-dlp/yt-dlp.git synced 2024-11-21 20:46:36 -05:00
Code Issues Projects Releases Packages Wiki Activity

[extractor/philharmoniedeparis] Fix extractor (#4367)

Browse source 
Closes #4297
Authored by: sqrtNOT
This commit is contained in:
sqrtNOT 2022-07-17 10:59:56 +00:00 committed by GitHub
parent 129dfa5f45
commit 956f1cf805
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

39
yt_dlp/extractor/philharmoniedeparis.py
View file

@ -1,9 +1,6 @@
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_str from ..compat import compat_str
from ..utils import ( from ..utils import try_get
try_get,
urljoin,
)
class PhilharmonieDeParisIE(InfoExtractor): class PhilharmonieDeParisIE(InfoExtractor):
@ -12,27 +9,29 @@ class PhilharmonieDeParisIE(InfoExtractor):
https?:// https?://
(?: (?:
live\.philharmoniedeparis\.fr/(?:[Cc]oncert/|embed(?:app)?/|misc/Playlist\.ashx\?id=)| live\.philharmoniedeparis\.fr/(?:[Cc]oncert/|embed(?:app)?/|misc/Playlist\.ashx\?id=)|
pad\.philharmoniedeparis\.fr/doc/CIMU/ pad\.philharmoniedeparis\.fr/(?:doc/CIMU/|player\.aspx\?id=)|
philharmoniedeparis\.fr/fr/live/concert/|
otoplayer\.philharmoniedeparis\.fr/fr/embed/
) )
(?P<id>\d+) (?P<id>\d+)
''' '''
_TESTS = [{ _TESTS = [{
'url': 'http://pad.philharmoniedeparis.fr/doc/CIMU/1086697/jazz-a-la-villette-knower', 'url': 'https://philharmoniedeparis.fr/fr/live/concert/1129666-danses-symphoniques',
'md5': 'a0a4b195f544645073631cbec166a2c2', 'md5': '24bdb7e86c200c107680e1f7770330ae',
'info_dict': { 'info_dict': {
'id': '1086697', 'id': '1129666',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Jazz à la Villette : Knower', 'title': 'Danses symphoniques. Orchestre symphonique Divertimento - Zahia Ziouani. Bizet, de Falla, Stravinski, Moussorgski, Saint-Saëns',
}, },
}, { }, {
'url': 'http://live.philharmoniedeparis.fr/concert/1032066.html', 'url': 'https://philharmoniedeparis.fr/fr/live/concert/1032066-akademie-fur-alte-musik-berlin-rias-kammerchor-rene-jacobs-passion-selon-saint-jean-de-johann',
'info_dict': { 'info_dict': {
'id': '1032066', 'id': '1032066',
'title': 'md5:0a031b81807b3593cffa3c9a87a167a0', 'title': 'Akademie für alte Musik Berlin, Rias Kammerchor, René Jacobs : Passion selon saint Jean de Johann Sebastian Bach',
}, },
'playlist_mincount': 2, 'playlist_mincount': 2,
}, { }, {
'url': 'http://live.philharmoniedeparis.fr/Concert/1030324.html', 'url': 'https://philharmoniedeparis.fr/fr/live/concert/1030324-orchestre-philharmonique-de-radio-france-myung-whun-chung-renaud-capucon-pascal-dusapin-johannes',
'only_matching': True, 'only_matching': True,
}, { }, {
'url': 'http://live.philharmoniedeparis.fr/misc/Playlist.ashx?id=1030324&track=&lang=fr', 'url': 'http://live.philharmoniedeparis.fr/misc/Playlist.ashx?id=1030324&track=&lang=fr',
@ -41,16 +40,15 @@ class PhilharmonieDeParisIE(InfoExtractor):
'url': 'https://live.philharmoniedeparis.fr/embedapp/1098406/berlioz-fantastique-lelio-les-siecles-national-youth-choir-of.html?lang=fr-FR', 'url': 'https://live.philharmoniedeparis.fr/embedapp/1098406/berlioz-fantastique-lelio-les-siecles-national-youth-choir-of.html?lang=fr-FR',
'only_matching': True, 'only_matching': True,
}, { }, {
'url': 'https://live.philharmoniedeparis.fr/embed/1098406/berlioz-fantastique-lelio-les-siecles-national-youth-choir-of.html?lang=fr-FR', 'url': 'https://otoplayer.philharmoniedeparis.fr/fr/embed/1098406?lang=fr-FR',
'only_matching': True, 'only_matching': True,
}] }]
_LIVE_URL = 'https://live.philharmoniedeparis.fr'
def _real_extract(self, url): def _real_extract(self, url):
video_id = self._match_id(url) video_id = self._match_id(url)
config = self._download_json( config = self._download_json(
'%s/otoPlayer/config.ashx' % self._LIVE_URL, video_id, query={ 'https://otoplayer.philharmoniedeparis.fr/fr/config/%s.json' % video_id, video_id, query={
'id': video_id, 'id': video_id,
'lang': 'fr-FR', 'lang': 'fr-FR',
}) })
@ -72,9 +70,8 @@ def extract_entry(source):
if not format_url or format_url in format_urls: if not format_url or format_url in format_urls:
continue continue
format_urls.add(format_url) format_urls.add(format_url)
m3u8_url = urljoin(self._LIVE_URL, format_url)
formats.extend(self._extract_m3u8_formats( formats.extend(self._extract_m3u8_formats(
m3u8_url, video_id, 'mp4', entry_protocol='m3u8_native', format_url, video_id, 'mp4', entry_protocol='m3u8_native',
m3u8_id='hls', fatal=False)) m3u8_id='hls', fatal=False))
if not formats and not self.get_param('ignore_no_formats'): if not formats and not self.get_param('ignore_no_formats'):
return return
@ -82,21 +79,19 @@ def extract_entry(source):
return { return {
'title': title, 'title': title,
'formats': formats, 'formats': formats,
'thumbnail': files.get('thumbnail'),
} }
thumbnail = urljoin(self._LIVE_URL, config.get('image'))
info = extract_entry(config) info = extract_entry(config)
if info: if info:
info.update({ info.update({
'id': video_id, 'id': video_id,
'thumbnail': thumbnail,
}) })
return info return info
entries = [] entries = []
for num, chapter in enumerate(config['chapters'], start=1): for num, chapter in enumerate(config['chapters'], start=1):
entry = extract_entry(chapter) entry = extract_entry(chapter)
if entry is None:
continue
entry['id'] = '%s-%d' % (video_id, num) entry['id'] = '%s-%d' % (video_id, num)
entries.append(entry) entries.append(entry)