Display correct user and playlist info

Fixes #63
jaylinski · Mar 20, 2024 · 7fd297f · 7fd297f
1 parent 5c0d308
commit 7fd297f
Show file tree

Hide file tree

Showing 8 changed files with 65 additions and 7 deletions.
diff --git a/readme.md b/readme.md
@@ -51,7 +51,7 @@ This add-on uses [Pipenv](https://pypi.org/project/pipenv/) to manage its depend
 
 ### Setup
 
-[Install Pipenv](https://pipenv.readthedocs.io/en/latest/install/#installing-pipenv) and run `pipenv install --dev`.
+[Install Pipenv](https://pipenv.pypa.io/en/latest/installation.html#installing-pipenv) and run `pipenv install --dev`.
 
 ### Build
 

diff --git a/resources/language/resource.language.de_de/strings.po b/resources/language/resource.language.de_de/strings.po
@@ -146,3 +146,11 @@ msgstr "In deinem Land nicht verfügbar"
 msgctxt "#30903"
 msgid "Preview"
 msgstr "Vorschau"
+
+msgctxt "#30904"
+msgid "followers"
+msgstr "Follower"
+
+msgctxt "#30905"
+msgid "likes"
+msgstr "Likes"
diff --git a/resources/language/resource.language.en_gb/strings.po b/resources/language/resource.language.en_gb/strings.po
@@ -146,3 +146,11 @@ msgstr ""
 msgctxt "#30903"
 msgid "Preview"
 msgstr ""
+
+msgctxt "#30904"
+msgid "followers"
+msgstr ""
+
+msgctxt "#30905"
+msgid "likes"
+msgstr ""
diff --git a/resources/language/resource.language.nl_nl/strings.po b/resources/language/resource.language.nl_nl/strings.po
@@ -145,3 +145,11 @@ msgstr "Niet beschikbaar in jouw land"
 msgctxt "#30903"
 msgid "Preview"
 msgstr ""
+
+msgctxt "#30904"
+msgid "followers"
+msgstr "volgers"
+
+msgctxt "#30905"
+msgid "likes"
+msgstr ""
diff --git a/resources/lib/models/playlist.py b/resources/lib/models/playlist.py
@@ -1,7 +1,10 @@
 from resources.lib.models.list_item import ListItem
 import urllib.parse
+import xbmcaddon
 import xbmcgui
 
+likes = xbmcaddon.Addon().getLocalizedString(30905)
+
 
 class Playlist(ListItem):
     thumb = ""
@@ -11,12 +14,24 @@ class Playlist(ListItem):
     def to_list_item(self, addon_base):
         list_item = xbmcgui.ListItem(label=self.label, label2=self.label2)
         list_item.setArt({"thumb": self.thumb})
-        list_item.setInfo("music", {
-            "title": self.label
+        list_item.setIsFolder(True)
+        list_item.setProperty("isPlayable", "false")
+        # We have to use the `video`-type in order to display a proper folder description
+        list_item.setInfo("video", {
+            "plot": self._get_description()
         })
+
         url = addon_base + "/?" + urllib.parse.urlencode({
             "action": "call",
             "call": "/playlists/{id}".format(id=self.id)
         })
 
         return url, list_item, True
+
+    def _get_description(self):
+        return "{}\n{} {}\n\n{}".format(
+            self.info.get("artist"),
+            self.info.get("likes"),
+            likes,
+            self.info.get("description") or ""
+        )
diff --git a/resources/lib/models/track.py b/resources/lib/models/track.py
@@ -26,6 +26,7 @@ def to_list_item(self, addon_base):
             "genre": self.info.get("genre"),
             "title": self.label,
             "year": self.info.get("date")[:4],
+            "playcount": 333, # TODO
             "comment": self.info.get("description")
         })
         list_item.setProperty("isPlayable", "true")

diff --git a/resources/lib/models/user.py b/resources/lib/models/user.py
@@ -1,8 +1,11 @@
 from resources.lib.models.list_item import ListItem
 from resources.routes import *
 import urllib.parse
+import xbmcaddon
 import xbmcgui
 
+followers = xbmcaddon.Addon().getLocalizedString(30904)
+
 
 class User(ListItem):
     thumb = ""
@@ -11,12 +14,24 @@ class User(ListItem):
     def to_list_item(self, addon_base):
         list_item = xbmcgui.ListItem(label=self.label, label2=self.label2)
         list_item.setArt({"thumb": self.thumb})
-        list_item.setInfo("music", {
-            "title": self.info.get("description")
+        list_item.setIsFolder(True)
+        list_item.setProperty("isPlayable", "false")
+        # We have to use the `video`-type in order to display a proper folder description
+        list_item.setInfo("video", {
+            "plot": self._get_description()
         })
+
         url = addon_base + PATH_USER + "?" + urllib.parse.urlencode({
             "id": self.id,
             "call": "/users/{id}/tracks".format(id=self.id)
         })
 
         return url, list_item, True
+
+    def _get_description(self):
+        return "{}\n{} {}\n\n{}".format(
+            self.label2 if self.label2 != "" else self.label,
+            self.info.get("followers"),
+            followers,
+            self.info.get("description") or ""
+        )
diff --git a/resources/lib/soundcloud/api_v2.py b/resources/lib/soundcloud/api_v2.py
@@ -175,7 +175,8 @@ def _map_json_to_collection(self, json_obj):
                     user.label2 = item.get("full_name", "")
                     user.thumb = self._get_thumbnail(item, self.thumbnail_size)
                     user.info = {
-                        "artist": item.get("description", None)
+                        "description": item.get("description", ""),
+                        "followers": item.get("followers_count", 0)
                     }
                     collection.items.append(user)
 
@@ -185,7 +186,9 @@ def _map_json_to_collection(self, json_obj):
                     playlist.label2 = item.get("label_name", "")
                     playlist.thumb = self._get_thumbnail(item, self.thumbnail_size)
                     playlist.info = {
-                        "artist": item["user"]["username"]
+                        "artist": item["user"]["username"],
+                        "description": item.get("description", ""),
+                        "likes": item.get("likes_count", 0)
                     }
                     collection.items.append(playlist)