midgard/youtube-dl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

[pluralsight] Process all clip URLs (closes #10984)

Browse source
This commit is contained in:
Sergey M․ 2016-10-21 04:35:32 +07:00
parent 9ce0077485
commit f8ae2c7f30
No known key found for this signature in database
GPG key ID: 2C393E0F18A9236D
1 changed files with 23 additions and 11 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
youtube_dl/extractor/pluralsight.py
View file

@ -4,7 +4,6 @@ import collections
import json import json
import os import os
import random import random
import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import ( from ..compat import (
@ -242,9 +241,9 @@ class PluralsightIE(PluralsightBaseIE):
'quality': '%dx%d' % (f['width'], f['height']), 'quality': '%dx%d' % (f['width'], f['height']),
} }
format_id = '%s-%s' % (ext, quality) format_id = '%s-%s' % (ext, quality)
clip_url = self._download_webpage( viewclip = self._download_json(
'%s/video/clips/viewclip' % self._API_BASE, display_id, '%s/video/clips/viewclip' % self._API_BASE, display_id,
'Downloading %s URL' % format_id, fatal=False, 'Downloading %s viewclip JSON' % format_id, fatal=False,
data=json.dumps(clip_post).encode('utf-8'), data=json.dumps(clip_post).encode('utf-8'),
headers={'Content-Type': 'application/json;charset=utf-8'}) headers={'Content-Type': 'application/json;charset=utf-8'})
@ -258,15 +257,28 @@ class PluralsightIE(PluralsightBaseIE):
random.randint(2, 5), display_id, random.randint(2, 5), display_id,
'%(video_id)s: Waiting for %(timeout)s seconds to avoid throttling') '%(video_id)s: Waiting for %(timeout)s seconds to avoid throttling')
if not viewclip:
continue
clip_urls = viewclip.get('urls')
if not isinstance(clip_urls, list):
continue
for clip_url_data in clip_urls:
clip_url = clip_url_data.get('url')
if not clip_url: if not clip_url:
continue continue
f.update({ cdn = clip_url_data.get('cdn')
clip_f = f.copy()
clip_f.update({
'url': clip_url, 'url': clip_url,
'ext': ext, 'ext': ext,
'format_id': format_id, 'format_id': '%s-%s' % (format_id, cdn) if cdn else format_id,
'quality': quality_key(quality), 'quality': quality_key(quality),
'source_preference': int_or_none(clip_url_data.get('rank')),
}) })
formats.append(f) formats.append(clip_f)
self._sort_formats(formats) self._sort_formats(formats)
duration = int_or_none( duration = int_or_none(