aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPhilipp Hagemeister <phihag@phihag.de>2014-01-07 07:13:42 +0100
committerPhilipp Hagemeister <phihag@phihag.de>2014-01-07 07:13:47 +0100
commit48a203467179b93e382a2ca08f4ccd13bc7d486e (patch)
tree03f71fcba8f5b072a27968967122770ddf1136a3
parenta9ce0c631eccd7c2f84d23b50bb478493ff0338c (diff)
[vimeo] Fix playlist URL matching
-rw-r--r--test/test_all_urls.py2
-rw-r--r--youtube_dl/extractor/vimeo.py2
2 files changed, 3 insertions, 1 deletions
diff --git a/test/test_all_urls.py b/test/test_all_urls.py
index bd77b7c30..75547f42a 100644
--- a/test/test_all_urls.py
+++ b/test/test_all_urls.py
@@ -113,6 +113,8 @@ class TestAllURLsMatching(unittest.TestCase):
def test_vimeo_matching(self):
self.assertMatch('http://vimeo.com/channels/tributes', ['vimeo:channel'])
self.assertMatch('http://vimeo.com/user7108434', ['vimeo:user'])
+ self.assertMatch('http://vimeo.com/user7108434/videos', ['vimeo:user'])
+ self.assertMatch('https://vimeo.com/user21297594/review/75524534/3c257a1b5d', ['vimeo:review'])
# https://github.com/rg3/youtube-dl/issues/1930
def test_soundcloud_not_matching_sets(self):
diff --git a/youtube_dl/extractor/vimeo.py b/youtube_dl/extractor/vimeo.py
index ad86d033a..81c495d1e 100644
--- a/youtube_dl/extractor/vimeo.py
+++ b/youtube_dl/extractor/vimeo.py
@@ -318,7 +318,7 @@ class VimeoChannelIE(InfoExtractor):
class VimeoUserIE(VimeoChannelIE):
IE_NAME = 'vimeo:user'
- _VALID_URL = r'(?:https?://)?vimeo.\com/(?P<name>[^/]+)(?:[#?]|$)'
+ _VALID_URL = r'(?:https?://)?vimeo.\com/(?P<name>[^/]+)(?:/videos|[#?]|$)'
_TITLE_RE = r'<a[^>]+?class="user">([^<>]+?)</a>'
@classmethod