Merge pull request #86 from metabrainz/yim-2022-fixes

YIM 2022 playlist touch-ups

Author: mayhem

troi/internal/top_discoveries_for_year.py

@@ -62,7 +62,7 @@ def description():
         return "Generate a playlist of tracks released this year that you've listened to."
 
     def create(self, inputs):
-        recs = DataSetFetcherElement(server_url="https://bono.metabrainz.org/top-new-tracks/json",
+        recs = DataSetFetcherElement(server_url="https://datasets.listenbrainz.org/top-new-tracks/json",
                                      json_post_data=[{ 'user_name': inputs['user_name'] }])
 
         y_lookup = troi.musicbrainz.year_lookup.YearLookupElement(skip_not_found=False)

troi/internal/top_missed_recordings_for_year.py

@@ -90,7 +90,6 @@ def read(self, inputs = []):
         for r in recordings['payload']['recordings']:
             artist = Artist(r['artist_name'], mbids=r['artist_mbids'])
             release = Release(r['release_name'], mbid=r['release_mbid'])
-            recording_list.append(Recording(r['track_name'], mbid=r['recording_mbid'], msid=r['recording_msid'], 
-                                  artist=artist, release=release))
+            recording_list.append(Recording(r['track_name'], mbid=r['recording_mbid'], artist=artist, release=release))
 
         return recording_list

troi/internal/top_new_recordings_you_listened_to_for_year.py

@@ -48,7 +48,6 @@
                 'artist_name': 'Woolfy',
                 'listen_count': 94, 
                 'recording_mbid': None, 
-                'recording_msid': '65435007-a8ea-48aa-9b23-5af1bd640905', 
                 'release_mbid': None, 
                 'release_name': 'Stations',
                 'track_name': 'Tangiers'
@@ -95,4 +94,3 @@ def test_user_recording_stats(self, stats_mock):
         assert entities[0].artist.name == 'Woolfy'
         assert entities[0].release.name == 'Stations'
         assert entities[0].name == 'Tangiers'
-        assert entities[0].msid == '65435007-a8ea-48aa-9b23-5af1bd640905'

troi/listenbrainz/stats.py

@@ -0,0 +1,72 @@
+from datetime import datetime
+
+import troi.filters
+import troi.listenbrainz.recs
+import troi.musicbrainz.recording_lookup
+import troi.musicbrainz.year_lookup
+import troi.sorts
+from troi import Recording
+from troi.listenbrainz.dataset_fetcher import DataSetFetcherElement
+from troi.playlist import PlaylistShuffleElement, PlaylistRedundancyReducerElement
+
+
+class TopDiscoveries(troi.patch.Patch):
+    """
+        See below for description
+    """
+
+    NAME = "Top Discoveries of %d for %s"
+    DESC = """<p>
+              This playlist contains the top tracks for %s that were first listened to in %d.
+              </p>
+              <p>
+                For more information on how this playlist is generated, please see our
+                <a href="https://musicbrainz.org/doc/YIM2022Playlists">Year in Music 2022 Playlists</a> page.
+              </p>
+           """
+
+    def __init__(self, debug=False):
+        troi.patch.Patch.__init__(self, debug)
+
+    @staticmethod
+    def inputs():
+        """
+        Generate a top discoveries playlist for a user.
+
+        \b
+        USER_ID: is a MusicBrainz userid that has an account on ListenBrainz.
+        USER_NAME: is a MusicBrainz username that has an account on ListenBrainz.
+        """
+        return [{"type": "argument", "args": ["user_id"]},
+                {"type": "argument", "args": ["user_name"]}]
+
+    @staticmethod
+    def outputs():
+        return [Recording]
+
+    @staticmethod
+    def slug():
+        return "top-discoveries-for-year"
+
+    @staticmethod
+    def description():
+        return "Generate a top discoveries playlist for a user."
+
+    def create(self, inputs):
+        recs = DataSetFetcherElement(server_url="https://datasets.listenbrainz.org/top-discoveries/json",
+                                     json_post_data=[{ 'user_id': inputs['user_id'] }])
+
+        year = datetime.now().year
+        pl_maker = troi.playlist.PlaylistMakerElement(self.NAME % (year, inputs['user_name']),
+                                                      self.DESC % (inputs['user_name'], year),
+                                                      patch_slug=self.slug(),
+                                                      user_name=inputs['user_name'])
+        pl_maker.set_sources(recs)
+
+        shaper = PlaylistRedundancyReducerElement()
+        shaper.set_sources(pl_maker)
+
+        shuffle = PlaylistShuffleElement()
+        shuffle.set_sources(shaper)
+
+        return shuffle