projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
a0a8191
)
[groupon] Add support for Youtube embeds (Closes #9508)
author
Sergey M․
<dstftw@gmail.com>
Sun, 15 May 2016 18:30:13 +0000
(
00:30
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Sun, 15 May 2016 18:30:13 +0000
(
00:30
+0600)
youtube_dl/extractor/groupon.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/groupon.py
b/youtube_dl/extractor/groupon.py
index f6b69662baf547aa48a9bdf460671f072bd59884..1dd0a81cca13a8a44e5e25e2245cce9563399b70 100644
(file)
--- a/
youtube_dl/extractor/groupon.py
+++ b/
youtube_dl/extractor/groupon.py
@@
-4,7
+4,7
@@
from .common import InfoExtractor
class GrouponIE(InfoExtractor):
class GrouponIE(InfoExtractor):
- _VALID_URL = r'https?://
www\.groupon\.com/deals/(?P<id>[^?#
]+)'
+ _VALID_URL = r'https?://
(?:www\.)?groupon\.com/deals/(?P<id>[^/?#&
]+)'
_TEST = {
'url': 'https://www.groupon.com/deals/bikram-yoga-huntington-beach-2#ooid=tubGNycTo_9Uxg82uESj4i61EYX8nyuf',
_TEST = {
'url': 'https://www.groupon.com/deals/bikram-yoga-huntington-beach-2#ooid=tubGNycTo_9Uxg82uESj4i61EYX8nyuf',
@@
-15,18
+15,26
@@
class GrouponIE(InfoExtractor):
},
'playlist': [{
'info_dict': {
},
'playlist': [{
'info_dict': {
- 'id': '
tubGNycTo_9Uxg82uESj4i61EYX8nyuf
',
- 'ext': '
flv
',
- 'title': 'Bikram Yoga Huntington Beach | Orange County',
+ 'id': '
fk6OhWpXgIQ
',
+ 'ext': '
mp4
',
+ 'title': 'Bikram Yoga Huntington Beach | Orange County
!tubGNycTo@9Uxg82uESj4i61EYX8nyuf
',
'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
'description': 'md5:d41d8cd98f00b204e9800998ecf8427e',
- 'duration': 44.961,
+ 'duration': 45,
+ 'upload_date': '20160405',
+ 'uploader_id': 'groupon',
+ 'uploader': 'Groupon',
},
}],
'params': {
},
}],
'params': {
- 'skip_download':
'HDS'
,
+ 'skip_download':
True
,
}
}
}
}
+ _PROVIDERS = {
+ 'ooyala': ('ooyala:%s', 'Ooyala'),
+ 'youtube': ('%s', 'Youtube'),
+ }
+
def _real_extract(self, url):
playlist_id = self._match_id(url)
webpage = self._download_webpage(url, playlist_id)
def _real_extract(self, url):
playlist_id = self._match_id(url)
webpage = self._download_webpage(url, playlist_id)
@@
-36,12
+44,17
@@
class GrouponIE(InfoExtractor):
videos = payload['carousel'].get('dealVideos', [])
entries = []
for v in videos:
videos = payload['carousel'].get('dealVideos', [])
entries = []
for v in videos:
- if v.get('provider') != 'OOYALA':
+ provider = v.get('provider')
+ video_id = v.get('media') or v.get('id') or v.get('baseURL')
+ if not provider or not video_id:
+ continue
+ url_pattern, ie_key = self._PROVIDERS.get(provider.lower())
+ if not url_pattern:
self.report_warning(
'%s: Unsupported video provider %s, skipping video' %
self.report_warning(
'%s: Unsupported video provider %s, skipping video' %
- (playlist_id,
v.get('provider')
))
+ (playlist_id,
provider
))
continue
continue
- entries.append(self.url_result(
'ooyala:%s' % v['media']
))
+ entries.append(self.url_result(
url_pattern % video_id, ie_key
))
return {
'_type': 'playlist',
return {
'_type': 'playlist',