R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Add support for disneynow.go.com

Browse Source
This commit is contained in:
Daniel Baerwalde 2018-08-17 12:39:44 -04:00 committed by GitHub
parent 0a74b45191
commit 3a169c8c0d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
youtube_dl/extractor/go.py
View File

@ -34,6 +34,10 @@ class GoIE(AdobePassIE):
'watchdisneyxd': { 'watchdisneyxd': {
'brand': '009', 'brand': '009',
'requestor_id': 'DisneyXD', 'requestor_id': 'DisneyXD',
},
'disneynow': {
'brand': '010',
'requestor_id': 'DisneyNow',
} }
} }
_VALID_URL = r'https?://(?:(?P<sub_domain>%s)\.)?go\.com/(?:(?:[^/]+/)*(?P<id>vdka\w+)|(?:[^/]+/)*(?P<display_id>[^/?#]+))' % '|'.join(_SITE_INFO.keys()) _VALID_URL = r'https?://(?:(?P<sub_domain>%s)\.)?go\.com/(?:(?:[^/]+/)*(?P<id>vdka\w+)|(?:[^/]+/)*(?P<display_id>[^/?#]+))' % '|'.join(_SITE_INFO.keys())
@ -92,7 +96,18 @@ class GoIE(AdobePassIE):
video['url'], 'Go', video.get('id'), video.get('title'))) video['url'], 'Go', video.get('id'), video.get('title')))
entries.reverse() entries.reverse()
return self.playlist_result(entries, show_id, show_title) return self.playlist_result(entries, show_id, show_title)
video_data = self._extract_videos(brand, video_id)[0] if sub_domain == 'disneynow':
for sub_domain in ['watchdisneychannel', 'watchdisneyjunior', 'watchdisneyxd']:
site_info = self._SITE_INFO[sub_domain]
brand = site_info['brand']
try:
video_data = self._extract_videos(brand, video_id)[0]
except IndexError:
continue
else:
break
else:
video_data = self._extract_videos(brand, video_id)[0]
video_id = video_data['id'] video_id = video_data['id']
title = video_data['title'] title = video_data['title']