projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
58bde34
)
[extractor/generic] Use compat_urllib_parse_unquote for unquoting video_id and title...
author
Sergey M․
<dstftw@gmail.com>
Sat, 30 May 2015 19:23:58 +0000
(
01:23
+0600)
committer
Sergey M․
<dstftw@gmail.com>
Sat, 30 May 2015 19:23:58 +0000
(
01:23
+0600)
youtube_dl/extractor/generic.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/generic.py
b/youtube_dl/extractor/generic.py
index ec1d9abbe4c9972315206e7f92f569afeb88a182..d9116ce10389d5bcba9ee816d8690eb17046c7e7 100644
(file)
--- a/
youtube_dl/extractor/generic.py
+++ b/
youtube_dl/extractor/generic.py
@@
-9,9
+9,10
@@
from .common import InfoExtractor
from .youtube import YoutubeIE
from ..compat import (
compat_urllib_parse,
from .youtube import YoutubeIE
from ..compat import (
compat_urllib_parse,
+ compat_urllib_parse_unquote,
+ compat_urllib_request,
compat_urlparse,
compat_xml_parse_error,
compat_urlparse,
compat_xml_parse_error,
- compat_urllib_request,
)
from ..utils import (
determine_ext,
)
from ..utils import (
determine_ext,
@@
-895,7
+896,7
@@
class GenericIE(InfoExtractor):
force_videoid = smuggled_data['force_videoid']
video_id = force_videoid
else:
force_videoid = smuggled_data['force_videoid']
video_id = force_videoid
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'))
return {
'id': video_id,
head_response.headers.get('Last-Modified'))
return {
'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,
'formats': [{
'format_id': m.group('format_id'),
'direct': True,
'formats': [{
'format_id': m.group('format_id'),
@@
-966,7
+967,7
@@
class GenericIE(InfoExtractor):
head_response.headers.get('Last-Modified'))
return {
'id': video_id,
head_response.headers.get('Last-Modified'))
return {
'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,
'url': url,
'upload_date': upload_date,
'direct': True,
'url': url,
'upload_date': upload_date,