aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/dailymotion.py
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-01-19 21:20:14 +0600
committerSergey M․ <dstftw@gmail.com>2016-01-19 21:20:14 +0600
commit9fbd0822aa9bccb319446e6d75a76ab4f23ddf46 (patch)
tree0b338a2773152172e305258addc3de51b1b03a6a /youtube_dl/extractor/dailymotion.py
parente323cf3ff37b1268f585b66159de20bd8ffe8dc0 (diff)
downloadyoutube-dl-9fbd0822aa9bccb319446e6d75a76ab4f23ddf46.zip
youtube-dl-9fbd0822aa9bccb319446e6d75a76ab4f23ddf46.tar.gz
youtube-dl-9fbd0822aa9bccb319446e6d75a76ab4f23ddf46.tar.bz2
[dailymotion] Extend _VALID_URL
Diffstat (limited to 'youtube_dl/extractor/dailymotion.py')
-rw-r--r--youtube_dl/extractor/dailymotion.py8
1 files changed, 6 insertions, 2 deletions
diff --git a/youtube_dl/extractor/dailymotion.py b/youtube_dl/extractor/dailymotion.py
index b687ec4..6e462af 100644
--- a/youtube_dl/extractor/dailymotion.py
+++ b/youtube_dl/extractor/dailymotion.py
@@ -37,7 +37,7 @@ class DailymotionBaseInfoExtractor(InfoExtractor):
class DailymotionIE(DailymotionBaseInfoExtractor):
- _VALID_URL = r'(?i)(?:https?://)?(?:(www|touch)\.)?dailymotion\.[a-z]{2,3}/(?:(embed|#)/)?video/(?P<id>[^/?_]+)'
+ _VALID_URL = r'(?i)(?:https?://)?(?:(www|touch)\.)?dailymotion\.[a-z]{2,3}/(?:(?:embed|swf|#)/)?video/(?P<id>[^/?_]+)'
IE_NAME = 'dailymotion'
_FORMATS = [
@@ -104,6 +104,10 @@ class DailymotionIE(DailymotionBaseInfoExtractor):
{
'url': 'http://www.dailymotion.com/video/x20su5f_the-power-of-nightmares-1-the-rise-of-the-politics-of-fear-bbc-2004_news',
'only_matching': True,
+ },
+ {
+ 'url': 'http://www.dailymotion.com/swf/video/x3n92nf',
+ 'only_matching': True,
}
]
@@ -336,7 +340,7 @@ class DailymotionPlaylistIE(DailymotionBaseInfoExtractor):
class DailymotionUserIE(DailymotionPlaylistIE):
IE_NAME = 'dailymotion:user'
- _VALID_URL = r'https?://(?:www\.)?dailymotion\.[a-z]{2,3}/(?!(?:embed|#|video|playlist)/)(?:(?:old/)?user/)?(?P<user>[^/]+)'
+ _VALID_URL = r'https?://(?:www\.)?dailymotion\.[a-z]{2,3}/(?!(?:embed|swf|#|video|playlist)/)(?:(?:old/)?user/)?(?P<user>[^/]+)'
_PAGE_TEMPLATE = 'http://www.dailymotion.com/user/%s/%s'
_TESTS = [{
'url': 'https://www.dailymotion.com/user/nqtv',