projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
63ccf64
)
[izlesene] Unquote video URLs and simplify
author
Naglis Jonaitis
<njonaitis@gmail.com>
Fri, 5 Jun 2015 23:54:57 +0000
(
02:54
+0300)
committer
Naglis Jonaitis
<njonaitis@gmail.com>
Fri, 5 Jun 2015 23:57:21 +0000
(
02:57
+0300)
youtube_dl/extractor/izlesene.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/izlesene.py
b/youtube_dl/extractor/izlesene.py
index 99a1361f844c15520c842cd9fffa1e5c2e9b6974..753cb98eac632d812bdbdac17fdcfef54f0b92fc 100644
(file)
--- a/
youtube_dl/extractor/izlesene.py
+++ b/
youtube_dl/extractor/izlesene.py
@@
-4,6
+4,7
@@
from __future__ import unicode_literals
import re
from .common import InfoExtractor
import re
from .common import InfoExtractor
+from ..compat import compat_urllib_parse_unquote
from ..utils import (
determine_ext,
float_or_none,
from ..utils import (
determine_ext,
float_or_none,
@@
-67,9
+68,9
@@
class IzleseneIE(InfoExtractor):
uploader = self._html_search_regex(
r"adduserUsername\s*=\s*'([^']+)';",
uploader = self._html_search_regex(
r"adduserUsername\s*=\s*'([^']+)';",
- webpage, 'uploader', fatal=False
, default=''
)
+ webpage, 'uploader', fatal=False)
timestamp = parse_iso8601(self._html_search_meta(
timestamp = parse_iso8601(self._html_search_meta(
- 'uploadDate', webpage, 'upload date'
, fatal=False
))
+ 'uploadDate', webpage, 'upload date'))
duration = float_or_none(self._html_search_regex(
r'"videoduration"\s*:\s*"([^"]+)"',
duration = float_or_none(self._html_search_regex(
r'"videoduration"\s*:\s*"([^"]+)"',
@@
-86,8
+87,7
@@
class IzleseneIE(InfoExtractor):
# Might be empty for some videos.
streams = self._html_search_regex(
# Might be empty for some videos.
streams = self._html_search_regex(
- r'"qualitylevel"\s*:\s*"([^"]+)"',
- webpage, 'streams', fatal=False, default='')
+ r'"qualitylevel"\s*:\s*"([^"]+)"', webpage, 'streams', default='')
formats = []
if streams:
formats = []
if streams:
@@
-95,15
+95,15
@@
class IzleseneIE(InfoExtractor):
quality, url = re.search(r'\[(\w+)\](.+)', stream).groups()
formats.append({
'format_id': '%sp' % quality if quality else 'sd',
quality, url = re.search(r'\[(\w+)\](.+)', stream).groups()
formats.append({
'format_id': '%sp' % quality if quality else 'sd',
- 'url':
url
,
+ 'url':
compat_urllib_parse_unquote(url)
,
'ext': ext,
})
else:
stream_url = self._search_regex(
'ext': ext,
})
else:
stream_url = self._search_regex(
- r'"streamurl"\s
?:\s?
"([^"]+)"', webpage, 'stream URL')
+ r'"streamurl"\s
*:\s*
"([^"]+)"', webpage, 'stream URL')
formats.append({
'format_id': 'sd',
formats.append({
'format_id': 'sd',
- 'url':
stream_url
,
+ 'url':
compat_urllib_parse_unquote(stream_url)
,
'ext': ext,
})
'ext': ext,
})