Fix floats in API response (Fixes mopidy#375)

Author: kingosticks

mopidy_spotify/translator.py

@@ -248,7 +248,16 @@ def web_to_album(web_album):
         artists=artists)
 
 
-def web_to_track(web_track):
+def int_or_none(inp):
+    if inp is not None:
+        return int(float(inp))
+
+
+def web_to_track(web_track, bitrate=None, album=None):
+    ref = web_to_track_ref(web_track)
+    if ref is None:
+        return
+
     artists = [
         web_to_artist(web_artist) for web_artist in web_track['artists']]
     album = web_to_album(web_track['album'])
@@ -258,6 +267,8 @@ def web_to_track(web_track):
         name=web_track['name'],
         artists=artists,
         album=album,
-        length=web_track['duration_ms'],
-        disc_no=web_track['disc_number'],
-        track_no=web_track['track_number'])
+        length=int_or_none(web_track.get("duration_ms")),
+        disc_no=int_or_none(web_track.get("disc_number")),
+        track_no=int_or_none(web_track.get("track_number")),
+        bitrate=bitrate,
+    )

tests/test_translator.py

@@ -468,3 +468,68 @@ def test_successful_translation(self, web_track_mock):
         assert track.track_no == 7
         assert track.disc_no == 1
         assert track.length == 174300
+
+    def test_sets_bitrate(self, web_track_mock):
+        track = translator.web_to_track(web_track_mock, bitrate=100)
+
+        assert track.bitrate == 100
+
+    def test_sets_specified_album(self, web_track_mock):
+        alt_album = models.Album(uri="spotify:album:xyz", name="XYZ 789")
+
+        track = translator.web_to_track(web_track_mock, album=alt_album)
+
+        assert track.album.uri == "spotify:album:xyz"
+        assert track.album.name == "XYZ 789"
+
+    def test_filters_out_none_artists(self, web_track_mock):
+        web_track_mock["artists"].insert(0, {})
+        web_track_mock["artists"].insert(0, {"foo": "bar"})
+
+        track = translator.web_to_track(web_track_mock)
+        artists = [models.Artist(uri="spotify:artist:abba", name="ABBA")]
+
+        assert list(track.artists) == artists
+
+    def test_ignores_missing_album(self, web_track_mock):
+        del web_track_mock["album"]
+
+        track = translator.web_to_track(web_track_mock)
+
+        assert track.name == "ABC 123"
+        assert track.length == 174300
+        assert track.album is None
+
+    def test_ignores_invalid_album(self, web_track_mock):
+        web_track_mock["album"]["uri"] = None
+
+        track = translator.web_to_track(web_track_mock)
+
+        assert track.name == "ABC 123"
+        assert track.album is None
+
+    @pytest.mark.parametrize(
+        "data",
+        [
+            (123),
+            (123.0),
+            ("123"),
+            ("123.0"),
+        ],
+    )
+    def test_int_or_none_number(self, data):
+        assert translator.int_or_none(data) == 123
+
+    def test_int_or_none_none(self):
+        assert translator.int_or_none(None) is None
+
+    def test_ints_might_be_floats(self, web_track_mock):
+        web_track_mock["duration_ms"] = 123.0
+        web_track_mock["disc_number"] = "456.0"
+        web_track_mock["track_number"] = 99.9
+
+        track = translator.web_to_track(web_track_mock)
+
+        assert track.length == 123
+        assert track.disc_no == 456
+        assert track.track_no == 99