mirror of
https://codeberg.org/polarisfm/youtube-dl
synced 2024-11-22 16:44:32 +01:00
Removed provider (mistake) and add provider parameter to process_info
This commit is contained in:
parent
2866e68838
commit
3cd98c7894
@ -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):
|
def process_info(self, info_dict, provider):
|
||||||
"""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'])
|
||||||
@ -476,7 +476,7 @@ class FileDownloader(object):
|
|||||||
for video in videos or []:
|
for video in videos or []:
|
||||||
try:
|
try:
|
||||||
self.increment_downloads()
|
self.increment_downloads()
|
||||||
self.process_info(video)
|
self.process_info(video, ie.IE_NAME)
|
||||||
except UnavailableVideoError:
|
except UnavailableVideoError:
|
||||||
self.trouble(u'\nERROR: unable to download video')
|
self.trouble(u'\nERROR: unable to download video')
|
||||||
|
|
||||||
|
@ -445,7 +445,6 @@ class YoutubeIE(InfoExtractor):
|
|||||||
video_extension = self._video_extensions.get(format_param, 'flv')
|
video_extension = self._video_extensions.get(format_param, 'flv')
|
||||||
|
|
||||||
results.append({
|
results.append({
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': video_real_url.decode('utf-8'),
|
'url': video_real_url.decode('utf-8'),
|
||||||
'uploader': video_uploader.decode('utf-8'),
|
'uploader': video_uploader.decode('utf-8'),
|
||||||
@ -579,7 +578,6 @@ class MetacafeIE(InfoExtractor):
|
|||||||
video_uploader = mobj.group(1)
|
video_uploader = mobj.group(1)
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': video_url.decode('utf-8'),
|
'url': video_url.decode('utf-8'),
|
||||||
'uploader': video_uploader.decode('utf-8'),
|
'uploader': video_uploader.decode('utf-8'),
|
||||||
@ -659,7 +657,6 @@ class DailymotionIE(InfoExtractor):
|
|||||||
video_uploader = mobj.group(1)
|
video_uploader = mobj.group(1)
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': video_url.decode('utf-8'),
|
'url': video_url.decode('utf-8'),
|
||||||
'uploader': video_uploader.decode('utf-8'),
|
'uploader': video_uploader.decode('utf-8'),
|
||||||
@ -755,7 +752,6 @@ class GoogleIE(InfoExtractor):
|
|||||||
video_thumbnail = ''
|
video_thumbnail = ''
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': video_url.decode('utf-8'),
|
'url': video_url.decode('utf-8'),
|
||||||
'uploader': u'NA',
|
'uploader': u'NA',
|
||||||
@ -823,7 +819,6 @@ class PhotobucketIE(InfoExtractor):
|
|||||||
video_uploader = mobj.group(2).decode('utf-8')
|
video_uploader = mobj.group(2).decode('utf-8')
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': video_url.decode('utf-8'),
|
'url': video_url.decode('utf-8'),
|
||||||
'uploader': video_uploader,
|
'uploader': video_uploader,
|
||||||
@ -966,7 +961,6 @@ class YahooIE(InfoExtractor):
|
|||||||
video_url = unescapeHTML(video_url)
|
video_url = unescapeHTML(video_url)
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': video_uploader,
|
'uploader': video_uploader,
|
||||||
@ -1071,7 +1065,6 @@ class VimeoIE(InfoExtractor):
|
|||||||
%(video_id, sig, timestamp, quality, video_codec.upper())
|
%(video_id, sig, timestamp, quality, video_codec.upper())
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': video_uploader,
|
'uploader': video_uploader,
|
||||||
@ -1220,7 +1213,6 @@ class GenericIE(InfoExtractor):
|
|||||||
video_uploader = mobj.group(1).decode('utf-8')
|
video_uploader = mobj.group(1).decode('utf-8')
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': video_url.decode('utf-8'),
|
'url': video_url.decode('utf-8'),
|
||||||
'uploader': video_uploader,
|
'uploader': video_uploader,
|
||||||
@ -1777,7 +1769,6 @@ class DepositFilesIE(InfoExtractor):
|
|||||||
file_title = mobj.group(1).decode('utf-8')
|
file_title = mobj.group(1).decode('utf-8')
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': file_id.decode('utf-8'),
|
'id': file_id.decode('utf-8'),
|
||||||
'url': file_url.decode('utf-8'),
|
'url': file_url.decode('utf-8'),
|
||||||
'uploader': u'NA',
|
'uploader': u'NA',
|
||||||
@ -1982,7 +1973,6 @@ class FacebookIE(InfoExtractor):
|
|||||||
video_extension = self._video_extensions.get(format_param, 'mp4')
|
video_extension = self._video_extensions.get(format_param, 'mp4')
|
||||||
|
|
||||||
results.append({
|
results.append({
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': video_real_url.decode('utf-8'),
|
'url': video_real_url.decode('utf-8'),
|
||||||
'uploader': video_uploader.decode('utf-8'),
|
'uploader': video_uploader.decode('utf-8'),
|
||||||
@ -2034,7 +2024,6 @@ class BlipTVIE(InfoExtractor):
|
|||||||
ext = ext.replace('.', '')
|
ext = ext.replace('.', '')
|
||||||
self.report_direct_download(title)
|
self.report_direct_download(title)
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': title,
|
'id': title,
|
||||||
'url': url,
|
'url': url,
|
||||||
'title': title,
|
'title': title,
|
||||||
@ -2066,7 +2055,6 @@ class BlipTVIE(InfoExtractor):
|
|||||||
ext = umobj.group(1)
|
ext = umobj.group(1)
|
||||||
|
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': data['item_id'],
|
'id': data['item_id'],
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': data['display_name'],
|
'uploader': data['display_name'],
|
||||||
@ -2136,7 +2124,6 @@ class MyVideoIE(InfoExtractor):
|
|||||||
video_title = mobj.group(1)
|
video_title = mobj.group(1)
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': u'NA',
|
'uploader': u'NA',
|
||||||
@ -2263,7 +2250,6 @@ class ComedyCentralIE(InfoExtractor):
|
|||||||
|
|
||||||
effTitle = showId + u'-' + epTitle
|
effTitle = showId + u'-' + epTitle
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': shortMediaId,
|
'id': shortMediaId,
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': showId,
|
'uploader': showId,
|
||||||
@ -2340,7 +2326,6 @@ class EscapistIE(InfoExtractor):
|
|||||||
videoUrl = playlist[1]['url']
|
videoUrl = playlist[1]['url']
|
||||||
|
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': videoId,
|
'id': videoId,
|
||||||
'url': videoUrl,
|
'url': videoUrl,
|
||||||
'uploader': showName,
|
'uploader': showName,
|
||||||
@ -2392,7 +2377,6 @@ class CollegeHumorIE(InfoExtractor):
|
|||||||
internal_video_id = m.group('internalvideoid')
|
internal_video_id = m.group('internalvideoid')
|
||||||
|
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'internal_id': internal_video_id,
|
'internal_id': internal_video_id,
|
||||||
}
|
}
|
||||||
@ -2478,7 +2462,6 @@ class XVideosIE(InfoExtractor):
|
|||||||
video_thumbnail = mobj.group(0).decode('utf-8')
|
video_thumbnail = mobj.group(0).decode('utf-8')
|
||||||
|
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': None,
|
'uploader': None,
|
||||||
@ -2576,7 +2559,6 @@ class SoundcloudIE(InfoExtractor):
|
|||||||
request = urllib2.Request('http://media.soundcloud.com/crossdomain.xml', std_headers)
|
request = urllib2.Request('http://media.soundcloud.com/crossdomain.xml', std_headers)
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id.decode('utf-8'),
|
'id': video_id.decode('utf-8'),
|
||||||
'url': mediaURL,
|
'url': mediaURL,
|
||||||
'uploader': uploader.decode('utf-8'),
|
'uploader': uploader.decode('utf-8'),
|
||||||
@ -2646,7 +2628,6 @@ class InfoQIE(InfoExtractor):
|
|||||||
video_id, extension = video_filename.split('.')
|
video_id, extension = video_filename.split('.')
|
||||||
|
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': None,
|
'uploader': None,
|
||||||
@ -2762,7 +2743,6 @@ class MixcloudIE(InfoExtractor):
|
|||||||
format_param = req_format
|
format_param = req_format
|
||||||
|
|
||||||
return [{
|
return [{
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': file_id.decode('utf-8'),
|
'id': file_id.decode('utf-8'),
|
||||||
'url': file_url.decode('utf-8'),
|
'url': file_url.decode('utf-8'),
|
||||||
'uploader': uploader.decode('utf-8'),
|
'uploader': uploader.decode('utf-8'),
|
||||||
@ -2799,7 +2779,6 @@ class StanfordOpenClassroomIE(InfoExtractor):
|
|||||||
course = mobj.group('course')
|
course = mobj.group('course')
|
||||||
video = mobj.group('video')
|
video = mobj.group('video')
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': course + '_' + video,
|
'id': course + '_' + video,
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -2824,7 +2803,6 @@ class StanfordOpenClassroomIE(InfoExtractor):
|
|||||||
elif mobj.group('course'): # A course page
|
elif mobj.group('course'): # A course page
|
||||||
course = mobj.group('course')
|
course = mobj.group('course')
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': course,
|
'id': course,
|
||||||
'type': 'playlist',
|
'type': 'playlist',
|
||||||
}
|
}
|
||||||
@ -2861,7 +2839,6 @@ class StanfordOpenClassroomIE(InfoExtractor):
|
|||||||
|
|
||||||
else: # Root page
|
else: # Root page
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': 'Stanford OpenClassroom',
|
'id': 'Stanford OpenClassroom',
|
||||||
'type': 'playlist',
|
'type': 'playlist',
|
||||||
}
|
}
|
||||||
@ -2969,7 +2946,6 @@ class MTVIE(InfoExtractor):
|
|||||||
return
|
return
|
||||||
|
|
||||||
info = {
|
info = {
|
||||||
'provider': IE_NAME,
|
|
||||||
'id': video_id,
|
'id': video_id,
|
||||||
'url': video_url,
|
'url': video_url,
|
||||||
'uploader': performer,
|
'uploader': performer,
|
||||||
|
Loading…
Reference in New Issue
Block a user