projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
c0f9969
)
[GenericIE] Outsource embedded blip.tv player video id extraction to BlipTVIE and...
author
rzhxeo
<rzhxeot7z81b4700@mailcatch.com>
Mon, 30 Dec 2013 05:15:02 +0000
(06:15 +0100)
committer
rzhxeo
<rzhxeot7z81b4700@mailcatch.com>
Mon, 30 Dec 2013 05:15:02 +0000
(06:15 +0100)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index 7a14c98f9b6ef9d550606c72c330d0730ec1233e..f1b152f623e1b1361a9bbfdb9475f1264969bd3b 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-271,16
+271,12
@@
class GenericIE(InfoExtractor):
}
# Look for embedded blip.tv player
}
# Look for embedded blip.tv player
- mobj = re.search(r'<meta\s[^>]*https?://api
.blip
.tv/\w+/redirect/\w+/(\d+)', webpage)
+ mobj = re.search(r'<meta\s[^>]*https?://api
\.blip\
.tv/\w+/redirect/\w+/(\d+)', webpage)
if mobj:
if mobj:
- return self.url_result('http://blip.tv/
seo/
-'+mobj.group(1), 'BlipTV')
- mobj = re.search(r'<(?:iframe|embed|object)\s[^>]*
https?://(?:\w+\.)?blip.tv/(?:play/|api\.swf#)(
[a-zA-Z0-9]+)', webpage)
+ return self.url_result('http://blip.tv/
a/a
-'+mobj.group(1), 'BlipTV')
+ mobj = re.search(r'<(?:iframe|embed|object)\s[^>]*
(https?://(?:\w+\.)?blip\.tv/(?:play/|api\.swf#)
[a-zA-Z0-9]+)', webpage)
if mobj:
if mobj:
- player_url = 'http://blip.tv/play/%s.x?p=1' % mobj.group(1)
- player_page = self._download_webpage(player_url, mobj.group(1))
- blip_video_id = self._search_regex(r'data-episode-id="(\d+)', player_page, u'blip_video_id', fatal=False)
- if blip_video_id:
- return self.url_result('http://blip.tv/seo/-'+blip_video_id, 'BlipTV')
+ return self.url_result(mobj.group(1), 'BlipTV')
# Look for Bandcamp pages with custom domain
mobj = re.search(r'<meta property="og:url"[^>]*?content="(.*?bandcamp\.com.*?)"', webpage)
# Look for Bandcamp pages with custom domain
mobj = re.search(r'<meta property="og:url"[^>]*?content="(.*?bandcamp\.com.*?)"', webpage)