depau/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-26 12:11:52 +00:00
Code Issues Releases Wiki Activity

[generic] Abort if user passes in URL "url" (#2942)

Browse source
This commit is contained in:
Philipp Hagemeister 2014-05-19 17:10:11 +02:00
parent 89bb8e97ee
commit 0e67ab0d8e
1 changed files with 7 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/generic.py
View file

@ -363,8 +363,13 @@ class GenericIE(InfoExtractor):
return self.url_result('http://' + url) return self.url_result('http://' + url)
else: else:
if default_search == 'auto_warning': if default_search == 'auto_warning':
self._downloader.report_warning( if re.match(r'^(?:url|URL)$', url):
'Falling back to youtube search for %s . Set --default-search to "auto" to suppress this warning.' % url) raise ExtractorError(
'Invalid URL: %r . Call youtube-dl like this: youtube-dl -v "https://www.youtube.com/watch?v=BaW_jenozKc" ' % url,
expected=True)
else:
self._downloader.report_warning(
'Falling back to youtube search for %s . Set --default-search to "auto" to suppress this warning.' % url)
return self.url_result('ytsearch:' + url) return self.url_result('ytsearch:' + url)
else: else:
assert ':' in default_search assert ':' in default_search