X-Git-Url: http://git.bitcoin.ninja/index.cgi?a=blobdiff_plain;f=youtube-dl;h=a0cafeae9bc7b17d110e4da18468c9ed225a067e;hb=fd209848897f45e9df8931d14e937f0b0ed2a547;hp=271952af821a682b698255308808d16a6c24e30d;hpb=ba72f8a5d1fa1d788c020aaace075614df3f523d;p=youtube-dl

diff --git a/youtube-dl b/youtube-dl
index 271952af8..a0cafeae9 100755
--- a/youtube-dl
+++ b/youtube-dl
@@ -1,6 +1,7 @@
 #!/usr/bin/env python
 # -*- coding: utf-8 -*-
 # Author: Ricardo Garcia Gonzalez
+# Author: Danny Colligan
 # License: Public domain code
 import htmlentitydefs
 import httplib
@@ -88,6 +89,7 @@ class FileDownloader(object):
 	outtmpl:	Template for output names.
 	ignoreerrors:	Do not stop on download errors.
 	ratelimit:	Download speed limit, in bytes/sec.
+	nooverwrites:	Prevent overwriting files.
 	"""
 
 	_params = None
@@ -285,6 +287,9 @@ class FileDownloader(object):
 					except (ValueError, KeyError), err:
 						retcode = self.trouble('ERROR: invalid output template or system charset: %s' % str(err))
 						continue
+					if self._params['nooverwrites'] and os.path.exists(filename):
+						self.to_stderr('WARNING: file exists: %s; skipping' % filename)
+						continue
 					try:
 						self.pmkdir(filename)
 					except (OSError, IOError), err:
@@ -721,6 +726,90 @@ class MetacafeIE(InfoExtractor):
 			'ext':		video_extension.decode('utf-8'),
 			}]
 
+
+class YoutubeSearchIE(InfoExtractor):
+	"""Information Extractor for YouTube search queries."""
+	_VALID_QUERY = r'ytsearch(\d+|all)?:[\s\S]+'
+	_TEMPLATE_URL = 'http://www.youtube.com/results?search_query=%s&page=%s&gl=US&hl=en'
+	_VIDEO_INDICATOR = r'href="/watch\?v=.+?"'
+	_MORE_PAGES_INDICATOR = r'>Next</a>'
+	_youtube_ie = None
+
+	def __init__(self, youtube_ie, downloader=None): 
+		InfoExtractor.__init__(self, downloader)
+		self._youtube_ie = youtube_ie
+	
+	@staticmethod
+	def suitable(url):
+		return (re.match(YoutubeSearchIE._VALID_QUERY, url) is not None)
+
+	def report_download_page(self, query, pagenum):
+		"""Report attempt to download playlist page with given number."""
+		self.to_stdout(u'[youtube] query "%s": Downloading page %s' % (query, pagenum))
+
+	def _real_initialize(self):
+		self._youtube_ie.initialize()
+	
+	def _real_extract(self, query):
+		mobj = re.match(self._VALID_QUERY, query)
+		if mobj is None:
+			self.to_stderr(u'ERROR: invalid search query "%s"' % query)
+			return [None]
+
+		prefix, query = query.split(':')
+		prefix = prefix[8:]
+		if prefix == '': 
+			return self._download_n_results(query, 1)
+		elif prefix == 'all': 
+			return self._download_n_results(query, -1)
+		else: 
+			try:
+				n = int(prefix)
+				if n <= 0:
+					self.to_stderr(u'ERROR: invalid download number %s for query "%s"' % (n, query))
+					return [None]
+				return self._download_n_results(query, n)
+			except ValueError: # parsing prefix as int fails
+				return self._download_n_results(query, 1)
+
+	def _download_n_results(self, query, n):
+		"""Downloads a specified number of results for a query"""
+
+		video_ids = []
+		already_seen = set()
+		pagenum = 1
+
+		while True:
+			self.report_download_page(query, pagenum)
+			result_url = self._TEMPLATE_URL % (urllib.quote_plus(query), pagenum)
+			request = urllib2.Request(result_url, None, std_headers)
+			try:
+				page = urllib2.urlopen(request).read()
+			except (urllib2.URLError, httplib.HTTPException, socket.error), err:
+				self.to_stderr(u'ERROR: unable to download webpage: %s' % str(err))
+				return [None]
+
+			# Extract video identifiers
+			for mobj in re.finditer(self._VIDEO_INDICATOR, page):
+				video_id = page[mobj.span()[0]:mobj.span()[1]].split('=')[2][:-1]
+				if video_id not in already_seen:
+					video_ids.append(video_id)
+					already_seen.add(video_id)
+					if len(video_ids) == n:
+						# Specified n videos reached
+						information = []
+						for id in video_ids:
+							information.extend(self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id))
+						return information
+
+			if self._MORE_PAGES_INDICATOR not in page:
+				information = []
+				for id in video_ids:
+					information.extend(self._youtube_ie.extract('http://www.youtube.com/watch?v=%s' % id))
+				return information
+
+			pagenum = pagenum + 1
+
 class YoutubePlaylistIE(InfoExtractor):
 	"""Information Extractor for YouTube playlists."""
 
@@ -852,7 +941,7 @@ if __name__ == '__main__':
 		# Parse command line
 		parser = optparse.OptionParser(
 				usage='Usage: %prog [options] url...',
-				version='2009.01.31',
+				version='2009.02.07',
 				conflict_handler='resolve',
 				)
 		parser.add_option('-h', '--help',
@@ -891,9 +980,12 @@ if __name__ == '__main__':
 				dest='ratelimit', metavar='L', help='download rate limit (e.g. 50k or 44.6m)')
 		parser.add_option('-a', '--batch-file',
 				dest='batchfile', metavar='F', help='file containing URLs to download')
+		parser.add_option('-w', '--no-overwrites',
+				action='store_true', dest='nooverwrites', help='do not overwrite files', default=False)
 		(opts, args) = parser.parse_args()
 
 		# Batch file verification
+		batchurls = []
 		if opts.batchfile is not None:
 			try:
 				batchurls = [line.strip() for line in open(opts.batchfile, 'r')]
@@ -924,6 +1016,7 @@ if __name__ == '__main__':
 		youtube_ie = YoutubeIE()
 		metacafe_ie = MetacafeIE(youtube_ie)
 		youtube_pl_ie = YoutubePlaylistIE(youtube_ie)
+		youtube_search_ie = YoutubeSearchIE(youtube_ie)
 
 		# File downloader
 		charset = locale.getdefaultlocale()[1]
@@ -944,7 +1037,9 @@ if __name__ == '__main__':
 				or u'%(id)s.%(ext)s'),
 			'ignoreerrors': opts.ignoreerrors,
 			'ratelimit': opts.ratelimit,
+			'nooverwrites': opts.nooverwrites,
 			})
+		fd.add_info_extractor(youtube_search_ie)
 		fd.add_info_extractor(youtube_pl_ie)
 		fd.add_info_extractor(metacafe_ie)
 		fd.add_info_extractor(youtube_ie)