projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8f3b539
)
[thoughtworks] wistia support added
author
dinesh
<dsdiscoverdinesh@gmail.com>
Thu, 23 Oct 2014 14:57:13 +0000
(20:27 +0530)
committer
dinesh
<dsdiscoverdinesh@gmail.com>
Thu, 23 Oct 2014 14:58:39 +0000
(20:28 +0530)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 9057a6beb97a0d0cc2fca33d1d0ccc30c07b8101..877447381b3bff9568ea8c68e8faea76c4b3d5f5 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-380,6
+380,16
@@
class GenericIE(InfoExtractor):
'uploader': 'education-portal.com',
},
},
'uploader': 'education-portal.com',
},
},
+ {
+ 'url': 'http://thoughtworks.wistia.com/medias/uxjb0lwrcz',
+ 'md5': 'baf49c2baa8a7de5f3fc145a8506dcd4',
+ 'info_dict': {
+ 'id': 'uxjb0lwrcz',
+ 'ext': 'mp4',
+ 'title': 'Conversation about Hexagonal Rails Part 1',
+ 'duration': 1715.0,
+ },
+ },
]
def report_following_redirect(self, new_url):
]
def report_following_redirect(self, new_url):
@@
-651,6
+661,10
@@
class GenericIE(InfoExtractor):
playlists, lambda p: '//dailymotion.com/playlist/%s' % p)
# Look for embedded Wistia player
playlists, lambda p: '//dailymotion.com/playlist/%s' % p)
# Look for embedded Wistia player
+ mobj = re.search(r'<meta content=(["\'])(?P<url>https?://fast\.wistia\.net/embed/iframe/(?P<id>[a-zA-Z0-9_]+)(["\']))', webpage)
+ if mobj:
+ return self.url_result(mobj.group('url'), 'Wistia')
+
match = re.search(
r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:fast\.)?wistia\.net/embed/iframe/.+?)\1', webpage)
if match:
match = re.search(
r'<iframe[^>]+?src=(["\'])(?P<url>(?:https?:)?//(?:fast\.)?wistia\.net/embed/iframe/.+?)\1', webpage)
if match:
@@
-664,6
+678,7
@@
class GenericIE(InfoExtractor):
'title': video_title,
'id': video_id,
}
'title': video_title,
'id': video_id,
}
+
match = re.search(r'(?:id=["\']wistia_|data-wistia-?id=["\']|Wistia\.embed\(["\'])(?P<id>[^"\']+)', webpage)
if match:
return {
match = re.search(r'(?:id=["\']wistia_|data-wistia-?id=["\']|Wistia\.embed\(["\'])(?P<id>[^"\']+)', webpage)
if match:
return {