summary refs log tree commit diff
diff options
context:
space:
mode:
authordannycolligan <devnull@localhost>2009-04-07 08:21:27 -0700
committerRicardo Garcia <sarbalap+freshmeat@gmail.com>2010-10-31 11:24:08 +0100
commit257453b92bf07920814ce68620ee8fe0949fb6de (patch)
tree6cdeea17ffe9d81faac41f7df69bfd25b72f5764
parentfd9288c315b10f6a741d435485028ce54eee4b24 (diff)
downloadyoutube-dl-257453b92bf07920814ce68620ee8fe0949fb6de.tar.gz
youtube-dl-257453b92bf07920814ce68620ee8fe0949fb6de.tar.xz
youtube-dl-257453b92bf07920814ce68620ee8fe0949fb6de.zip
Added cap if user requests ytsearch number over 1000 (with warning)
-rwxr-xr-xyoutube-dl3
1 files changed, 3 insertions, 0 deletions
diff --git a/youtube-dl b/youtube-dl
index e41134546..6757a896c 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -786,6 +786,9 @@ class YoutubeSearchIE(InfoExtractor):
 				if n <= 0:
 					self.to_stderr(u'ERROR: invalid download number %s for query "%s"' % (n, query))
 					return [None]
+				elif n > self._max_youtube_results:
+					self.to_stderr(u'WARNING: ytsearch returns max %i results (you requested %i)'  % (self._max_youtube_results, n))
+					n = self._max_youtube_results
 				return self._download_n_results(query, n)
 			except ValueError: # parsing prefix as int fails
 				return self._download_n_results(query, 1)