aboutsummaryrefslogtreecommitdiff
path: root/youtube_dl/extractor
diff options
context:
space:
mode:
authorSergey M․ <dstftw@gmail.com>2016-06-01 21:23:58 +0700
committerSergey M․ <dstftw@gmail.com>2016-06-01 21:23:58 +0700
commit6a1df4fb5fb76710457b59195e8b530ba269f09f (patch)
treeb74c20930b1d59fdecdc061239ace4f8a8cff776 /youtube_dl/extractor
parentdde1ce7c061cae123264eb555f1da98956923301 (diff)
[spankwire] Add support for new URL format (Closes #9657)
Diffstat (limited to 'youtube_dl/extractor')
-rw-r--r--youtube_dl/extractor/spankwire.py22
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)