debian/README.source: Add my preference with respect to patches.

[youtubedl] / youtube_dl / extractor / udemy.py

diff --git a/youtube_dl/extractor/udemy.py b/youtube_dl/extractor/udemy.py
index 89b86955913587c3c09474fdffaab8ad338bb26a..207c4a6a7ee8131c3e2e5d5823aefb336ad47c47 100644 (file)
--- a/youtube_dl/extractor/udemy.py
+++ b/youtube_dl/extractor/udemy.py
@@ -5,6 +5,7 @@ import re
 from .common import InfoExtractor
 from ..compat import (
     compat_HTTPError,
 from .common import InfoExtractor
 from ..compat import (
     compat_HTTPError,

+    compat_str,

     compat_urllib_request,
     compat_urlparse,
 )
     compat_urllib_request,
     compat_urlparse,
 )


@@ -14,6 +15,7 @@ from ..utils import (
     ExtractorError,
     float_or_none,
     int_or_none,
     ExtractorError,
     float_or_none,
     int_or_none,

+    js_to_json,

     sanitized_Request,
     unescapeHTML,
     urlencode_postdata,
     sanitized_Request,
     unescapeHTML,
     urlencode_postdata,


@@ -51,6 +53,10 @@ class UdemyIE(InfoExtractor):
         # new URL schema
         'url': 'https://www.udemy.com/electric-bass-right-from-the-start/learn/v4/t/lecture/4580906',
         'only_matching': True,
         # new URL schema
         'url': 'https://www.udemy.com/electric-bass-right-from-the-start/learn/v4/t/lecture/4580906',
         'only_matching': True,

+    }, {
+        # no url in outputs format entry
+        'url': 'https://www.udemy.com/learn-web-development-complete-step-by-step-guide-to-success/learn/v4/t/lecture/4125812',
+        'only_matching': True,

     }]
 
     def _extract_course_info(self, webpage, video_id):
     }]
 
     def _extract_course_info(self, webpage, video_id):


@@ -68,7 +74,7 @@ class UdemyIE(InfoExtractor):
             return compat_urlparse.urljoin(base_url, url) if not url.startswith('http') else url
 
         checkout_url = unescapeHTML(self._search_regex(
             return compat_urlparse.urljoin(base_url, url) if not url.startswith('http') else url
 
         checkout_url = unescapeHTML(self._search_regex(

-            r'href=(["\'])(?P<url>(?:https?://(?:www\.)?udemy\.com)?/payment/checkout/.+?)\1',
+            r'href=(["\'])(?P<url>(?:https?://(?:www\.)?udemy\.com)?/(?:payment|cart)/checkout/.+?)\1',

             webpage, 'checkout url', group='url', default=None))
         if checkout_url:
             raise ExtractorError(
             webpage, 'checkout url', group='url', default=None))
         if checkout_url:
             raise ExtractorError(


@@ -207,16 +213,19 @@ class UdemyIE(InfoExtractor):
             if youtube_url:
                 return self.url_result(youtube_url, 'Youtube')
 
             if youtube_url:
                 return self.url_result(youtube_url, 'Youtube')
 

-        video_id = asset['id']
+        video_id = compat_str(asset['id'])

         thumbnail = asset.get('thumbnail_url') or asset.get('thumbnailUrl')
         duration = float_or_none(asset.get('data', {}).get('duration'))
 
         thumbnail = asset.get('thumbnail_url') or asset.get('thumbnailUrl')
         duration = float_or_none(asset.get('data', {}).get('duration'))
 

+        subtitles = {}
+        automatic_captions = {}
+

         formats = []
 
         formats = []
 

-        def extract_output_format(src):
+        def extract_output_format(src, f_id):

             return {
             return {

-                'url': src['url'],
-                'format_id': '%sp' % (src.get('height') or format_id),
+                'url': src.get('url'),
+                'format_id': '%sp' % (src.get('height') or f_id),

                 'width': int_or_none(src.get('width')),
                 'height': int_or_none(src.get('height')),
                 'vbr': int_or_none(src.get('video_bitrate_in_kbps')),
                 'width': int_or_none(src.get('width')),
                 'height': int_or_none(src.get('height')),
                 'vbr': int_or_none(src.get('video_bitrate_in_kbps')),


@@ -236,30 +245,52 @@ class UdemyIE(InfoExtractor):
         def add_output_format_meta(f, key):
             output = outputs.get(key)
             if isinstance(output, dict):
         def add_output_format_meta(f, key):
             output = outputs.get(key)
             if isinstance(output, dict):

-                output_format = extract_output_format(output)
+                output_format = extract_output_format(output, key)

                 output_format.update(f)
                 return output_format
             return f
 
                 output_format.update(f)
                 return output_format
             return f
 

+        def extract_formats(source_list):
+            if not isinstance(source_list, list):
+                return
+            for source in source_list:
+                video_url = source.get('file') or source.get('src')
+                if not video_url or not isinstance(video_url, compat_str):
+                    continue
+                format_id = source.get('label')
+                f = {
+                    'url': video_url,
+                    'format_id': '%sp' % format_id,
+                    'height': int_or_none(format_id),
+                }
+                if format_id:
+                    # Some videos contain additional metadata (e.g.
+                    # https://www.udemy.com/ios9-swift/learn/#/lecture/3383208)
+                    f = add_output_format_meta(f, format_id)
+                formats.append(f)
+
+        def extract_subtitles(track_list):
+            if not isinstance(track_list, list):
+                return
+            for track in track_list:
+                if not isinstance(track, dict):
+                    continue
+                if track.get('kind') != 'captions':
+                    continue
+                src = track.get('src')
+                if not src or not isinstance(src, compat_str):
+                    continue
+                lang = track.get('language') or track.get(
+                    'srclang') or track.get('label')
+                sub_dict = automatic_captions if track.get(
+                    'autogenerated') is True else subtitles
+                sub_dict.setdefault(lang, []).append({
+                    'url': src,
+                })
+

         download_urls = asset.get('download_urls')
         if isinstance(download_urls, dict):
         download_urls = asset.get('download_urls')
         if isinstance(download_urls, dict):

-            video = download_urls.get('Video')
-            if isinstance(video, list):
-                for format_ in video:
-                    video_url = format_.get('file')
-                    if not video_url:
-                        continue
-                    format_id = format_.get('label')
-                    f = {
-                        'url': format_['file'],
-                        'format_id': '%sp' % format_id,
-                        'height': int_or_none(format_id),
-                    }
-                    if format_id:
-                        # Some videos contain additional metadata (e.g.
-                        # https://www.udemy.com/ios9-swift/learn/#/lecture/3383208)
-                        f = add_output_format_meta(f, format_id)
-                    formats.append(f)
+            extract_formats(download_urls.get('Video'))

 
         view_html = lecture.get('view_html')
         if view_html:
 
         view_html = lecture.get('view_html')
         if view_html:


@@ -293,6 +324,28 @@ class UdemyIE(InfoExtractor):
                         'height': height,
                     }, res))
 
                         'height': height,
                     }, res))
 

+            # react rendition since 2017.04.15 (see
+            # https://github.com/rg3/youtube-dl/issues/12744)
+            data = self._parse_json(
+                self._search_regex(
+                    r'videojs-setup-data=(["\'])(?P<data>{.+?})\1', view_html,
+                    'setup data', default='{}', group='data'), video_id,
+                transform_source=unescapeHTML, fatal=False)
+            if data and isinstance(data, dict):
+                extract_formats(data.get('sources'))
+                if not duration:
+                    duration = int_or_none(data.get('duration'))
+                extract_subtitles(data.get('tracks'))
+
+            if not subtitles and not automatic_captions:
+                text_tracks = self._parse_json(
+                    self._search_regex(
+                        r'text-tracks=(["\'])(?P<data>\[.+?\])\1', view_html,
+                        'text tracks', default='{}', group='data'), video_id,
+                    transform_source=lambda s: js_to_json(unescapeHTML(s)),
+                    fatal=False)
+                extract_subtitles(text_tracks)
+

         self._sort_formats(formats, field_preference=('height', 'width', 'tbr', 'format_id'))
 
         return {
         self._sort_formats(formats, field_preference=('height', 'width', 'tbr', 'format_id'))
 
         return {


@@ -301,13 +354,15 @@ class UdemyIE(InfoExtractor):
             'description': description,
             'thumbnail': thumbnail,
             'duration': duration,
             'description': description,
             'thumbnail': thumbnail,
             'duration': duration,

-            'formats': formats
+            'formats': formats,
+            'subtitles': subtitles,
+            'automatic_captions': automatic_captions,

         }
 
 
 class UdemyCourseIE(UdemyIE):
     IE_NAME = 'udemy:course'
         }
 
 
 class UdemyCourseIE(UdemyIE):
     IE_NAME = 'udemy:course'

-    _VALID_URL = r'https?://www\.udemy\.com/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:www\.)?udemy\.com/(?P<id>[^/?#&]+)'

     _TESTS = []
 
     @classmethod
     _TESTS = []
 
     @classmethod