Browse Source

Provider (youtube, etc) is now saved in info_dict, so template filename can be something like %(provider)s_%(id)s.%(ext)s
This can be useful because videos should also be identified by their providers since id's can be the same on multiple providers.

danut007ro 13 years ago
parent
commit
ae16f68f4a
1 changed files with 3 additions and 2 deletions
  1. 3 2
      youtube_dl/FileDownloader.py

+ 3 - 2
youtube_dl/FileDownloader.py

@@ -341,7 +341,7 @@ class FileDownloader(object):
 			return u'"' + title + '" title matched reject pattern "' + rejecttitle + '"'
 			return u'"' + title + '" title matched reject pattern "' + rejecttitle + '"'
 		return None
 		return None
 
 
-	def process_info(self, info_dict, provider):
+	def process_info(self, info_dict):
 		"""Process a single dictionary returned by an InfoExtractor."""
 		"""Process a single dictionary returned by an InfoExtractor."""
 
 
 		info_dict['stitle'] = sanitize_filename(info_dict['title'])
 		info_dict['stitle'] = sanitize_filename(info_dict['title'])
@@ -475,8 +475,9 @@ class FileDownloader(object):
 				videos = ie.extract(url)
 				videos = ie.extract(url)
 				for video in videos or []:
 				for video in videos or []:
 					try:
 					try:
+						video['provider'] = ie.IE_NAME
 						self.increment_downloads()
 						self.increment_downloads()
-						self.process_info(video, ie.IE_NAME)
+						self.process_info(video)
 					except UnavailableVideoError:
 					except UnavailableVideoError:
 						self.trouble(u'\nERROR: unable to download video')
 						self.trouble(u'\nERROR: unable to download video')