projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
66e568d
)
[infoq] Fix extraction (closes #6141)
author
Yen Chi Hsuan
<yan12125@gmail.com>
Fri, 3 Jul 2015 03:53:37 +0000
(11:53 +0800)
committer
Yen Chi Hsuan
<yan12125@gmail.com>
Fri, 3 Jul 2015 03:54:36 +0000
(11:54 +0800)
youtube_dl/extractor/infoq.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/infoq.py
b/youtube_dl/extractor/infoq.py
index 117a7faf6b83417166e73d3a7331a85fc71a5604..91a1b3ccb70d41027d7ecfa41f1b606ead8f056a 100644
(file)
--- a/
youtube_dl/extractor/infoq.py
+++ b/
youtube_dl/extractor/infoq.py
@@
-5,6
+5,7
@@
import base64
from .common import InfoExtractor
from ..compat import (
compat_urllib_parse,
from .common import InfoExtractor
from ..compat import (
compat_urllib_parse,
+ compat_urlparse,
)
)
@@
-45,7
+46,7
@@
class InfoQIE(InfoExtractor):
video_id, extension = video_filename.split('.')
http_base = self._search_regex(
video_id, extension = video_filename.split('.')
http_base = self._search_regex(
- r'EXPRESSINSTALL_SWF\s*=\s*
"(https?:
//[^/"]+/)', webpage,
+ r'EXPRESSINSTALL_SWF\s*=\s*
[^"]*"((?:https?:)?
//[^/"]+/)', webpage,
'HTTP base URL')
formats = [{
'HTTP base URL')
formats = [{
@@
-55,7
+56,7
@@
class InfoQIE(InfoExtractor):
'play_path': playpath,
}, {
'format_id': 'http',
'play_path': playpath,
}, {
'format_id': 'http',
- 'url':
http_base
+ real_id,
+ 'url':
compat_urlparse.urljoin(url, http_base)
+ real_id,
}]
self._sort_formats(formats)
}]
self._sort_formats(formats)