[ie/matchtv] Fix extractor (#10190)

[yt-dlp.git] / yt_dlp / extractor / egghead.py

diff --git a/yt_dlp/extractor/egghead.py b/yt_dlp/extractor/egghead.py
index 22123e5d44660ffe2865da0fe1a8822b3dd666cc..62d2e544c9efab1ab46ffebe67522ebf55f98c65 100644 (file)
--- a/yt_dlp/extractor/egghead.py
+++ b/yt_dlp/extractor/egghead.py
@@ -1,8 +1,4 @@
-# coding: utf-8
-from __future__ import unicode_literals
-
 from .common import InfoExtractor
-from ..compat import compat_str
 from ..utils import (
     determine_ext,
     int_or_none,
@@ -16,22 +12,25 @@ class EggheadBaseIE(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)
+            video_id, f'Downloading {resource} JSON', fatal=fatal)
 
 
 class EggheadCourseIE(EggheadBaseIE):
     IE_DESC = 'egghead.io course'
     IE_NAME = 'egghead:course'
-    _VALID_URL = r'https://egghead\.io/courses/(?P<id>[^/?#&]+)'
-    _TEST = {
+    _VALID_URL = r'https?://(?:app\.)?egghead\.io/(?:course|playlist)s/(?P<id>[^/?#&]+)'
+    _TESTS = [{
         'url': 'https://egghead.io/courses/professor-frisby-introduces-composable-functional-javascript',
         'playlist_count': 29,
         'info_dict': {
-            'id': '72',
+            'id': '432655',
             'title': 'Professor Frisby Introduces Composable Functional JavaScript',
             'description': 're:(?s)^This course teaches the ubiquitous.*You\'ll start composing functionality before you know it.$',
         },
-    }
+    }, {
+        'url': 'https://app.egghead.io/playlists/professor-frisby-introduces-composable-functional-javascript',
+        'only_matching': True,
+    }]
 
     def _real_extract(self, url):
         playlist_id = self._match_id(url)
@@ -46,7 +45,7 @@ def _real_extract(self, url):
                 continue
             lesson_id = lesson.get('id')
             if lesson_id:
-                lesson_id = compat_str(lesson_id)
+                lesson_id = str(lesson_id)
             entries.append(self.url_result(
                 lesson_url, ie=EggheadLessonIE.ie_key(), video_id=lesson_id))
 
@@ -55,7 +54,7 @@ def _real_extract(self, url):
 
         playlist_id = course.get('id')
         if playlist_id:
-            playlist_id = compat_str(playlist_id)
+            playlist_id = str(playlist_id)
 
         return self.playlist_result(
             entries, playlist_id, course.get('title'),
@@ -65,7 +64,7 @@ def _real_extract(self, url):
 class EggheadLessonIE(EggheadBaseIE):
     IE_DESC = 'egghead.io lesson'
     IE_NAME = 'egghead:lesson'
-    _VALID_URL = r'https://egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)'
+    _VALID_URL = r'https?://(?:app\.)?egghead\.io/(?:api/v1/)?lessons/(?P<id>[^/?#&]+)'
     _TESTS = [{
         'url': 'https://egghead.io/lessons/javascript-linear-data-flow-with-container-style-types-box',
         'info_dict': {
@@ -83,11 +82,13 @@ class EggheadLessonIE(EggheadBaseIE):
         },
         'params': {
             'skip_download': True,
-            'format': 'bestvideo',
         },
     }, {
         'url': 'https://egghead.io/api/v1/lessons/react-add-redux-to-a-react-application',
         'only_matching': True,
+    }, {
+        'url': 'https://app.egghead.io/lessons/javascript-linear-data-flow-with-container-style-types-box',
+        'only_matching': True,
     }]
 
     def _real_extract(self, url):
@@ -96,7 +97,7 @@ def _real_extract(self, url):
         lesson = self._call_api(
             'lessons/' + display_id, display_id, 'lesson')
 
-        lesson_id = compat_str(lesson['id'])
+        lesson_id = str(lesson['id'])
         title = lesson['title']
 
         formats = []
@@ -115,7 +116,6 @@ def _real_extract(self, url):
                 formats.append({
                     'url': format_url,
                 })
-        self._sort_formats(formats)
 
         return {
             'id': lesson_id,
@@ -128,6 +128,6 @@ def _real_extract(self, url):
             'view_count': int_or_none(lesson.get('plays_count')),
             'tags': try_get(lesson, lambda x: x['tag_list'], list),
             'series': try_get(
-                lesson, lambda x: x['series']['title'], compat_str),
+                lesson, lambda x: x['series']['title'], str),
             'formats': formats,
         }