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

[extractor/generic] Use compat_urllib_parse_unquote for unquoting video_id and title from URL

Browse source
This commit is contained in:
Sergey M․ 2015-05-31 01:23:58 +06:00
parent 58bde34a23
commit 1ddb9456c4
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
youtube_dl/extractor/generic.py
View file

@ -9,9 +9,10 @@ from .common import InfoExtractor
from .youtube import YoutubeIE from .youtube import YoutubeIE
from ..compat import ( from ..compat import (
compat_urllib_parse, compat_urllib_parse,
compat_urllib_parse_unquote,
compat_urllib_request,
compat_urlparse, compat_urlparse,
compat_xml_parse_error, compat_xml_parse_error,
compat_urllib_request,
) )
from ..utils import ( from ..utils import (
determine_ext, determine_ext,
@ -895,7 +896,7 @@ class GenericIE(InfoExtractor):
force_videoid = smuggled_data['force_videoid'] force_videoid = smuggled_data['force_videoid']
video_id = force_videoid video_id = force_videoid
else: else:
video_id = os.path.splitext(compat_urllib_parse.unquote(url.rstrip('/').split('/')[-1]))[0] video_id = compat_urllib_parse_unquote(os.path.splitext(url.rstrip('/').split('/')[-1])[0])
self.to_screen('%s: Requesting header' % video_id) self.to_screen('%s: Requesting header' % video_id)
@ -930,7 +931,7 @@ class GenericIE(InfoExtractor):
head_response.headers.get('Last-Modified')) head_response.headers.get('Last-Modified'))
return { return {
'id': video_id, 'id': video_id,
'title': os.path.splitext(compat_urllib_parse.unquote(url_basename(url)))[0], 'title': compat_urllib_parse_unquote(os.path.splitext(url_basename(url))[0]),
'direct': True, 'direct': True,
'formats': [{ 'formats': [{
'format_id': m.group('format_id'), 'format_id': m.group('format_id'),
@ -966,7 +967,7 @@ class GenericIE(InfoExtractor):
head_response.headers.get('Last-Modified')) head_response.headers.get('Last-Modified'))
return { return {
'id': video_id, 'id': video_id,
'title': os.path.splitext(compat_urllib_parse.unquote(url_basename(url)))[0], 'title': compat_urllib_parse_unquote(os.path.splitext(url_basename(url))[0]),
'direct': True, 'direct': True,
'url': url, 'url': url,
'upload_date': upload_date, 'upload_date': upload_date,