From: Philipp Hagemeister Date: Wed, 9 Oct 2013 21:50:38 +0000 (+0200) Subject: [youtube] Do not recognize attribution link as user (Fixes #1573) X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=commitdiff_plain;h=57da92b7df21137fc7c02d467365ae2189e0baed;p=youtube-dl [youtube] Do not recognize attribution link as user (Fixes #1573) --- diff --git a/youtube_dl/extractor/youtube.py b/youtube_dl/extractor/youtube.py index a7c514513..8222a880f 100644 --- a/youtube_dl/extractor/youtube.py +++ b/youtube_dl/extractor/youtube.py @@ -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'