projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
4af98ec
)
[vk] Fix extraction (Closes #5987)
author
Sergey M․
<dstftw@gmail.com>
Mon, 15 Jun 2015 14:46:10 +0000
(20:46 +0600)
committer
Sergey M․
<dstftw@gmail.com>
Mon, 15 Jun 2015 14:46:10 +0000
(20:46 +0600)
youtube_dl/extractor/vk.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vk.py
b/youtube_dl/extractor/vk.py
index d0e772108fe875100a8c2ceaec961814de0ab0e6..6aeba109dc515392f8fcf0c680594c48c39dff80 100644
(file)
--- a/
youtube_dl/extractor/vk.py
+++ b/
youtube_dl/extractor/vk.py
@@
-175,16
+175,16
@@
class VKIE(InfoExtractor):
m_rutube.group(1).replace('\\', ''))
return self.url_result(rutube_url)
m_rutube.group(1).replace('\\', ''))
return self.url_result(rutube_url)
- m_opts = re.search(r'(?s)var\s+opts\s*=\s*({.
*
?});', info_page)
+ m_opts = re.search(r'(?s)var\s+opts\s*=\s*({.
+
?});', info_page)
if m_opts:
if m_opts:
- m_opts_url = re.search(r"url\s*:\s*'([^']+)", m_opts.group(1))
+ m_opts_url = re.search(r"url\s*:\s*'(
(?!/\b)
[^']+)", m_opts.group(1))
if m_opts_url:
opts_url = m_opts_url.group(1)
if opts_url.startswith('//'):
opts_url = 'http:' + opts_url
return self.url_result(opts_url)
if m_opts_url:
opts_url = m_opts_url.group(1)
if opts_url.startswith('//'):
opts_url = 'http:' + opts_url
return self.url_result(opts_url)
- data_json = self._search_regex(r'var
vars = ({.*
?});', info_page, 'vars')
+ data_json = self._search_regex(r'var
\s+vars\s*=\s*({.+
?});', info_page, 'vars')
data = json.loads(data_json)
# Extract upload date
data = json.loads(data_json)
# Extract upload date