diff options
| author | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-09-12 13:14:44 +0200 |
|---|---|---|
| committer | Wolfgang Wiedmeyer <wolfgit@wiedmeyer.de> | 2017-09-12 13:14:44 +0200 |
| commit | 6a19bfa390150fde01f5e865605114344ab68409 (patch) | |
| tree | d87e9c55f031b529d6a6c2ca1a1e680407800f52 /youtube_dl/extractor/adn.py | |
| parent | 57e25a9c8a4791a370af77a3529d15c958eae4b3 (diff) | |
| parent | 2f483758bc6a6661f1215c38161ee626d90ab655 (diff) | |
| download | youtube-dl-6a19bfa390150fde01f5e865605114344ab68409.zip youtube-dl-6a19bfa390150fde01f5e865605114344ab68409.tar.gz youtube-dl-6a19bfa390150fde01f5e865605114344ab68409.tar.bz2 | |
Merge branch 'upstream'
Diffstat (limited to 'youtube_dl/extractor/adn.py')
| -rw-r--r-- | youtube_dl/extractor/adn.py | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/youtube_dl/extractor/adn.py b/youtube_dl/extractor/adn.py index 39f80b2..cffdab6 100644 --- a/youtube_dl/extractor/adn.py +++ b/youtube_dl/extractor/adn.py @@ -107,11 +107,13 @@ class ADNIE(InfoExtractor): metas = options.get('metas') or {} title = metas.get('title') or video_info['title'] links = player_config.get('links') or {} + error = None if not links: links_url = player_config['linksurl'] links_data = self._download_json(urljoin( self._BASE_URL, links_url), video_id) links = links_data.get('links') or {} + error = links_data.get('error') formats = [] for format_id, qualities in links.items(): @@ -130,7 +132,8 @@ class ADNIE(InfoExtractor): for f in m3u8_formats: f['language'] = 'fr' formats.extend(m3u8_formats) - error = options.get('error') + if not error: + error = options.get('error') if not formats and error: raise ExtractorError('%s said: %s' % (self.IE_NAME, error), expected=True) self._sort_formats(formats) |