Update

tests/fixtures/clients.py

@@ -0,0 +1,24 @@
+import hashlib
+import os
+
+import pytest
+from util import arun
+
+from streamrip.config import Config
+from streamrip.qobuz_client import QobuzClient
+
+
+@pytest.fixture(scope="session")
+def qobuz_client():
+    config = Config.defaults()
+    config.session.qobuz.email_or_userid = os.environ["QOBUZ_EMAIL"]
+    config.session.qobuz.password_or_token = hashlib.md5(
+        os.environ["QOBUZ_PASSWORD"].encode("utf-8")
+    ).hexdigest()
+    if "QOBUZ_APP_ID" in os.environ and "QOBUZ_SECRETS" in os.environ:
+        config.session.qobuz.app_id = os.environ["QOBUZ_APP_ID"]
+        config.session.qobuz.secrets = os.environ["QOBUZ_SECRETS"].split(",")
+    client = QobuzClient(config)
+    arun(client.login())
+
+    return client

tests/fixtures/config.py

@@ -0,0 +1,16 @@
+import hashlib
+import os
+
+import pytest
+
+from streamrip.config import Config
+
+
+@pytest.fixture
+def config():
+    c = Config.defaults()
+    c.session.qobuz.email_or_userid = os.environ["QOBUZ_EMAIL"]
+    c.session.qobuz.password_or_token = hashlib.md5(
+        os.environ["QOBUZ_PASSWORD"].encode("utf-8")
+    ).hexdigest()
+    return c

tests/fixtures/util.py

@@ -0,0 +1,17 @@
+import asyncio
+
+loop = asyncio.new_event_loop()
+
+
+def arun(coro):
+    return loop.run_until_complete(coro)
+
+
+def afor(async_gen):
+    async def _afor(async_gen):
+        l = []
+        async for item in async_gen:
+            l.append(item)
+        return l
+
+    return arun(_afor(async_gen))

tests/qobuz_album_resp.json

@@ -0,0 +1,103 @@
+{
+  "maximum_bit_depth": 24,
+  "image": {
+    "small": "https://static.qobuz.com/images/covers/32/10/0603497941032_230.jpg",
+    "thumbnail": "https://static.qobuz.com/images/covers/32/10/0603497941032_50.jpg",
+    "large": "https://static.qobuz.com/images/covers/32/10/0603497941032_600.jpg",
+    "back": null
+  },
+  "media_count": 1,
+  "artist": {
+    "image": null,
+    "name": "Fleetwood Mac",
+    "id": 132127,
+    "albums_count": 424,
+    "slug": "fleetwood-mac",
+    "picture": null
+  },
+  "artists": [
+    { "id": 132127, "name": "Fleetwood Mac", "roles": ["main-artist"] }
+  ],
+  "upc": "0603497941032",
+  "released_at": 223858800,
+  "label": {
+    "name": "Rhino - Warner Records",
+    "id": 323970,
+    "albums_count": 3002,
+    "supplier_id": 5,
+    "slug": "rhino-warner-records"
+  },
+  "title": "Rumours",
+  "qobuz_id": 19512572,
+  "version": "2001 Remaster",
+  "url": "https://www.qobuz.com/fr-fr/album/rumours-fleetwood-mac/0603497941032",
+  "duration": 2387,
+  "parental_warning": false,
+  "popularity": 0,
+  "tracks_count": 11,
+  "genre": {
+    "path": [112, 119],
+    "color": "#5eabc1",
+    "name": "Rock",
+    "id": 119,
+    "slug": "rock"
+  },
+  "maximum_channel_count": 2,
+  "id": "0603497941032",
+  "maximum_sampling_rate": 96,
+  "articles": [],
+  "release_date_original": "1977-02-04",
+  "release_date_download": "1977-02-04",
+  "release_date_stream": "1977-02-04",
+  "purchasable": true,
+  "streamable": true,
+  "previewable": true,
+  "sampleable": true,
+  "downloadable": true,
+  "displayable": true,
+  "purchasable_at": 1693551600,
+  "streamable_at": 1690354800,
+  "hires": true,
+  "hires_streamable": true,
+  "awards": [
+    {
+      "name": "The Qobuz Ideal Discography",
+      "slug": "qobuz",
+      "award_slug": "discotheque_ideale",
+      "awarded_at": 1420066800,
+      "award_id": "70",
+      "publication_id": "2",
+      "publication_name": "Qobuz",
+      "publication_slug": "qobuz"
+    }
+  ],
+  "goodies": [],
+  "area": null,
+  "catchline": "",
+  "composer": {
+    "id": 573076,
+    "name": "Various Composers",
+    "slug": "various-composers",
+    "albums_count": 583621,
+    "picture": null,
+    "image": null
+  },
+  "created_at": 0,
+  "genres_list": ["Pop/Rock", "Pop/Rock\u2192Rock"],
+  "period": null,
+  "copyright": "\u00a9 1977 Warner Records Inc. \u2117 1977 Warner Records Inc. Marketed by Rhino Entertainment Company, A Warner Music Group Company.",
+  "is_official": true,
+  "maximum_technical_specifications": "24 bits / 96.0 kHz - Stereo",
+  "product_sales_factors_monthly": 0,
+  "product_sales_factors_weekly": 0,
+  "product_sales_factors_yearly": 0,
+  "product_type": "album",
+  "product_url": "/fr-fr/album/rumours-fleetwood-mac/0603497941032",
+  "recording_information": "",
+  "relative_url": "/album/rumours-fleetwood-mac/0603497941032",
+  "release_tags": ["remaster"],
+  "release_type": "album",
+  "slug": "rumours-fleetwood-mac",
+  "subtitle": "Fleetwood Mac",
+  "description": ""
+}

tests/test_config.py

@@ -69,7 +69,7 @@ def test_sample_config_data_fields(sample_config_data):
             arl="testarl", quality=2, use_deezloader=True, deezloader_warnings=True
         ),
         soundcloud=SoundcloudConfig(
-            client_id="clientid", app_version="appverison", quality=0
+            client_id="clientid", app_version="appversion", quality=0
         ),
         youtube=YoutubeConfig(
             video_downloads_folder="videodownloadsfolder",
@@ -82,10 +82,14 @@ def test_sample_config_data_fields(sample_config_data):
             folder_format="{albumartist} - {title} ({year}) [{container}] [{bit_depth}B-{sampling_rate}kHz]",
             track_format="{tracknumber}. {artist} - {title}{explicit}",
             restrict_characters=False,
-            truncate=True,
+            truncate_to=200,
         ),
         artwork=ArtworkConfig(
-            embed=True, size="large", max_width=-1, max_height=-1, keep_hires_cover=True
+            embed=True,
+            embed_size="large",
+            embed_max_width=-1,
+            save_artwork=True,
+            saved_max_width=-1,
         ),
         metadata=MetadataConfig(
             set_playlist_to_album=True, new_playlist_tracknumbers=True, exclude=[]
@@ -112,6 +116,7 @@ def test_sample_config_data_fields(sample_config_data):
             bit_depth=24,
             lossy_bitrate=320,
         ),
+        misc=MiscConfig(version="2.0"),
         _modified=False,
     )
     assert sample_config_data.downloads == test_config.downloads

tests/test_config.toml

@@ -11,6 +11,7 @@ concurrency = true
 # The maximum number of tracks to download at once
 # If you have very fast internet, you will benefit from a higher value,
 # A value that is too high for your bandwidth may cause slowdowns
+# Set to -1 for no limit
 max_connections = 3
 # Max number of API requests to handle per minute
 # Set to -1 for no limit
@@ -70,7 +71,7 @@ deezloader_warnings = true
 quality = 0
 # This changes periodically, so it needs to be updated
 client_id = "clientid"
-app_version = "appverison"
+app_version = "appversion"
 
 [youtube]
 # Only 0 is available for now
@@ -125,14 +126,16 @@ embed = true
 # The size of the artwork to embed. Options: thumbnail, small, large, original.
 # "original" images can be up to 30MB, and may fail embedding. 
 # Using "large" is recommended.
-size = "large"
-# Both of these options limit the size of the embedded artwork. If their values
-# are larger than the actual dimensions of the image, they will be ignored.
-# If either value is -1, the image is left untouched.
-max_width = -1
-max_height = -1
+embed_size = "large"
+# If this is set to a value > 0, max(width, height) of the embedded art will be set to this value in pixels
+# Proportions of the image will remain the same
+embed_max_width = -1
 # Save the cover image at the highest quality as a seperate jpg file
-keep_hires_cover = true
+save_artwork = true
+# If this is set to a value > 0, max(width, height) of the saved art will be set to this value in pixels
+# Proportions of the image will remain the same
+saved_max_width = -1
+
 
 [metadata]
 # Sets the value of the 'ALBUM' field in the metadata to the playlist's name. 
@@ -150,16 +153,16 @@ exclude = []
 # template
 add_singles_to_folder = false
 # Available keys: "albumartist", "title", "year", "bit_depth", "sampling_rate",
-# "container", "id", and "albumcomposer"
+# "id", and "albumcomposer"
 folder_format = "{albumartist} - {title} ({year}) [{container}] [{bit_depth}B-{sampling_rate}kHz]"
 # Available keys: "tracknumber", "artist", "albumartist", "composer", "title",
-# and "albumcomposer"
+# and "albumcomposer", "explicit"
 track_format = "{tracknumber}. {artist} - {title}{explicit}"
 # Only allow printable ASCII characters in filenames.
 restrict_characters = false
-# Truncate the filename if it is greater than 120 characters
+# Truncate the filename if it is greater than this number of characters
 # Setting this to false may cause downloads to fail on some systems
-truncate = true
+truncate_to = 200
 
 # Last.fm playlists are downloaded by searching for the titles of the tracks
 [lastfm]

tests/test_meta.py

@@ -0,0 +1,64 @@
+import json
+
+from streamrip.metadata import *
+
+with open("tests/qobuz_album_resp.json") as f:
+    qobuz_album_resp = json.load(f)
+
+with open("tests/qobuz_track_resp.json") as f:
+    qobuz_track_resp = json.load(f)
+
+
+def test_album_metadata_qobuz():
+    m = AlbumMetadata.from_qobuz(qobuz_album_resp)
+    info = m.info
+    assert info.id == "19512572"
+    assert info.quality == 3
+    assert info.container == "FLAC"
+    assert info.label == "Rhino - Warner Records"
+    assert info.explicit == False
+    assert info.sampling_rate == 96
+    assert info.bit_depth == 24
+    assert info.booklets == None
+
+    assert m.album == "Rumours"
+    assert m.albumartist == "Fleetwood Mac"
+    assert m.year == "1977"
+    assert "Pop" in m.genre
+    assert "Rock" in m.genre
+    assert not m.covers.empty()
+
+    assert m.albumcomposer == "Various Composers"
+    assert m.comment == None
+    assert m.compilation == None
+    assert (
+        m.copyright
+        == "© 1977 Warner Records Inc. ℗ 1977 Warner Records Inc. Marketed by Rhino Entertainment Company, A Warner Music Group Company."
+    )
+    assert m.date == "1977-02-04"
+    assert m.description == None
+    assert m.disctotal == 1
+    assert m.encoder == None
+    assert m.grouping == None
+    assert m.lyrics == None
+    assert m.purchase_date == None
+    assert m.tracktotal == 11
+
+
+def test_track_metadata_qobuz():
+    a = AlbumMetadata.from_qobuz(qobuz_track_resp["album"])
+    t = TrackMetadata.from_qobuz(a, qobuz_track_resp)
+    assert t.title == "Dreams (2001 Remaster)"
+    info = t.info
+    assert info.id == "19512574"
+    assert info.quality == 3
+    assert info.bit_depth == 24
+    assert info.sampling_rate == 96
+    assert info.work is None
+
+    assert t.title == "Dreams (2001 Remaster)"
+    assert t.album == a
+    assert t.artist == "Fleetwood Mac"
+    assert t.tracknumber == 2
+    assert t.discnumber == 1
+    assert t.composer == None

tests/test_qobuz_client.py

@@ -1,7 +1,4 @@
-import asyncio
-import hashlib
 import logging
-import os
 
 import pytest
 from util import afor, arun
@@ -14,21 +11,10 @@ from streamrip.qobuz_client import QobuzClient
 logger = logging.getLogger("streamrip")
 
 
+@pytest.mark.usefixtures("qobuz_client")
 @pytest.fixture
-def config():
-    c = Config.defaults()
-    c.session.qobuz.email_or_userid = os.environ["QOBUZ_EMAIL"]
-    c.session.qobuz.password_or_token = hashlib.md5(
-        os.environ["QOBUZ_PASSWORD"].encode("utf-8")
-    ).hexdigest()
-    return c
-
-
-@pytest.fixture
-def client(config):
-    c = QobuzClient(config)  # type: ignore
-    arun(c.login())
-    return c
+def client(qobuz_client):
+    return qobuz_client
 
 
 def test_client_raises_missing_credentials():

tests/test_track.py

@@ -0,0 +1,30 @@
+import os
+import shutil
+
+from util import arun
+
+from streamrip.downloadable import Downloadable
+from streamrip.qobuz_client import QobuzClient
+from streamrip.track import PendingSingle, Track
+
+
+def test_pending_resolve(qobuz_client: QobuzClient):
+    qobuz_client.config.session.downloads.folder = "./tests"
+    p = PendingSingle("19512574", qobuz_client, qobuz_client.config)
+    t = arun(p.resolve())
+    dir = "tests/Fleetwood Mac - Rumours (1977) [FLAC] [24B-96kHz]"
+    assert os.path.isdir(dir)
+    assert os.path.isfile(os.path.join(dir, "cover.jpg"))
+    assert os.path.isfile(os.path.join(dir, "embed_cover.jpg"))
+    assert isinstance(t, Track)
+    assert isinstance(t.downloadable, Downloadable)
+    assert t.cover_path is not None
+    shutil.rmtree(dir)
+
+
+# def test_pending_resolve_mp3(qobuz_client: QobuzClient):
+#     qobuz_client.config.session.qobuz.quality = 1
+#     p = PendingSingle("19512574", qobuz_client, qobuz_client.config)
+#     t = arun(p.resolve())
+#     assert isinstance(t, Track)
+#     assert False