Update upstream source from tag 'upstream/2019.01.17'

[youtubedl] / youtube_dl / extractor / viidea.py

diff --git a/youtube_dl/extractor/viidea.py b/youtube_dl/extractor/viidea.py
index 525e303d4340c7db11a2c3c94cd4153e95e8b2c0..a0abbae60fee59fda14d8cf7ac5a235a3df7472d 100644 (file)
--- a/youtube_dl/extractor/viidea.py
+++ b/youtube_dl/extractor/viidea.py
@@ -4,18 +4,20 @@ import re
 
 from .common import InfoExtractor
 from ..compat import (
 
 from .common import InfoExtractor
 from ..compat import (

-    compat_urlparse,
+    compat_HTTPError,

     compat_str,
     compat_str,

+    compat_urlparse,

 )
 from ..utils import (
 )
 from ..utils import (

-    parse_duration,
+    ExtractorError,

     js_to_json,
     js_to_json,

+    parse_duration,

     parse_iso8601,
 )
 
 
 class ViideaIE(InfoExtractor):
     parse_iso8601,
 )
 
 
 class ViideaIE(InfoExtractor):

-    _VALID_URL = r'''(?x)http://(?:www\.)?(?:
+    _VALID_URL = r'''(?x)https?://(?:www\.)?(?:

             videolectures\.net|
             flexilearn\.viidea\.net|
             presentations\.ocwconsortium\.org|
             videolectures\.net|
             flexilearn\.viidea\.net|
             presentations\.ocwconsortium\.org|


@@ -40,11 +42,15 @@ class ViideaIE(InfoExtractor):
             'ext': 'mp4',
             'title': 'Automatics, robotics and biocybernetics',
             'description': 'md5:815fc1deb6b3a2bff99de2d5325be482',
             'ext': 'mp4',
             'title': 'Automatics, robotics and biocybernetics',
             'description': 'md5:815fc1deb6b3a2bff99de2d5325be482',

-            'thumbnail': 're:http://.*\.jpg',
+            'thumbnail': r're:http://.*\.jpg',

             'timestamp': 1372349289,
             'upload_date': '20130627',
             'duration': 565,
         },
             'timestamp': 1372349289,
             'upload_date': '20130627',
             'duration': 565,
         },

+        'params': {
+            # m3u8 download
+            'skip_download': True,
+        },

     }, {
         # video with invalid direct format links (HTTP 403)
         'url': 'http://videolectures.net/russir2010_filippova_nlp/',
     }, {
         # video with invalid direct format links (HTTP 403)
         'url': 'http://videolectures.net/russir2010_filippova_nlp/',


@@ -54,7 +60,7 @@ class ViideaIE(InfoExtractor):
             'ext': 'flv',
             'title': 'NLP at Google',
             'description': 'md5:fc7a6d9bf0302d7cc0e53f7ca23747b3',
             'ext': 'flv',
             'title': 'NLP at Google',
             'description': 'md5:fc7a6d9bf0302d7cc0e53f7ca23747b3',

-            'thumbnail': 're:http://.*\.jpg',
+            'thumbnail': r're:http://.*\.jpg',

             'timestamp': 1284375600,
             'upload_date': '20100913',
             'duration': 5352,
             'timestamp': 1284375600,
             'upload_date': '20100913',
             'duration': 5352,


@@ -70,7 +76,7 @@ class ViideaIE(InfoExtractor):
             'id': '23181',
             'title': 'Deep Learning Summer School, Montreal 2015',
             'description': 'md5:0533a85e4bd918df52a01f0e1ebe87b7',
             'id': '23181',
             'title': 'Deep Learning Summer School, Montreal 2015',
             'description': 'md5:0533a85e4bd918df52a01f0e1ebe87b7',

-            'thumbnail': 're:http://.*\.jpg',
+            'thumbnail': r're:http://.*\.jpg',

             'timestamp': 1438560000,
         },
         'playlist_count': 30,
             'timestamp': 1438560000,
         },
         'playlist_count': 30,


@@ -81,7 +87,7 @@ class ViideaIE(InfoExtractor):
             'id': '9737',
             'display_id': 'mlss09uk_bishop_ibi',
             'title': 'Introduction To Bayesian Inference',
             'id': '9737',
             'display_id': 'mlss09uk_bishop_ibi',
             'title': 'Introduction To Bayesian Inference',

-            'thumbnail': 're:http://.*\.jpg',
+            'thumbnail': r're:http://.*\.jpg',

             'timestamp': 1251622800,
         },
         'playlist': [{
             'timestamp': 1251622800,
         },
         'playlist': [{


@@ -90,7 +96,7 @@ class ViideaIE(InfoExtractor):
                 'display_id': 'mlss09uk_bishop_ibi_part1',
                 'ext': 'wmv',
                 'title': 'Introduction To Bayesian Inference (Part 1)',
                 'display_id': 'mlss09uk_bishop_ibi_part1',
                 'ext': 'wmv',
                 'title': 'Introduction To Bayesian Inference (Part 1)',

-                'thumbnail': 're:http://.*\.jpg',
+                'thumbnail': r're:http://.*\.jpg',

                 'duration': 4622,
                 'timestamp': 1251622800,
                 'upload_date': '20090830',
                 'duration': 4622,
                 'timestamp': 1251622800,
                 'upload_date': '20090830',


@@ -101,7 +107,7 @@ class ViideaIE(InfoExtractor):
                 'display_id': 'mlss09uk_bishop_ibi_part2',
                 'ext': 'wmv',
                 'title': 'Introduction To Bayesian Inference (Part 2)',
                 'display_id': 'mlss09uk_bishop_ibi_part2',
                 'ext': 'wmv',
                 'title': 'Introduction To Bayesian Inference (Part 2)',

-                'thumbnail': 're:http://.*\.jpg',
+                'thumbnail': r're:http://.*\.jpg',

                 'duration': 5641,
                 'timestamp': 1251622800,
                 'upload_date': '20090830',
                 'duration': 5641,
                 'timestamp': 1251622800,
                 'upload_date': '20090830',


@@ -124,9 +130,16 @@ class ViideaIE(InfoExtractor):
 
         base_url = self._proto_relative_url(cfg['livepipe'], 'http:')
 
 
         base_url = self._proto_relative_url(cfg['livepipe'], 'http:')
 

-        lecture_data = self._download_json(
-            '%s/site/api/lecture/%s?format=json' % (base_url, lecture_id),
-            lecture_id)['lecture'][0]
+        try:
+            lecture_data = self._download_json(
+                '%s/site/api/lecture/%s?format=json' % (base_url, lecture_id),
+                lecture_id)['lecture'][0]
+        except ExtractorError as e:
+            if isinstance(e.cause, compat_HTTPError) and e.cause.code == 403:
+                msg = self._parse_json(
+                    e.cause.read().decode('utf-8'), lecture_id)
+                raise ExtractorError(msg['detail'], expected=True)
+            raise

 
         lecture_info = {
             'id': lecture_id,
 
         lecture_info = {
             'id': lecture_id,


@@ -147,6 +160,7 @@ class ViideaIE(InfoExtractor):
                 smil_url = '%s/%s/video/%s/smil.xml' % (base_url, lecture_slug, part_id)
                 smil = self._download_smil(smil_url, lecture_id)
                 info = self._parse_smil(smil, smil_url, lecture_id)
                 smil_url = '%s/%s/video/%s/smil.xml' % (base_url, lecture_slug, part_id)
                 smil = self._download_smil(smil_url, lecture_id)
                 info = self._parse_smil(smil, smil_url, lecture_id)

+                self._sort_formats(info['formats'])

                 info['id'] = lecture_id if not multipart else '%s_part%s' % (lecture_id, part_id)
                 info['display_id'] = lecture_slug if not multipart else '%s_part%s' % (lecture_slug, part_id)
                 if multipart:
                 info['id'] = lecture_id if not multipart else '%s_part%s' % (lecture_id, part_id)
                 info['display_id'] = lecture_slug if not multipart else '%s_part%s' % (lecture_slug, part_id)
                 if multipart: