X-Git-Url: http://git.cielonegro.org/gitweb.cgi?a=blobdiff_plain;f=youtube_dl%2Fextractor%2Fudemy.py;h=f5b5e7fd6775b4194ca18265f4c78f639a5f092a;hb=18b0b23992b5ee4042967b63e366c937484e434e;hp=41097829df0e53f5e39c7aa6cc5894cedb492b78;hpb=4d402db52140458b1b4707c30fb01bb92861a8cc;p=youtube-dl.git

diff --git a/youtube_dl/extractor/udemy.py b/youtube_dl/extractor/udemy.py
index 41097829d..f5b5e7fd6 100644
--- a/youtube_dl/extractor/udemy.py
+++ b/youtube_dl/extractor/udemy.py
@@ -11,6 +11,7 @@ from ..utils import (
     float_or_none,
     int_or_none,
     sanitized_Request,
+    unescapeHTML,
 )
 
 
@@ -19,8 +20,6 @@ class UdemyIE(InfoExtractor):
     _VALID_URL = r'https?://www\.udemy\.com/(?:[^#]+#/lecture/|lecture/view/?\?lectureId=)(?P<id>\d+)'
     _LOGIN_URL = 'https://www.udemy.com/join/login-popup/?displayType=ajax&showSkipButton=1'
     _ORIGIN_URL = 'https://www.udemy.com'
-    _SUCCESSFULLY_ENROLLED = '>You have enrolled in this course!<'
-    _ALREADY_ENROLLED = '>You are already taking this course.<'
     _NETRC_MACHINE = 'udemy'
 
     _TESTS = [{
@@ -37,15 +36,21 @@ class UdemyIE(InfoExtractor):
     }]
 
     def _enroll_course(self, webpage, course_id):
-        enroll_url = self._search_regex(
+        checkout_url = unescapeHTML(self._search_regex(
+            r'href=(["\'])(?P<url>https?://(?:www\.)?udemy\.com/payment/checkout/.+?)\1',
+            webpage, 'checkout url', group='url', default=None))
+        if checkout_url:
+            raise ExtractorError(
+                'Course %s is not free. You have to pay for it before you can download. '
+                'Use this URL to confirm purchase: %s' % (course_id, checkout_url), expected=True)
+
+        enroll_url = unescapeHTML(self._search_regex(
             r'href=(["\'])(?P<url>https?://(?:www\.)?udemy\.com/course/subscribe/.+?)\1',
-            webpage, 'enroll url', group='url',
-            default='https://www.udemy.com/course/subscribe/?courseId=%s' % course_id)
-        webpage = self._download_webpage(enroll_url, course_id, 'Enrolling in the course')
-        if self._SUCCESSFULLY_ENROLLED in webpage:
-            self.to_screen('%s: Successfully enrolled in' % course_id)
-        elif self._ALREADY_ENROLLED in webpage:
-            self.to_screen('%s: Already enrolled in' % course_id)
+            webpage, 'enroll url', group='url', default=None))
+        if enroll_url:
+            webpage = self._download_webpage(enroll_url, course_id, 'Enrolling in the course')
+            if '>You have enrolled in' in webpage:
+                self.to_screen('%s: Successfully enrolled in the course' % course_id)
 
     def _download_lecture(self, course_id, lecture_id):
         return self._download_json(
@@ -245,7 +250,7 @@ class UdemyCourseIE(UdemyIE):
             course_id, 'Downloading course curriculum')
 
         entries = []
-        chapter, chapter_id = None, None
+        chapter, chapter_number = None, None
         for asset in response:
             asset_type = asset.get('assetType') or asset.get('asset_type')
             if asset_type == 'Video':
@@ -256,13 +261,13 @@ class UdemyCourseIE(UdemyIE):
                         'url': 'https://www.udemy.com/%s/#/lecture/%s' % (course_path, asset['id']),
                         'ie_key': UdemyIE.ie_key(),
                     }
-                    if chapter_id:
-                        entry['chapter_id'] = chapter_id
+                    if chapter_number:
+                        entry['chapter_number'] = chapter_number
                     if chapter:
                         entry['chapter'] = chapter
                     entries.append(entry)
             elif asset.get('type') == 'chapter':
-                chapter_id = asset.get('index') or asset.get('object_index')
+                chapter_number = asset.get('index') or asset.get('object_index')
                 chapter = asset.get('title')
 
         return self.playlist_result(entries, course_id, course_title)