|
@@ -96,20 +96,18 @@ class SpankwireIE(InfoExtractor):
|
|
formats = []
|
|
formats = []
|
|
for height, video_url in zip(heights, video_urls):
|
|
for height, video_url in zip(heights, video_urls):
|
|
path = compat_urllib_parse_urlparse(video_url).path
|
|
path = compat_urllib_parse_urlparse(video_url).path
|
|
- _, quality = path.split('/')[4].split('_')[:2]
|
|
|
|
- f = {
|
|
|
|
|
|
+ m = re.search(r'/(?P<height>\d+)[pP]_(?P<tbr>\d+)[kK]', path)
|
|
|
|
+ if m:
|
|
|
|
+ tbr = int(m.group('tbr'))
|
|
|
|
+ height = int(m.group('height'))
|
|
|
|
+ else:
|
|
|
|
+ tbr = None
|
|
|
|
+ formats.append({
|
|
'url': video_url,
|
|
'url': video_url,
|
|
|
|
+ 'format_id': '%dp' % height,
|
|
'height': height,
|
|
'height': height,
|
|
- }
|
|
|
|
- tbr = self._search_regex(r'^(\d+)[Kk]$', quality, 'tbr', default=None)
|
|
|
|
- if tbr:
|
|
|
|
- f.update({
|
|
|
|
- 'tbr': int(tbr),
|
|
|
|
- 'format_id': '%dp' % height,
|
|
|
|
- })
|
|
|
|
- else:
|
|
|
|
- f['format_id'] = quality
|
|
|
|
- formats.append(f)
|
|
|
|
|
|
+ 'tbr': tbr,
|
|
|
|
+ })
|
|
self._sort_formats(formats)
|
|
self._sort_formats(formats)
|
|
|
|
|
|
age_limit = self._rta_search(webpage)
|
|
age_limit = self._rta_search(webpage)
|