xZero707/youtube-dl
1
0
Fork 0
mirror of https://github.com/ytdl-org/youtube-dl.git synced 2024-11-23 19:35:19 +01:00
Code Issues Packages Projects Releases Wiki Activity

[vessel] Use main_video_asset when searching for video_asset (Fixes #5623)

Browse Source
This commit is contained in:
Naglis Jonaitis 2015-05-07 21:58:03 +03:00
parent 09b412dafa
commit 46be82b811
1 changed files with 9 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
youtube_dl/extractor/vessel.py
View File

@ -38,9 +38,13 @@ class VesselIE(InfoExtractor):
return req
@staticmethod
def find_assets(data, asset_type):
def find_assets(data, asset_type, asset_id=None):
for asset in data.get('assets', []):
if asset.get('type') == asset_type:
if not asset.get('type') == asset_type:
continue
elif asset_id is not None and not asset.get('id') == asset_id:
continue
else:
yield asset
def _check_access_rights(self, data):
@ -82,11 +86,13 @@ class VesselIE(InfoExtractor):
req = VesselIE.make_json_request(
self._API_URL_TEMPLATE % asset_id, {'client': 'web'})
data = self._download_json(req, video_id)
video_asset_id = data.get('main_video_asset')
self._check_access_rights(data)
try:
video_asset = next(VesselIE.find_assets(data, 'video'))
video_asset = next(
VesselIE.find_assets(data, 'video', asset_id=video_asset_id))
except StopIteration:
raise ExtractorError('No video assets found')