Skip to content

Fix/issue 324 #353

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 12 commits into from
Aug 10, 2025
Merged

Fix/issue 324 #353

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
12 commits
Select commit Hold shift + click to select a range
3168a55
Add x-tidal-client-version header
Nokse22 Aug 2, 2025
209865d
Support new home page endpoint
Nokse22 Aug 2, 2025
dec4a38
Hack it to make it work
Nokse22 Aug 2, 2025
7b318c9
Support other item types
Nokse22 Aug 2, 2025
0edfeb8
Support TRACK_LIST
Nokse22 Aug 2, 2025
57843ca
Updated Mix tests
tehkillerbee Aug 2, 2025
3222541
MixV2: Add support for parsing mixes originating from PageV2.
tehkillerbee Aug 2, 2025
6728663
Requests: Cleanup comments. Move request variables to their appropria…
tehkillerbee Aug 2, 2025
51dd2f7
PageCategoryV2: Minor cleanup. Fix missing Category type(s)
tehkillerbee Aug 2, 2025
e1b6aaa
Remove parseV2 from Page
Nokse22 Aug 3, 2025
74874d9
Merge pull request #354 from Nokse22/patch-1
tehkillerbee Aug 3, 2025
0918970
Ensure all fields are parsed (_base_parse). Use a factory method for …
tehkillerbee Aug 4, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 2 additions & 4 deletions tests/test_mix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -45,11 +45,9 @@ def test_mixv2_unavailable(session):
mix = session.mixv2("12345678")


@pytest.mark.skip(reason="Cannot test against user specific mixes")
def test_mix_available(session):
mix = session.mix("016edb91bc504e618de6918b11b25b")
mix = session.mix("001cb879e927219fc3322cb03aed01")


@pytest.mark.skip(reason="Cannot test against user specific mixes")
def test_mixv2_available(session):
mix = session.mixv2("016edb91bc504e618de6918b11b25b")
mix = session.mixv2("001cb879e927219fc3322cb03aed01")
120 changes: 86 additions & 34 deletions tidalapi/mix.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -176,16 +176,22 @@ class TextInfo:
class MixV2:
"""A mix from TIDALs v2 api endpoint."""

mix_type: Optional[MixType] = None
country_code: Optional[str] = None
date_added: Optional[datetime] = None
title: Optional[str] = None
id: Optional[str] = None
mix_type: Optional[MixType] = None
artifact_id_type: Optional[str] = None
content_behavior: Optional[str] = None
images: Optional[ImageResponse] = None
detail_images: Optional[ImageResponse] = None
master = False
is_stable_id = False
title: Optional[str] = None
sub_title: Optional[str] = None
short_subtitle: Optional[str] = None
title_text_info: Optional[TextInfo] = None
sub_title_text_info: Optional[TextInfo] = None
sub_title: Optional[str] = None
short_subtitle_text_info: Optional[TextInfo] = None
updated: Optional[datetime] = None
_retrieved = False
_items: Optional[List[Union["Video", "Track"]]] = None
Expand Down Expand Up @@ -232,38 +238,84 @@ def parse(self, json_obj: JsonObj) -> "MixV2":
:param json_obj: The json of a mix to be parsed
:return: A copy of the parsed mix
"""
date_added = json_obj.get("dateAdded")
self.date_added = dateutil.parser.isoparse(date_added) if date_added else None
self.title = json_obj["title"]

self.id = json_obj["id"]
self.title = json_obj["title"]
self.mix_type = MixType(json_obj["mixType"])
images = json_obj["images"]
self.images = ImageResponse(
small=images["SMALL"]["url"],
medium=images["MEDIUM"]["url"],
large=images["LARGE"]["url"],
)
detail_images = json_obj["detailImages"]
self.detail_images = ImageResponse(
small=detail_images["SMALL"]["url"],
medium=detail_images["MEDIUM"]["url"],
large=detail_images["LARGE"]["url"],
)
self.master = json_obj["master"]
title_text_info = json_obj["titleTextInfo"]
self.title_text_info = TextInfo(
text=title_text_info["text"],
color=title_text_info["color"],
)
sub_title_text_info = json_obj["subTitleTextInfo"]
self.sub_title_text_info = TextInfo(
text=sub_title_text_info["text"],
color=sub_title_text_info["color"],
)
self.sub_title = json_obj["subTitle"]
updated = json_obj.get("updated")
self.date_added = dateutil.parser.isoparse(updated) if date_added else None
if json_obj.get("mixType"):
date_added = json_obj.get("dateAdded")
self.date_added = (
dateutil.parser.isoparse(date_added) if date_added else None
)
self.title = json_obj["title"]
self.sub_title = json_obj["subTitle"]
images = json_obj["images"]
self.images = ImageResponse(
small=images["SMALL"]["url"],
medium=images["MEDIUM"]["url"],
large=images["LARGE"]["url"],
)
detail_images = json_obj["detailImages"]
self.detail_images = ImageResponse(
small=detail_images["SMALL"]["url"],
medium=detail_images["MEDIUM"]["url"],
large=detail_images["LARGE"]["url"],
)
self.master = json_obj["master"]
title_text_info = json_obj["titleTextInfo"]
self.title_text_info = TextInfo(
text=title_text_info["text"],
color=title_text_info["color"],
)
sub_title_text_info = json_obj["subTitleTextInfo"]
self.sub_title_text_info = TextInfo(
text=sub_title_text_info["text"],
color=sub_title_text_info["color"],
)
updated = json_obj.get("updated")
self.updated = dateutil.parser.isoparse(updated) if updated else None
elif json_obj.get("type"):
# Certain mix types (e.g. when returned from Page) must be parsed differently. Why, TIDAL?
self.country_code = json_obj.get("countryCode", None)
self.is_stable_id = json_obj.get("isStableId", False)
self.artifact_id_type = json_obj.get("trackGroupId", None)
self.content_behavior = json_obj.get("contentBehavior", None)

images = json_obj["mixImages"]
self.images = ImageResponse(
small=images[0]["url"],
medium=images[1]["url"],
large=images[0]["url"],
)

detail_images = json_obj["detailMixImages"]
self.detail_images = ImageResponse(
small=detail_images[0]["url"],
medium=detail_images[1]["url"],
large=detail_images[2]["url"],
)

title_text_info = json_obj["titleTextInfo"]
self.title_text_info = TextInfo(
text=title_text_info["text"],
color=title_text_info["color"],
)
self.title = title_text_info["text"]

sub_title_text_info = json_obj["subtitleTextInfo"]
self.sub_title_text_info = TextInfo(
text=sub_title_text_info["text"],
color=sub_title_text_info["color"],
)
self.sub_title = sub_title_text_info["text"]

short_subtitle_text_info = json_obj["shortSubtitleTextInfo"]
self.short_subtitle_text_info = TextInfo(
text=sub_title_text_info["text"],
color=sub_title_text_info["color"],
)
self.short_subtitle = short_subtitle_text_info["text"]

if json_obj.get("updated"):
self.updated = datetime.fromtimestamp(json_obj["updated"] / 1000)

return copy.copy(self)

Expand Down
Loading