Rename Track.title to Track.name

mopidy/backends/despotify.py

@@ -103,7 +103,7 @@ class DespotifyTranslator(object):
             date = None
         return Track(
             uri=spotify_track.get_uri(),
-            title=spotify_track.title.decode(ENCODING),
+            name=spotify_track.title.decode(ENCODING),
             artists=[self.to_mopidy_artist(a) for a in spotify_track.artists],
             album=self.to_mopidy_album(spotify_track.album),
             track_no=spotify_track.tracknumber,

mopidy/backends/libspotify.py

@@ -126,11 +126,11 @@ class LibspotifyTranslator(object):
 
     def to_mopidy_track(self, spotify_track):
         if not spotify_track.is_loaded():
-            return Track(title=u'[loading...]')
+            return Track(name=u'[loading...]')
         uri = str(Link.from_track(spotify_track, 0))
         return Track(
             uri=uri,
-            title=spotify_track.name().decode(ENCODING),
+            name=spotify_track.name().decode(ENCODING),
             artists=[self.to_mopidy_artist(a) for a in spotify_track.artists()],
             album=self.to_mopidy_album(spotify_track.album()),
             track_no=spotify_track.index(),

mopidy/models.py

@@ -68,8 +68,8 @@ class Track(ImmutableObject):
     """
     :param uri: track URI
     :type uri: string
-    :param title: track title
-    :type title: string
+    :param name: track name
+    :type name: string
     :param artists: track artists
     :type artists: list of :class:`Artist`
     :param album: track album
@@ -89,8 +89,8 @@ class Track(ImmutableObject):
     #: The track URI. Read-only.
     uri = None
 
-    #: The track title. Read-only.
-    title = None
+    #: The track name. Read-only.
+    name = None
 
     #: The track :class:`Album`. Read-only.
     album = None
@@ -131,7 +131,7 @@ class Track(ImmutableObject):
             ('file', self.uri or ''),
             ('Time', self.length and (self.length // 1000) or 0),
             ('Artist', self.mpd_format_artists()),
-            ('Title', self.title or ''),
+            ('Title', self.name or ''),
             ('Album', self.album and self.album.name or ''),
             ('Date', self.date or ''),
         ]

tests/modelstest.py

@@ -50,11 +50,11 @@ class TrackTest(unittest.TestCase):
         self.assertEqual(track.uri, uri)
         self.assertRaises(AttributeError, setattr, track, 'uri', None)
 
-    def test_title(self):
-        title = u'a title'
-        track = Track(title=title)
-        self.assertEqual(track.title, title)
-        self.assertRaises(AttributeError, setattr, track, 'title', None)
+    def test_name(self):
+        name = u'a name'
+        track = Track(name=name)
+        self.assertEqual(track.name, name)
+        self.assertRaises(AttributeError, setattr, track, 'name', None)
 
     def test_artists(self):
         artists = [Artist(), Artist()]
@@ -115,7 +115,7 @@ class TrackTest(unittest.TestCase):
         track = Track(
             uri=u'a uri',
             artists=[Artist(name=u'an artist')],
-            title=u'a title',
+            name=u'a name',
             album=Album(name=u'an album', num_tracks=13),
             track_no=7,
             date=dt.date(1977, 1, 1),
@@ -126,7 +126,7 @@ class TrackTest(unittest.TestCase):
         self.assert_(('file', 'a uri') in result)
         self.assert_(('Time', 137) in result)
         self.assert_(('Artist', 'an artist') in result)
-        self.assert_(('Title', 'a title') in result)
+        self.assert_(('Title', 'a name') in result)
         self.assert_(('Album', 'an album') in result)
         self.assert_(('Track', '7/13') in result)
         self.assert_(('Date', dt.date(1977, 1, 1)) in result)