diff options
Diffstat (limited to 'youtube_dl/extractor/spankwire.py')
| -rw-r--r-- | youtube_dl/extractor/spankwire.py | 22 | 
1 files changed, 10 insertions, 12 deletions
| diff --git a/youtube_dl/extractor/spankwire.py b/youtube_dl/extractor/spankwire.py index 692fd78e8..92a7120a3 100644 --- a/youtube_dl/extractor/spankwire.py +++ b/youtube_dl/extractor/spankwire.py @@ -96,20 +96,18 @@ class SpankwireIE(InfoExtractor):          formats = []          for height, video_url in zip(heights, video_urls):              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, +                'format_id': '%dp' % 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)          age_limit = self._rta_search(webpage) | 
