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

[izlesene] Unquote video URLs and simplify

Browse source
This commit is contained in:
Naglis Jonaitis 2015-06-06 02:54:57 +03:00
parent 63ccf6474d
commit dfe7dd9bdb
1 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

14
youtube_dl/extractor/izlesene.py
View file

@ -4,6 +4,7 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urllib_parse_unquote
from ..utils import ( from ..utils import (
determine_ext, determine_ext,
float_or_none, float_or_none,
@ -67,9 +68,9 @@ class IzleseneIE(InfoExtractor):
uploader = self._html_search_regex( uploader = self._html_search_regex(
r"adduserUsername\s*=\s*'([^']+)';", 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( duration = float_or_none(self._html_search_regex(
r'"videoduration"\s*:\s*"([^"]+)"', r'"videoduration"\s*:\s*"([^"]+)"',
@ -86,8 +87,7 @@ class IzleseneIE(InfoExtractor):
# Might be empty for some videos. # Might be empty for some videos.
streams = self._html_search_regex( streams = self._html_search_regex(
r'"qualitylevel"\s*:\s*"([^"]+)"', r'"qualitylevel"\s*:\s*"([^"]+)"', webpage, 'streams', default='')
webpage, 'streams', fatal=False, default='')
formats = [] formats = []
if streams: if streams:
@ -95,15 +95,15 @@ class IzleseneIE(InfoExtractor):
quality, url = re.search(r'\[(\w+)\](.+)', stream).groups() quality, url = re.search(r'\[(\w+)\](.+)', stream).groups()
formats.append({ formats.append({
'format_id': '%sp' % quality if quality else 'sd', 'format_id': '%sp' % quality if quality else 'sd',
'url': url, 'url': compat_urllib_parse_unquote(url),
'ext': ext, 'ext': ext,
}) })
else: else:
stream_url = self._search_regex( stream_url = self._search_regex(
r'"streamurl"\s?:\s?"([^"]+)"', webpage, 'stream URL') r'"streamurl"\s*:\s*"([^"]+)"', webpage, 'stream URL')
formats.append({ formats.append({
'format_id': 'sd', 'format_id': 'sd',
'url': stream_url, 'url': compat_urllib_parse_unquote(stream_url),
'ext': ext, 'ext': ext,
}) })