[misc] Add `hatch`, `ruff`, `pre-commit` and improve dev docs (#7409)

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

diff --git a/yt_dlp/extractor/jamendo.py b/yt_dlp/extractor/jamendo.py
index 5dc2c25e6a81a6188096a5dda6d4c0dc873acca4..8557a81ad454f89224b420124b4c118be92bd539 100644 (file)
--- a/yt_dlp/extractor/jamendo.py
+++ b/yt_dlp/extractor/jamendo.py
@@ -1,8 +1,8 @@
 import hashlib
 import random
 
-from ..compat import compat_str
 from .common import InfoExtractor
+from ..compat import compat_str
 from ..utils import (
     clean_html,
     int_or_none,
@@ -28,10 +28,11 @@ class JamendoIE(InfoExtractor):
             'ext': 'flac',
             # 'title': 'Maya Filipič - Stories from Emona I',
             'title': 'Stories from Emona I',
-            # 'artist': 'Maya Filipič',
+            'artist': 'Maya Filipič',
+            'album': 'Between two worlds',
             'track': 'Stories from Emona I',
             'duration': 210,
-            'thumbnail': r're:^https?://.*\.jpg',
+            'thumbnail': 'https://usercontent.jamendo.com?type=album&id=29279&width=300&trackid=196219',
             'timestamp': 1217438117,
             'upload_date': '20080730',
             'license': 'by-nc-nd',
@@ -45,11 +46,11 @@ class JamendoIE(InfoExtractor):
         'only_matching': True,
     }]
 
-    def _call_api(self, resource, resource_id):
+    def _call_api(self, resource, resource_id, fatal=True):
         path = '/api/%ss' % resource
         rand = compat_str(random.random())
         return self._download_json(
-            'https://www.jamendo.com' + path, resource_id, query={
+            'https://www.jamendo.com' + path, resource_id, fatal=fatal, query={
                 'id[]': resource_id,
             }, headers={
                 'X-Jam-Call': '$%s*%s~' % (hashlib.sha1((path + rand).encode()).hexdigest(), rand)
@@ -71,6 +72,8 @@ def _real_extract(self, url):
         # if artist_name:
         #     title = '%s - %s' % (artist_name, title)
         # album = get_model('album')
+        artist = self._call_api("artist", track.get('artistId'), fatal=False)
+        album = self._call_api("album", track.get('albumId'), fatal=False)
 
         formats = [{
             'url': 'https://%s.jamendo.com/?trackid=%s&format=%s&from=app-97dab294'
@@ -84,7 +87,6 @@ def _real_extract(self, url):
             ('ogg1', 'ogg', 'ogg'),
             ('flac', 'flac', 'flac'),
         ))]
-        self._sort_formats(formats)
 
         urls = []
         thumbnails = []
@@ -118,9 +120,9 @@ def _real_extract(self, url):
             'title': title,
             'description': track.get('description'),
             'duration': int_or_none(track.get('duration')),
-            # 'artist': artist_name,
+            'artist': artist.get('name'),
             'track': track_name,
-            # 'album': album.get('name'),
+            'album': album.get('name'),
             'formats': formats,
             'license': '-'.join(license) if license else None,
             'timestamp': int_or_none(track.get('dateCreated')),
@@ -131,7 +133,7 @@ def _real_extract(self, url):
         }
 
 
-class JamendoAlbumIE(JamendoIE):
+class JamendoAlbumIE(JamendoIE):  # XXX: Do not subclass from concrete IE
     _VALID_URL = r'https?://(?:www\.)?jamendo\.com/album/(?P<id>[0-9]+)'
     _TESTS = [{
         'url': 'https://www.jamendo.com/album/121486/duck-on-cover',
@@ -145,22 +147,38 @@ class JamendoAlbumIE(JamendoIE):
             'info_dict': {
                 'id': '1032333',
                 'ext': 'flac',
-                'title': 'Shearer - Warmachine',
+                'title': 'Warmachine',
                 'artist': 'Shearer',
                 'track': 'Warmachine',
                 'timestamp': 1368089771,
                 'upload_date': '20130509',
+                'view_count': int,
+                'thumbnail': 'https://usercontent.jamendo.com?type=album&id=121486&width=300&trackid=1032333',
+                'duration': 190,
+                'license': 'by',
+                'album': 'Duck On Cover',
+                'average_rating': 4,
+                'tags': ['rock', 'drums', 'bass', 'world', 'punk', 'neutral'],
+                'like_count': int,
             }
         }, {
             'md5': '1f358d7b2f98edfe90fd55dac0799d50',
             'info_dict': {
                 'id': '1032330',
                 'ext': 'flac',
-                'title': 'Shearer - Without Your Ghost',
+                'title': 'Without Your Ghost',
                 'artist': 'Shearer',
                 'track': 'Without Your Ghost',
                 'timestamp': 1368089771,
                 'upload_date': '20130509',
+                'duration': 192,
+                'tags': ['rock', 'drums', 'bass', 'world', 'punk'],
+                'album': 'Duck On Cover',
+                'thumbnail': 'https://usercontent.jamendo.com?type=album&id=121486&width=300&trackid=1032330',
+                'view_count': int,
+                'average_rating': 4,
+                'license': 'by',
+                'like_count': int,
             }
         }],
         'params': {