youtube_dl/extractor/egghead.py

@@ -12,14 +12,7 @@ from ..utils import (
 )
 
 
-class EggheadBaseIE(InfoExtractor):
+class EggheadCourseIE(InfoExtractor):
-    def _call_api(self, path, video_id, resource, fatal=True):
-        return self._download_json(
-            'https://app.egghead.io/api/v1/' + path,
-            video_id, 'Downloading %s JSON' % resource, fatal=fatal)
-
-
-class EggheadCourseIE(EggheadBaseIE):
     IE_DESC = 'egghead.io course'
     IE_NAME = 'egghead:course'
     _VALID_URL = r'https://egghead\.io/courses/(?P<id>[^/?#&]+)'
@@ -35,9 +28,10 @@ class EggheadCourseIE(EggheadBaseIE):
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
-        series_path = 'series/' + playlist_id
+
-        lessons = self._call_api(
+        lessons = self._download_json(
-            series_path + '/lessons', playlist_id, 'course lessons')
+            'https://egghead.io/api/v1/series/%s/lessons' % playlist_id,
+            playlist_id, 'Downloading course lessons JSON')
 
         entries = []
         for lesson in lessons:
@@ -50,8 +44,9 @@ class EggheadCourseIE(EggheadBaseIE):
             entries.append(self.url_result(
                 lesson_url, ie=EggheadLessonIE.ie_key(), video_id=lesson_id))
 
-        course = self._call_api(
+        course = self._download_json(
-            series_path, playlist_id, 'course', False) or {}
+            'https://egghead.io/api/v1/series/%s' % playlist_id,
+            playlist_id, 'Downloading course JSON', fatal=False) or {}
 
         playlist_id = course.get('id')
         if playlist_id:
@@ -62,7 +57,7 @@ class EggheadCourseIE(EggheadBaseIE):
             course.get('description'))
 
 
-class EggheadLessonIE(EggheadBaseIE):
+class EggheadLessonIE(InfoExtractor):
     IE_DESC = 'egghead.io lesson'
     IE_NAME = 'egghead:lesson'
     _VALID_URL = r'https://egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)'
@@ -79,7 +74,7 @@ class EggheadLessonIE(EggheadBaseIE):
             'upload_date': '20161209',
             'duration': 304,
             'view_count': 0,
-            'tags': 'count:2',
+            'tags': ['javascript', 'free'],
         },
         'params': {
             'skip_download': True,
@@ -93,8 +88,8 @@ class EggheadLessonIE(EggheadBaseIE):
     def _real_extract(self, url):
         display_id = self._match_id(url)
 
-        lesson = self._call_api(
+        lesson = self._download_json(
-            'lessons/' + display_id, display_id, 'lesson')
+            'https://egghead.io/api/v1/lessons/%s' % display_id, display_id)
 
         lesson_id = compat_str(lesson['id'])
         title = lesson['title']