]> gitweb @ CieloNegro.org - youtube-dl.git/commitdiff
[adn] Improve error reporting (#13663)
authorSergey M․ <dstftw@gmail.com>
Sun, 16 Jul 2017 13:48:09 +0000 (20:48 +0700)
committerSergey M․ <dstftw@gmail.com>
Sun, 16 Jul 2017 13:50:32 +0000 (20:50 +0700)
youtube_dl/extractor/adn.py

index 39f80b23f865681c3735054f5f5126208e3dd11b..cffdab6ca4a4488caf06aa73579e363a7ede8fd4 100644 (file)
@@ -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)