yt_dlp/extractor/duoplay.py

@@ -49,8 +49,9 @@ class DuoplayIE(InfoExtractor):
             'series_id': '17',
             'season': 'Season 2',
             'season_number': 2,
+            'episode': None,
+            'episode_number': None,
             'episode_id': 14,
-            'release_year': 2010,
         },
     }, {
         'note': 'Movie',
@@ -65,22 +66,13 @@ class DuoplayIE(InfoExtractor):
             'cast': ['Jennifer Lawrence', 'Josh Hutcherson', 'Liam Hemsworth'],
             'upload_date': '20231109',
             'timestamp': 1699552800,
-            'release_year': 2012,
-        },
-    }, {
-        'note': 'Movie without expiry',
-        'url': 'https://duoplay.ee/5501/pilvede-all.-neljas-ode',
-        'md5': '7abf63d773a49ef7c39f2c127842b8fd',
-        'info_dict': {
-            'id': '5501',
-            'ext': 'mp4',
-            'title': 'Pilvede all. Neljas õde',
-            'thumbnail': r're:https://.+\.jpg(?:\?c=\d+)?$',
-            'description': 'md5:d86a70f8f31e82c369d4d4f4c79b1279',
-            'cast': ['Inga Lunge', 'Elisabet Reinsalu', 'Liis Haab', 'Rita Rätsepp', 'Ain Lutsepp', 'Indrek Sammul', 'Piret Rauk', 'Karin Tammaru', 'Guido Kangur'],
-            'upload_date': '20221214',
-            'timestamp': 1671054000,
-            'release_year': 2018,
+            'series': 'Näljamängud',
+            'series_id': '4325',
+            'season': 'Season 1',
+            'season_number': 1,
+            'episode': 'Episode 0',
+            'episode_number': 0,
+            'episode_id': 0,
         },
     }]
 
@@ -97,22 +89,19 @@ class DuoplayIE(InfoExtractor):
 
         return {
             'id': video_id,
+            'title': episode_attr.get('title') if episode_attr.get('category') == 'movies' else (
+                traverse_obj(episode_attr, 'subtitle', ('episode_nr', {lambda x: f'Episode {x}' if x else None}), 'title')),
             'formats': self._extract_m3u8_formats(video_player['manifest-url'], video_id, 'mp4'),
             **traverse_obj(episode_attr, {
-                'title': 'title',
                 'description': 'synopsis',
                 'thumbnail': ('images', 'original'),
                 'timestamp': ('airtime', {lambda x: unified_timestamp(x + ' +0200')}),
-                'cast': ('cast', {lambda x: x.split(', ')}),
-                'release_year': ('year', {int_or_none}),
-            }),
-            **(traverse_obj(episode_attr, {
-                'title': (None, ('subtitle', ('episode_nr', {lambda x: f'Episode {x}' if x else None}))),
                 'series': 'title',
                 'series_id': ('telecast_id', {str_or_none}),
                 'season_number': ('season_id', {int_or_none}),
                 'episode': 'subtitle',
                 'episode_number': ('episode_nr', {int_or_none}),
                 'episode_id': ('episode_id', {int_or_none}),
-            }, get_all=False) if episode_attr.get('category') != 'movies' else {}),
+                'cast': ('cast', {lambda x: x.split(', ')}),
+            }),
         }