aboutsummaryrefslogtreecommitdiffstats
path: root/youtube_dl/extractor/arte.py
diff options
context:
space:
mode:
authorWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2018-01-14 00:50:11 +0100
committerWolfgang Wiedmeyer <wolfgit@wiedmeyer.de>2018-01-14 00:50:11 +0100
commitb382d0f71eeece4e6e1cc3662f3c89884d5ac05d (patch)
treee48661b9f1de2380d4bff94f416624827746abd7 /youtube_dl/extractor/arte.py
parent5020cb7e8233683ef7845fea1233a95f3f775a7b (diff)
parenta86922c4702e2c8538337124c5bf02a4b5f9aa4a (diff)
downloadyoutube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.zip
youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.tar.gz
youtube-dl-b382d0f71eeece4e6e1cc3662f3c89884d5ac05d.tar.bz2
Merge branch 'upstream'
Diffstat (limited to 'youtube_dl/extractor/arte.py')
-rw-r--r--youtube_dl/extractor/arte.py15
1 files changed, 10 insertions, 5 deletions
diff --git a/youtube_dl/extractor/arte.py b/youtube_dl/extractor/arte.py
index 5cde90c..ffc3218 100644
--- a/youtube_dl/extractor/arte.py
+++ b/youtube_dl/extractor/arte.py
@@ -6,6 +6,7 @@ import re
from .common import InfoExtractor
from ..compat import (
compat_parse_qs,
+ compat_str,
compat_urllib_parse_urlparse,
)
from ..utils import (
@@ -15,6 +16,7 @@ from ..utils import (
int_or_none,
NO_DEFAULT,
qualities,
+ try_get,
unified_strdate,
)
@@ -80,12 +82,15 @@ class ArteTVBaseIE(InfoExtractor):
info = self._download_json(json_url, video_id)
player_info = info['videoJsonPlayer']
- vsr = player_info['VSR']
-
+ vsr = try_get(player_info, lambda x: x['VSR'], dict)
if not vsr:
- raise ExtractorError(
- 'Video %s is not available' % player_info.get('VID') or video_id,
- expected=True)
+ error = None
+ if try_get(player_info, lambda x: x['custom_msg']['type']) == 'error':
+ error = try_get(
+ player_info, lambda x: x['custom_msg']['msg'], compat_str)
+ if not error:
+ error = 'Video %s is not available' % player_info.get('VID') or video_id
+ raise ExtractorError(error, expected=True)
upload_date_str = player_info.get('shootingDate')
if not upload_date_str: