projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
52cffcb
)
[thoughtworks] wistia regex modified
author
dinesh
<dsdiscoverdinesh@gmail.com>
Thu, 23 Oct 2014 15:53:56 +0000
(21:23 +0530)
committer
dinesh
<dsdiscoverdinesh@gmail.com>
Thu, 23 Oct 2014 15:53:56 +0000
(21:23 +0530)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 877447381b3bff9568ea8c68e8faea76c4b3d5f5..bf957fa3fdc24ae84c17aa5ae313d9ca3be14395 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-386,8
+386,9
@@
class GenericIE(InfoExtractor):
'info_dict': {
'id': 'uxjb0lwrcz',
'ext': 'mp4',
'info_dict': {
'id': 'uxjb0lwrcz',
'ext': 'mp4',
- 'title': 'Conversation about Hexagonal Rails Part 1',
+ 'title': 'Conversation about Hexagonal Rails Part 1
- ThoughtWorks
',
'duration': 1715.0,
'duration': 1715.0,
+ 'uploader': 'thoughtworks.wistia.com',
},
},
]
},
},
]
@@
-661,12
+662,8
@@
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(
match = re.search(
- r'
<iframe[^>]+?src
=(["\'])(?P<url>(?:https?:)?//(?:fast\.)?wistia\.net/embed/iframe/.+?)\1', webpage)
+ r'
(?:<meta content|<iframe[^>]+?src)
=(["\'])(?P<url>(?:https?:)?//(?:fast\.)?wistia\.net/embed/iframe/.+?)\1', webpage)
if match:
embed_url = self._proto_relative_url(
unescapeHTML(match.group('url')))
if match:
embed_url = self._proto_relative_url(
unescapeHTML(match.group('url')))