projects
/
youtube-dl
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
09b412d
)
[vessel] Use `main_video_asset` when searching for video_asset (Fixes #5623)
author
Naglis Jonaitis
<njonaitis@gmail.com>
Thu, 7 May 2015 18:58:03 +0000
(21:58 +0300)
committer
Naglis Jonaitis
<njonaitis@gmail.com>
Thu, 7 May 2015 19:00:07 +0000
(22:00 +0300)
youtube_dl/extractor/vessel.py
patch
|
blob
|
history
diff --git
a/youtube_dl/extractor/vessel.py
b/youtube_dl/extractor/vessel.py
index 6215f06420554d424fa82b0a07fd51d13173dc87..3c8d2a9437af3021df921f5692ad5ae984b14ead 100644
(file)
--- a/
youtube_dl/extractor/vessel.py
+++ b/
youtube_dl/extractor/vessel.py
@@
-38,9
+38,13
@@
class VesselIE(InfoExtractor):
return req
@staticmethod
return req
@staticmethod
- def find_assets(data, asset_type):
+ def find_assets(data, asset_type
, asset_id=None
):
for asset in data.get('assets', []):
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):
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)
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:
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')
except StopIteration:
raise ExtractorError('No video assets found')