|
|
@ -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', |
|
|
|