projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
1a2fbe3
)
[vk] Add support for dailymotion embeds
author
Kacper Michajłow
<kasper93@gmail.com>
Sun, 25 Sep 2016 03:39:29 +0000
(
05:39
+0200)
committer
Sergey M․
<dstftw@gmail.com>
Tue, 27 Sep 2016 14:58:14 +0000
(21:58 +0700)
Fixes #10661
youtube_dl/extractor/vk.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vk.py
b/youtube_dl/extractor/vk.py
index cd22df25a2623e63ccbdabe791e2c497ac09c656..f26e0732c2b0693456acec3e9fb2390b36016d97 100644
(file)
--- a/
youtube_dl/extractor/vk.py
+++ b/
youtube_dl/extractor/vk.py
@@
-23,8
+23,9
@@
from ..utils import (
unified_strdate,
urlencode_postdata,
)
unified_strdate,
urlencode_postdata,
)
-from .
vimeo import Vimeo
IE
+from .
dailymotion import Dailymotion
IE
from .pladform import PladformIE
from .pladform import PladformIE
+from .vimeo import VimeoIE
class VKBaseIE(InfoExtractor):
class VKBaseIE(InfoExtractor):
@@
-210,6
+211,23
@@
class VKIE(VKBaseIE):
'view_count': int,
},
},
'view_count': int,
},
},
+ {
+ # dailymotion embed
+ 'url': 'https://vk.com/video-37468416_456239855',
+ 'info_dict': {
+ 'id': 'k3lz2cmXyRuJQSjGHUv',
+ 'ext': 'mp4',
+ 'title': 'md5:d52606645c20b0ddbb21655adaa4f56f',
+ 'description': 'md5:c651358f03c56f1150b555c26d90a0fd',
+ 'uploader': 'AniLibria.Tv',
+ 'upload_date': '20160914',
+ 'uploader_id': 'x1p5vl5',
+ 'timestamp': 1473877246,
+ },
+ 'params': {
+ 'skip_download': True,
+ }
+ },
{
# video key is extra_data not url\d+
'url': 'http://vk.com/video-110305615_171782105',
{
# video key is extra_data not url\d+
'url': 'http://vk.com/video-110305615_171782105',
@@
-315,6
+333,10
@@
class VKIE(VKBaseIE):
m_rutube.group(1).replace('\\', ''))
return self.url_result(rutube_url)
m_rutube.group(1).replace('\\', ''))
return self.url_result(rutube_url)
+ dailymotion_urls = DailymotionIE._extract_urls(info_page)
+ if dailymotion_urls:
+ return self.url_result(dailymotion_urls[0], DailymotionIE.ie_key())
+
m_opts = re.search(r'(?s)var\s+opts\s*=\s*({.+?});', info_page)
if m_opts:
m_opts_url = re.search(r"url\s*:\s*'((?!/\b)[^']+)", m_opts.group(1))
m_opts = re.search(r'(?s)var\s+opts\s*=\s*({.+?});', info_page)
if m_opts:
m_opts_url = re.search(r"url\s*:\s*'((?!/\b)[^']+)", m_opts.group(1))