Roxedus/ytdl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[aftonbladet] Fix extraction and update _VALID_URL (Fixes #5863)

Browse Source
This commit is contained in:
Naglis Jonaitis 2015-06-01 16:11:19 +03:00
parent 4053ee9104
commit 866b296d0f
1 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
youtube_dl/extractor/aftonbladet.py
View File

@ -6,11 +6,11 @@ from ..utils import int_or_none
class AftonbladetIE(InfoExtractor): class AftonbladetIE(InfoExtractor):
_VALID_URL = r'http://tv\.aftonbladet\.se/webbtv.+?(?P<id>article[0-9]+)\.ab(?:$|[?#])' _VALID_URL = r'http://tv\.aftonbladet\.se/abtv/articles/(?P<id>[0-9]+)'
_TEST = { _TEST = {
'url': 'http://tv.aftonbladet.se/webbtv/nyheter/vetenskap/rymden/article36015.ab', 'url': 'http://tv.aftonbladet.se/abtv/articles/36015',
'info_dict': { 'info_dict': {
'id': 'article36015', 'id': '36015',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Vulkanutbrott i rymden - nu släpper NASA bilderna', 'title': 'Vulkanutbrott i rymden - nu släpper NASA bilderna',
'description': 'Jupiters måne mest aktiv av alla himlakroppar', 'description': 'Jupiters måne mest aktiv av alla himlakroppar',
@ -25,8 +25,9 @@ class AftonbladetIE(InfoExtractor):
# find internal video meta data # find internal video meta data
meta_url = 'http://aftonbladet-play.drlib.aptoma.no/video/%s.json' meta_url = 'http://aftonbladet-play.drlib.aptoma.no/video/%s.json'
internal_meta_id = self._html_search_regex( player_config = self._parse_json(self._html_search_regex(
r'data-aptomaId="([\w\d]+)"', webpage, 'internal_meta_id') r'data-player-config="([^"]+)"', webpage, 'player config'), video_id)
internal_meta_id = player_config['videoId']
internal_meta_url = meta_url % internal_meta_id internal_meta_url = meta_url % internal_meta_id
internal_meta_json = self._download_json( internal_meta_json = self._download_json(
internal_meta_url, video_id, 'Downloading video meta data') internal_meta_url, video_id, 'Downloading video meta data')