mirror of
				https://gitlab.com/ytdl-org/youtube-dl.git
				synced 2025-11-03 21:47:36 -05:00 
			
		
		
		
	Every extractor also return it's name.
This commit is contained in:
		@@ -445,6 +445,7 @@ class YoutubeIE(InfoExtractor):
 | 
			
		||||
			video_extension = self._video_extensions.get(format_param, 'flv')
 | 
			
		||||
 | 
			
		||||
			results.append({
 | 
			
		||||
				'provider': IE_NAME,
 | 
			
		||||
				'id':		video_id.decode('utf-8'),
 | 
			
		||||
				'url':		video_real_url.decode('utf-8'),
 | 
			
		||||
				'uploader':	video_uploader.decode('utf-8'),
 | 
			
		||||
@@ -578,6 +579,7 @@ class MetacafeIE(InfoExtractor):
 | 
			
		||||
		video_uploader = mobj.group(1)
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id.decode('utf-8'),
 | 
			
		||||
			'url':		video_url.decode('utf-8'),
 | 
			
		||||
			'uploader':	video_uploader.decode('utf-8'),
 | 
			
		||||
@@ -657,6 +659,7 @@ class DailymotionIE(InfoExtractor):
 | 
			
		||||
		video_uploader = mobj.group(1)
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id.decode('utf-8'),
 | 
			
		||||
			'url':		video_url.decode('utf-8'),
 | 
			
		||||
			'uploader':	video_uploader.decode('utf-8'),
 | 
			
		||||
@@ -752,6 +755,7 @@ class GoogleIE(InfoExtractor):
 | 
			
		||||
			video_thumbnail = ''
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id.decode('utf-8'),
 | 
			
		||||
			'url':		video_url.decode('utf-8'),
 | 
			
		||||
			'uploader':	u'NA',
 | 
			
		||||
@@ -819,6 +823,7 @@ class PhotobucketIE(InfoExtractor):
 | 
			
		||||
		video_uploader = mobj.group(2).decode('utf-8')
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id.decode('utf-8'),
 | 
			
		||||
			'url':		video_url.decode('utf-8'),
 | 
			
		||||
			'uploader':	video_uploader,
 | 
			
		||||
@@ -961,6 +966,7 @@ class YahooIE(InfoExtractor):
 | 
			
		||||
		video_url = unescapeHTML(video_url)
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id.decode('utf-8'),
 | 
			
		||||
			'url':		video_url,
 | 
			
		||||
			'uploader':	video_uploader,
 | 
			
		||||
@@ -1065,6 +1071,7 @@ class VimeoIE(InfoExtractor):
 | 
			
		||||
					%(video_id, sig, timestamp, quality, video_codec.upper())
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id,
 | 
			
		||||
			'url':		video_url,
 | 
			
		||||
			'uploader':	video_uploader,
 | 
			
		||||
@@ -1213,6 +1220,7 @@ class GenericIE(InfoExtractor):
 | 
			
		||||
		video_uploader = mobj.group(1).decode('utf-8')
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id.decode('utf-8'),
 | 
			
		||||
			'url':		video_url.decode('utf-8'),
 | 
			
		||||
			'uploader':	video_uploader,
 | 
			
		||||
@@ -1769,6 +1777,7 @@ class DepositFilesIE(InfoExtractor):
 | 
			
		||||
		file_title = mobj.group(1).decode('utf-8')
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		file_id.decode('utf-8'),
 | 
			
		||||
			'url':		file_url.decode('utf-8'),
 | 
			
		||||
			'uploader':	u'NA',
 | 
			
		||||
@@ -1973,6 +1982,7 @@ class FacebookIE(InfoExtractor):
 | 
			
		||||
			video_extension = self._video_extensions.get(format_param, 'mp4')
 | 
			
		||||
 | 
			
		||||
			results.append({
 | 
			
		||||
				'provider': IE_NAME,
 | 
			
		||||
				'id':		video_id.decode('utf-8'),
 | 
			
		||||
				'url':		video_real_url.decode('utf-8'),
 | 
			
		||||
				'uploader':	video_uploader.decode('utf-8'),
 | 
			
		||||
@@ -2024,6 +2034,7 @@ class BlipTVIE(InfoExtractor):
 | 
			
		||||
				ext = ext.replace('.', '')
 | 
			
		||||
				self.report_direct_download(title)
 | 
			
		||||
				info = {
 | 
			
		||||
					'provider': IE_NAME,
 | 
			
		||||
					'id': title,
 | 
			
		||||
					'url': url,
 | 
			
		||||
					'title': title,
 | 
			
		||||
@@ -2055,6 +2066,7 @@ class BlipTVIE(InfoExtractor):
 | 
			
		||||
				ext = umobj.group(1)
 | 
			
		||||
 | 
			
		||||
				info = {
 | 
			
		||||
					'provider': IE_NAME,
 | 
			
		||||
					'id': data['item_id'],
 | 
			
		||||
					'url': video_url,
 | 
			
		||||
					'uploader': data['display_name'],
 | 
			
		||||
@@ -2124,6 +2136,7 @@ class MyVideoIE(InfoExtractor):
 | 
			
		||||
		video_title = mobj.group(1)
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id,
 | 
			
		||||
			'url':		video_url,
 | 
			
		||||
			'uploader':	u'NA',
 | 
			
		||||
@@ -2250,6 +2263,7 @@ class ComedyCentralIE(InfoExtractor):
 | 
			
		||||
 | 
			
		||||
			effTitle = showId + u'-' + epTitle
 | 
			
		||||
			info = {
 | 
			
		||||
				'provider': IE_NAME,
 | 
			
		||||
				'id': shortMediaId,
 | 
			
		||||
				'url': video_url,
 | 
			
		||||
				'uploader': showId,
 | 
			
		||||
@@ -2326,6 +2340,7 @@ class EscapistIE(InfoExtractor):
 | 
			
		||||
		videoUrl = playlist[1]['url']
 | 
			
		||||
 | 
			
		||||
		info = {
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id': videoId,
 | 
			
		||||
			'url': videoUrl,
 | 
			
		||||
			'uploader': showName,
 | 
			
		||||
@@ -2377,6 +2392,7 @@ class CollegeHumorIE(InfoExtractor):
 | 
			
		||||
		internal_video_id = m.group('internalvideoid')
 | 
			
		||||
 | 
			
		||||
		info = {
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id': video_id,
 | 
			
		||||
			'internal_id': internal_video_id,
 | 
			
		||||
		}
 | 
			
		||||
@@ -2462,6 +2478,7 @@ class XVideosIE(InfoExtractor):
 | 
			
		||||
		video_thumbnail = mobj.group(0).decode('utf-8')
 | 
			
		||||
 | 
			
		||||
		info = {
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id': video_id,
 | 
			
		||||
			'url': video_url,
 | 
			
		||||
			'uploader': None,
 | 
			
		||||
@@ -2559,6 +2576,7 @@ class SoundcloudIE(InfoExtractor):
 | 
			
		||||
		request = urllib2.Request('http://media.soundcloud.com/crossdomain.xml', std_headers)
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id':		video_id.decode('utf-8'),
 | 
			
		||||
			'url':		mediaURL,
 | 
			
		||||
			'uploader':	uploader.decode('utf-8'),
 | 
			
		||||
@@ -2628,6 +2646,7 @@ class InfoQIE(InfoExtractor):
 | 
			
		||||
		video_id, extension = video_filename.split('.')
 | 
			
		||||
 | 
			
		||||
		info = {
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id': video_id,
 | 
			
		||||
			'url': video_url,
 | 
			
		||||
			'uploader': None,
 | 
			
		||||
@@ -2743,6 +2762,7 @@ class MixcloudIE(InfoExtractor):
 | 
			
		||||
			format_param = req_format
 | 
			
		||||
 | 
			
		||||
		return [{
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id': file_id.decode('utf-8'),
 | 
			
		||||
			'url': file_url.decode('utf-8'),
 | 
			
		||||
			'uploader':	uploader.decode('utf-8'),
 | 
			
		||||
@@ -2779,6 +2799,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
 | 
			
		||||
			course = mobj.group('course')
 | 
			
		||||
			video = mobj.group('video')
 | 
			
		||||
			info = {
 | 
			
		||||
				'provider': IE_NAME,
 | 
			
		||||
				'id': course + '_' + video,
 | 
			
		||||
			}
 | 
			
		||||
 | 
			
		||||
@@ -2803,6 +2824,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
 | 
			
		||||
		elif mobj.group('course'): # A course page
 | 
			
		||||
			course = mobj.group('course')
 | 
			
		||||
			info = {
 | 
			
		||||
				'provider': IE_NAME,
 | 
			
		||||
				'id': course,
 | 
			
		||||
				'type': 'playlist',
 | 
			
		||||
			}
 | 
			
		||||
@@ -2839,6 +2861,7 @@ class StanfordOpenClassroomIE(InfoExtractor):
 | 
			
		||||
			
 | 
			
		||||
		else: # Root page
 | 
			
		||||
			info = {
 | 
			
		||||
				'provider': IE_NAME,
 | 
			
		||||
				'id': 'Stanford OpenClassroom',
 | 
			
		||||
				'type': 'playlist',
 | 
			
		||||
			}
 | 
			
		||||
@@ -2946,6 +2969,7 @@ class MTVIE(InfoExtractor):
 | 
			
		||||
			return
 | 
			
		||||
 | 
			
		||||
		info = {
 | 
			
		||||
			'provider': IE_NAME,
 | 
			
		||||
			'id': video_id,
 | 
			
		||||
			'url': video_url,
 | 
			
		||||
			'uploader': performer,
 | 
			
		||||
 
 | 
			
		||||
		Reference in New Issue
	
	Block a user