xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-27 06:10:38 +01:00
Code Issues Packages Projects Releases Wiki Activity

[ccc] Improve extraction (closes #14601, closes #20355)

Browse Source
This commit is contained in:
Sergey M․ 2019-04-28 23:05:36 +07:00
parent 24510bdcfa
commit f916abc0ac
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 13 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
youtube_dl/extractor/ccc.py
View File

@ -6,6 +6,7 @@ from ..utils import (
int_or_none, int_or_none,
parse_iso8601, parse_iso8601,
try_get, try_get,
url_or_none,
) )
@ -30,16 +31,7 @@ class CCCIE(InfoExtractor):
} }
}, { }, {
'url': 'https://media.ccc.de/v/32c3-7368-shopshifting#download', 'url': 'https://media.ccc.de/v/32c3-7368-shopshifting#download',
'info_dict': { 'only_matching': True,
'id': '2835',
'ext': 'mp4',
'title': 'Shopshifting',
'creator': 'Karsten Nohl, Fabian Bräunlein, dexter',
'description': 'md5:0fade0535e9dc3076d0cbda4958a18eb',
'upload_date': '20151227',
'timestamp': 1451249100,
'tags': list,
}
}] }]
def _real_extract(self, url): def _real_extract(self, url):
@ -104,12 +96,16 @@ class CCCPlaylistIE(InfoExtractor):
}] }]
def _real_extract(self, url): def _real_extract(self, url):
acronym = self._match_id(url).lower() playlist_id = self._match_id(url).lower()
conf = self._download_json('https://media.ccc.de/public/conferences/' + acronym, acronym) conf = self._download_json(
'https://media.ccc.de/public/conferences/' + playlist_id,
playlist_id)
return self.playlist_result( entries = []
[self.url_result(event['frontend_link']) for event in conf['events']], for e in conf['events']:
acronym, event_url = url_or_none(e.get('frontend_link'))
conf['title'], if event_url:
) entries.append(self.url_result(event_url, ie=CCCIE.ie_key()))
return self.playlist_result(entries, playlist_id, conf.get('title'))