From be8786a6a46f43be54daa85d6c70091948175f34 Mon Sep 17 00:00:00 2001 From: danut007ro Date: Wed, 26 Sep 2012 21:00:28 +0300 Subject: [PATCH] Every extractor also return it's name. --- youtube_dl/InfoExtractors.py | 24 ++++++++++++++++++++++++ 1 file changed, 24 insertions(+) diff --git a/youtube_dl/InfoExtractors.py b/youtube_dl/InfoExtractors.py index ddb4aa16b..d2b9fbedc 100644 --- a/youtube_dl/InfoExtractors.py +++ b/youtube_dl/InfoExtractors.py @@ -445,6 +445,7 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url, new_video=True): 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 @@ def _real_extract(self, url, new_video=True): %(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 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): ext = ext.replace('.', '') self.report_direct_download(title) info = { + 'provider': IE_NAME, 'id': title, 'url': url, 'title': title, @@ -2055,6 +2066,7 @@ def _real_extract(self, url): ext = umobj.group(1) info = { + 'provider': IE_NAME, 'id': data['item_id'], 'url': video_url, 'uploader': data['display_name'], @@ -2124,6 +2136,7 @@ def _real_extract(self,url): video_title = mobj.group(1) return [{ + 'provider': IE_NAME, 'id': video_id, 'url': video_url, 'uploader': u'NA', @@ -2250,6 +2263,7 @@ def _real_extract(self, url): effTitle = showId + u'-' + epTitle info = { + 'provider': IE_NAME, 'id': shortMediaId, 'url': video_url, 'uploader': showId, @@ -2326,6 +2340,7 @@ def _real_extract(self, url): videoUrl = playlist[1]['url'] info = { + 'provider': IE_NAME, 'id': videoId, 'url': videoUrl, 'uploader': showName, @@ -2377,6 +2392,7 @@ def _real_extract(self, url): internal_video_id = m.group('internalvideoid') info = { + 'provider': IE_NAME, 'id': video_id, 'internal_id': internal_video_id, } @@ -2462,6 +2478,7 @@ def _real_extract(self, url): video_thumbnail = mobj.group(0).decode('utf-8') info = { + 'provider': IE_NAME, 'id': video_id, 'url': video_url, 'uploader': None, @@ -2559,6 +2576,7 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): video_id, extension = video_filename.split('.') info = { + 'provider': IE_NAME, 'id': video_id, 'url': video_url, 'uploader': None, @@ -2743,6 +2762,7 @@ def _real_extract(self, url): 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 @@ def _real_extract(self, url): course = mobj.group('course') video = mobj.group('video') info = { + 'provider': IE_NAME, 'id': course + '_' + video, } @@ -2803,6 +2824,7 @@ def _real_extract(self, url): elif mobj.group('course'): # A course page course = mobj.group('course') info = { + 'provider': IE_NAME, 'id': course, 'type': 'playlist', } @@ -2839,6 +2861,7 @@ def _real_extract(self, url): else: # Root page info = { + 'provider': IE_NAME, 'id': 'Stanford OpenClassroom', 'type': 'playlist', } @@ -2946,6 +2969,7 @@ def _real_extract(self, url): return info = { + 'provider': IE_NAME, 'id': video_id, 'url': video_url, 'uploader': performer,