R-yan/l1ving_youtube-dl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

[ciscolive] Changes requested by maintainers

Browse Source
This commit is contained in:
Austin de Coup-Crank 2018-11-02 12:27:22 -07:00
parent 759f720df7
commit 10ab880289
1 changed files with 20 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
youtube_dl/extractor/ciscolive.py
View File

@ -3,10 +3,16 @@ from __future__ import unicode_literals
import re import re
from .common import InfoExtractor from .common import InfoExtractor
from ..compat import compat_urllib_parse_urlencode from ..compat import (
compat_urllib_parse_urlparse,
compat_parse_qs
)
from ..utils import ( from ..utils import (
try_get, try_get,
clean_html clean_html,
urlencode_postdata,
int_or_none,
ExtractorError
) )
@ -78,7 +84,7 @@ class CiscoLiveIE(InfoExtractor):
pdf_url = try_get(rf_item, lambda x: x['files'][0]['url']) pdf_url = try_get(rf_item, lambda x: x['files'][0]['url'])
bc_id = try_get(rf_item, lambda x: x['videos'][0]['url']) bc_id = try_get(rf_item, lambda x: x['videos'][0]['url'])
bc_url = self.BRIGHTCOVE_URL_TEMPLATE % bc_id bc_url = self.BRIGHTCOVE_URL_TEMPLATE % bc_id
duration = try_get(rf_item, lambda x: x['times'][0]['length']) duration = int_or_none(try_get(rf_item, lambda x: x['times'][0]['length']))
location = try_get(rf_item, lambda x: x['times'][0]['room']) location = try_get(rf_item, lambda x: x['times'][0]['room'])
if duration: if duration:
@ -115,28 +121,30 @@ class CiscoLiveIE(InfoExtractor):
'rfWidgetId': self.RAINFOCUS_WIDGETID, 'rfWidgetId': self.RAINFOCUS_WIDGETID,
'Referer': url, 'Referer': url,
} }
# Single session URL (single video) # Single session URL (single video)
if mobj.group('id'): if mobj.group('id'):
rf_id = mobj.group('id') rf_id = mobj.group('id')
request = self.RAINFOCUS_API_URL % 'session' request = self.RAINFOCUS_API_URL % 'session'
data = compat_urllib_parse_urlencode({'id': rf_id}) data = urlencode_postdata({'id': rf_id})
rf_result = self._download_json(request, rf_id, data=data, rf_result = self._download_json(request, rf_id, data=data, headers=headers)
headers=headers)
rf_item = self._check_bc_id_exists(try_get(rf_result, lambda x: x['items'][0], dict)) rf_item = self._check_bc_id_exists(try_get(rf_result, lambda x: x['items'][0], dict))
if not rf_item:
msg = 'Rain Focus JSON response did not return a Brightcove video ID'
raise ExtractorError(msg)
return self._parse_rf_item(rf_item) return self._parse_rf_item(rf_item)
else: else:
# Filter query URL (multiple videos) # Filter query URL (multiple videos)
rf_query = mobj.group('query') rf_query = compat_parse_qs((compat_urllib_parse_urlparse(url).query))
rf_query = str(rf_query + '&type=session&size=1000') rf_query['type'] = 'session'
rf_query['size'] = 1000
data = urlencode_postdata(rf_query)
request = self.RAINFOCUS_API_URL % 'search' request = self.RAINFOCUS_API_URL % 'search'
# Query JSON results offer no obvious way to ID the search # Query JSON results offer no obvious way to ID the search
rf_results = self._download_json(request, 'Filter query', rf_results = self._download_json(request, 'Filter query', data=data, headers=headers)
data=rf_query, headers=headers)
# Not all sessions have videos; filter them out before moving on # Not all sessions have videos; filter them out before moving on
rf_video_results = [ rf_video_results = [
rf_item rf_item
for rf_item in try_get(rf_results, lambda x: x['sectionList'][0]['items'], list) for rf_item in rf_results['sectionList'][0]['items']
if self._check_bc_id_exists(rf_item) if self._check_bc_id_exists(rf_item)
] ]
entries = [self._parse_rf_item(rf_item) for rf_item in rf_video_results] entries = [self._parse_rf_item(rf_item) for rf_item in rf_video_results]