]> git.bitcoin.ninja Git - youtube-dl/commitdiff
[youtube] Do not recognize attribution link as user (Fixes #1573)
authorPhilipp Hagemeister <phihag@phihag.de>
Wed, 9 Oct 2013 21:50:38 +0000 (23:50 +0200)
committerPhilipp Hagemeister <phihag@phihag.de>
Wed, 9 Oct 2013 21:50:38 +0000 (23:50 +0200)
youtube_dl/extractor/youtube.py

index a7c5145134084cd81776ca01d2ee58a7119f0e05..8222a880f55f7a27afe94e2aad5db570342650d9 100644 (file)
@@ -1635,7 +1635,7 @@ class YoutubeChannelIE(InfoExtractor):
 
 class YoutubeUserIE(InfoExtractor):
     IE_DESC = u'YouTube.com user videos (URL or "ytuser" keyword)'
-    _VALID_URL = r'(?:(?:(?:https?://)?(?:\w+\.)?youtube\.com/(?:user/)?(?!watch(?:$|[^a-z_A-Z0-9-])))|ytuser:)(?!feed/)([A-Za-z0-9_-]+)'
+    _VALID_URL = r'(?:(?:(?:https?://)?(?:\w+\.)?youtube\.com/(?:user/)?(?!(?:attribution_link|watch)(?:$|[^a-z_A-Z0-9-])))|ytuser:)(?!feed/)([A-Za-z0-9_-]+)'
     _TEMPLATE_URL = 'http://gdata.youtube.com/feeds/api/users/%s'
     _GDATA_PAGE_SIZE = 50
     _GDATA_URL = 'http://gdata.youtube.com/feeds/api/users/%s/uploads?max-results=%d&start-index=%d&alt=json'