From c7369349072bd8ea8cfa06dddd1ffe6f2d3c3432 Mon Sep 17 00:00:00 2001
From: Jozef Kruszynski <60214390+jozefKruszynski@users.noreply.github.com>
Date: Thu, 20 Jul 2023 16:23:01 +0200
Subject: [PATCH] Tidalapi-official (#784)

---
 music_assistant/server/providers/tidal/__init__.py  | 13 ++++++-------
 .../server/providers/tidal/manifest.json            |  2 +-
 requirements_all.txt                                |  2 +-
 3 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/music_assistant/server/providers/tidal/__init__.py b/music_assistant/server/providers/tidal/__init__.py
index 9d101880..ed98313d 100644
--- a/music_assistant/server/providers/tidal/__init__.py
+++ b/music_assistant/server/providers/tidal/__init__.py
@@ -421,12 +421,12 @@ class TidalProvider(MusicProvider):
     def get_item_mapping(self, media_type: MediaType, key: str, name: str) -> ItemMapping:
         """Create a generic item mapping."""
         return ItemMapping(
-            media_type,
-            key,
-            self.instance_id,
-            name,
-            create_uri(media_type, self.instance_id, key),
-            create_sort_name(self.name),
+            media_type=media_type,
+            item_id=key,
+            provider=self.instance_id,
+            name=name,
+            uri=create_uri(media_type, self.instance_id, key),
+            sort_name=create_sort_name(self.name),
         )
 
     async def _get_tidal_session(self) -> TidalSession:
@@ -570,7 +570,6 @@ class TidalProvider(MusicProvider):
             track_class = AlbumTrack
         else:
             track_class = Track
-
         track = track_class(
             item_id=track_id,
             provider=self.instance_id,
diff --git a/music_assistant/server/providers/tidal/manifest.json b/music_assistant/server/providers/tidal/manifest.json
index a197e185..35dd81c4 100644
--- a/music_assistant/server/providers/tidal/manifest.json
+++ b/music_assistant/server/providers/tidal/manifest.json
@@ -4,7 +4,7 @@
   "name": "Tidal",
   "description": "Support for the Tidal streaming provider in Music Assistant.",
   "codeowners": ["@jozefKruszynski"],
-  "requirements": ["git+https://github.com/jozefKruszynski/python-tidal.git@refs/heads/album-type-with-fix"],
+  "requirements": ["tidalapi==0.7.2"],
   "documentation": "https://github.com/orgs/music-assistant/discussions/1201",
   "multi_instance": true
 }
diff --git a/requirements_all.txt b/requirements_all.txt
index 77bee045..298c9c1d 100644
--- a/requirements_all.txt
+++ b/requirements_all.txt
@@ -15,7 +15,6 @@ deezer-python==5.12.0
 faust-cchardet>=2.1.18
 git+https://github.com/MarvinSchenkel/pytube.git
 git+https://github.com/gieljnssns/python-radios.git@main
-git+https://github.com/jozefKruszynski/python-tidal.git@refs/heads/album-type-with-fix
 ifaddr==0.2.0
 mashumaro==3.8.1
 memory-tempfile==2.2.3
@@ -28,6 +27,7 @@ pycryptodome==3.18.0
 python-slugify==8.0.1
 shortuuid==1.0.11
 soco==0.29.1
+tidalapi==0.7.2
 unidecode==1.3.6
 uvloop==0.17.0
 xmltodict==0.13.0
-- 
2.34.1