[vimeo:album] Impove _VALID_URL
authorSergey M․ <dstftw@gmail.com>
Wed, 22 Jun 2016 18:56:58 +0000 (01:56 +0700)
committerSergey M․ <dstftw@gmail.com>
Wed, 22 Jun 2016 18:56:58 +0000 (01:56 +0700)
youtube_dl/extractor/vimeo.py

index 26a3d993114d5cc1ec72a75a22ae97eb79ba96b9..8ba3f55f4738bbf19b49fd13ab6ad22e3b71a707 100644 (file)
@@ -706,7 +706,7 @@ class VimeoUserIE(VimeoChannelIE):
 
 class VimeoAlbumIE(VimeoChannelIE):
     IE_NAME = 'vimeo:album'
-    _VALID_URL = r'https://vimeo\.com/album/(?P<id>\d+)/?(?:$|[?#])'
+    _VALID_URL = r'https://vimeo\.com/album/(?P<id>\d+)(?:$|[?#]|/(?!video))'
     _TITLE_RE = r'<header id="page_header">\n\s*<h1>(.*?)</h1>'
     _TESTS = [{
         'url': 'https://vimeo.com/album/2632481',
@@ -726,6 +726,9 @@ class VimeoAlbumIE(VimeoChannelIE):
         'params': {
             'videopassword': 'youtube-dl',
         }
+    }, {
+        'url': 'https://vimeo.com/album/2632481/sort:plays/format:thumbnail',
+        'only_matching': True,
     }]
 
     def _page_url(self, base_url, pagenum):