w/youtube-dl
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

[utils] YoutubeDLHandler: don't use 'Youtubedl-user-agent' for overriding the default user agent

Browse source 
Setting the 'User-Agent' header is enough
This commit is contained in:
Jaime Marquínez Ferrándiz 2015-01-24 18:07:21 +01:00
parent 384b62028a
commit 3fcfb8e9fa
5 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
youtube_dl/downloader/http.py
View file

@ -25,7 +25,7 @@ class HttpFD(FileDownloader):
# Do not include the Accept-Encoding header # Do not include the Accept-Encoding header
headers = {'Youtubedl-no-compression': 'True'} headers = {'Youtubedl-no-compression': 'True'}
if 'user_agent' in info_dict: if 'user_agent' in info_dict:
headers['Youtubedl-user-agent'] = info_dict['user_agent'] headers['User-agent'] = info_dict['user_agent']
if 'http_referer' in info_dict: if 'http_referer' in info_dict:
headers['Referer'] = info_dict['http_referer'] headers['Referer'] = info_dict['http_referer']
add_headers = info_dict.get('http_headers') add_headers = info_dict.get('http_headers')

2
youtube_dl/extractor/atresplayer.py
View file

@ -95,7 +95,7 @@ class AtresPlayerIE(SubtitlesInfoExtractor):
for fmt in ['windows', 'android_tablet']: for fmt in ['windows', 'android_tablet']:
request = compat_urllib_request.Request( request = compat_urllib_request.Request(
self._URL_VIDEO_TEMPLATE.format(fmt, episode_id, timestamp_shifted, token)) self._URL_VIDEO_TEMPLATE.format(fmt, episode_id, timestamp_shifted, token))
request.add_header('Youtubedl-user-agent', self._USER_AGENT) request.add_header('User-Agent', self._USER_AGENT)
fmt_json = self._download_json( fmt_json = self._download_json(
request, video_id, 'Downloading %s video JSON' % fmt) request, video_id, 'Downloading %s video JSON' % fmt)

2
youtube_dl/extractor/bliptv.py
View file

@ -199,7 +199,7 @@ class BlipTVIE(SubtitlesInfoExtractor):
# For some weird reason, blip.tv serves a video instead of subtitles # For some weird reason, blip.tv serves a video instead of subtitles
# when we request with a common UA # when we request with a common UA
req = compat_urllib_request.Request(url) req = compat_urllib_request.Request(url)
req.add_header('Youtubedl-user-agent', 'youtube-dl') req.add_header('User-Agent', 'youtube-dl')
return self._download_webpage(req, None, note=False) return self._download_webpage(req, None, note=False)

2
youtube_dl/extractor/mtv.py
View file

@ -53,7 +53,7 @@ class MTVServicesInfoExtractor(InfoExtractor):
webpage_url = self._MOBILE_TEMPLATE % mtvn_id webpage_url = self._MOBILE_TEMPLATE % mtvn_id
req = compat_urllib_request.Request(webpage_url) req = compat_urllib_request.Request(webpage_url)
# Otherwise we get a webpage that would execute some javascript # Otherwise we get a webpage that would execute some javascript
req.add_header('Youtubedl-user-agent', 'curl/7') req.add_header('User-Agent', 'curl/7')
webpage = self._download_webpage(req, mtvn_id, webpage = self._download_webpage(req, mtvn_id,
'Downloading mobile page') 'Downloading mobile page')
metrics_url = unescapeHTML(self._search_regex(r'<a href="(http://metrics.+?)"', webpage, 'url')) metrics_url = unescapeHTML(self._search_regex(r'<a href="(http://metrics.+?)"', webpage, 'url'))

5
youtube_dl/utils.py
View file

@ -606,11 +606,6 @@ class YoutubeDLHandler(compat_urllib_request.HTTPHandler):
if 'Accept-encoding' in req.headers: if 'Accept-encoding' in req.headers:
del req.headers['Accept-encoding'] del req.headers['Accept-encoding']
del req.headers['Youtubedl-no-compression'] del req.headers['Youtubedl-no-compression']
if 'Youtubedl-user-agent' in req.headers:
if 'User-agent' in req.headers:
del req.headers['User-agent']
req.headers['User-agent'] = req.headers['Youtubedl-user-agent']
del req.headers['Youtubedl-user-agent']
if sys.version_info < (2, 7) and '#' in req.get_full_url(): if sys.version_info < (2, 7) and '#' in req.get_full_url():
# Python 2.6 is brain-dead when it comes to fragments # Python 2.6 is brain-dead when it comes to fragments