mirrors/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-12-23 14:52:38 +00:00
Code Issues Projects Releases Wiki Activity

[extractor/generic] Remove generic id and title from wistia extractionand update tests

Browse Source
This commit is contained in:
Sergey M․ 2016-05-20 21:55:35 +06:00
parent 7ded6545ed
commit 6c114b1210
No known key found for this signature in database
GPG Key ID: 2C393E0F18A9236D
1 changed files with 14 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
youtube_dl/extractor/generic.py
View File

@ -717,15 +717,18 @@ class GenericIE(InfoExtractor):
}, },
# Wistia embed # Wistia embed
{ {
'url': 'http://education-portal.com/academy/lesson/north-american-exploration-failed-colonies-of-spain-france-england.html#lesson', 'url': 'http://study.com/academy/lesson/north-american-exploration-failed-colonies-of-spain-france-england.html#lesson',
'md5': '8788b683c777a5cf25621eaf286d0c23', 'md5': '1953f3a698ab51cfc948ed3992a0b7ff',
'info_dict': { 'info_dict': {
'id': '1cfaf6b7ea', 'id': '6e2wtrbdaf',
'ext': 'mov', 'ext': 'mov',
'title': 'md5:51364a8d3d009997ba99656004b5e20d', 'title': 'paywall_north-american-exploration-failed-colonies-of-spain-france-england',
'duration': 643.0, 'description': 'a Paywall Videos video from Remilon',
'filesize': 182808282, 'duration': 644.072,
'uploader': 'education-portal.com', 'uploader': 'study.com',
'timestamp': 1459678540,
'upload_date': '20160403',
'filesize': 24687186,
}, },
}, },
{ {
@ -734,12 +737,12 @@ class GenericIE(InfoExtractor):
'info_dict': { 'info_dict': {
'id': 'uxjb0lwrcz', 'id': 'uxjb0lwrcz',
'ext': 'mp4', 'ext': 'mp4',
'title': 'Conversation about Hexagonal Rails Part 1 - ThoughtWorks', 'title': 'Conversation about Hexagonal Rails Part 1',
'description': 'a Martin Fowler video from ThoughtWorks', 'description': 'a Martin Fowler video from ThoughtWorks',
'duration': 1715.0, 'duration': 1715.0,
'uploader': 'thoughtworks.wistia.com', 'uploader': 'thoughtworks.wistia.com',
'upload_date': '20140603',
'timestamp': 1401832161, 'timestamp': 1401832161,
'upload_date': '20140603',
}, },
}, },
# Wistia standard embed (async) # Wistia standard embed (async)
@ -751,8 +754,8 @@ class GenericIE(InfoExtractor):
'title': 'Drip Brennan Dunn Workshop', 'title': 'Drip Brennan Dunn Workshop',
'description': 'a JV Webinars video from getdrip-1', 'description': 'a JV Webinars video from getdrip-1',
'duration': 4986.95, 'duration': 4986.95,
'upload_date': '20160518',
'timestamp': 1463607249, 'timestamp': 1463607249,
'upload_date': '20160518',
}, },
'params': { 'params': {
'skip_download': True, 'skip_download': True,
@ -1564,19 +1567,15 @@ class GenericIE(InfoExtractor):
'url': embed_url, 'url': embed_url,
'ie_key': 'Wistia', 'ie_key': 'Wistia',
'uploader': video_uploader, 'uploader': video_uploader,
'title': video_title,
'id': video_id,
} }
match = re.search(r'(?:id=["\']wistia_|data-wistia-?id=["\']|Wistia\.embed\(["\'])(?P<id>[^"\']+)', webpage) match = re.search(r'(?:id=["\']wistia_|data-wistia-?id=["\']|Wistia\.embed\(["\'])(?P<id>[^"\']+)', webpage)
if match: if match:
return { return {
'_type': 'url_transparent', '_type': 'url_transparent',
'url': 'http://fast.wistia.net/embed/iframe/{0:}'.format(match.group('id')), 'url': 'wistia:%s' % match.group('id'),
'ie_key': 'Wistia', 'ie_key': 'Wistia',
'uploader': video_uploader, 'uploader': video_uploader,
'title': video_title,
'id': match.group('id')
} }
match = re.search( match = re.search(