mpd: playlist addition / creation

- Rename _playlist_create to _create_playlist
- Change short variables to abbreviations
- Use double quoting when a string contains a single quote
- Use playlist_deleted event

mopidy/mpd/protocol/stored_playlists.py

@@ -154,13 +154,13 @@ def playlistadd(context, name, track_uri):
     if not playlist:
         # Create new playlist with this single track
         lookup_res = context.core.library.lookup(uris=[track_uri]).get()
-        tracks = [a for sl in lookup_res.values() for a in sl]
+        tracks = [track for selections in lookup_res.values() for track in selections]
-        _playlistcreate(context, name, tracks)
+        _create_playlist(context, name, tracks)
     else:
         # Add track to existing playlist
         uri_scheme = urlparse.urlparse(track_uri).scheme
         lookup_res = context.core.library.lookup(uris=[track_uri]).get()
-        to_add = [a for sl in lookup_res.values() for a in sl]
+        to_add = [track for selections in lookup_res.values() for track in selections]
         playlist = playlist.replace(tracks=list(playlist.tracks) + to_add)
         if context.core.playlists.save(playlist).get() is None:
             playlist_scheme = urlparse.urlparse(playlist.uri).scheme
@@ -168,29 +168,29 @@ def playlistadd(context, name, track_uri):
                 playlist_scheme, uri_scheme)
 
 
-def _playlistcreate(context, name, tracks):
+def _create_playlist(context, name, tracks):
     """
-    Creates new playlist using backend aprropriate for passed list of tracks
+    Creates new playlist using backend appropriate for the given tracks
     """
     uri_schemes = set([urlparse.urlparse(t.uri).scheme for t in tracks])
     for scheme in uri_schemes:
         playlist = context.core.playlists.create(name, scheme).get()
         if not playlist:
             # Backend can't create playlists at all
-            logger.warning('%s backend can\'t create playlists', scheme)
+            logger.warning("%s backend can't create playlists", scheme)
             continue
         playlist = playlist.replace(tracks=tracks)
         if context.core.playlists.save(playlist).get() is None:
-            # Falied to save using this backend
+            # Failed to save using this backend
             continue
         # Created and saved
         return
-    # Can't use backend aprropriate to passed uri schemes, use default one
+    # Can't use backend appropriate for passed uri schemes, use default one
-    scheme = context.dispatcher.config['mpd']['default_playlist_scheme']
+    default_scheme = context.dispatcher.config['mpd']['default_playlist_scheme']
-    playlist = context.core.playlists.create(name, scheme).get()
+    playlist = context.core.playlists.create(name, default_scheme).get()
     if not playlist:
-        # If even default backend can't save playlist, everything is lost
+        # If even MPD's default backend can't save playlist, everything is lost
-        logger.warning('Default backend can\'t create playlists')
+        logger.warning("Default backend can't create playlists")
         raise exceptions.MpdFailedToSavePlaylist(None)
     playlist = playlist.replace(tracks=tracks)
     if context.core.playlists.save(playlist).get() is None:
@@ -324,13 +324,12 @@ def save(context, name):
         Saves the current playlist to ``NAME.m3u`` in the playlist
         directory.
     """
-    tl_tracks = context.core.tracklist.get_tl_tracks().get()
+    tracks = context.core.tracklist.get_tracks().get()
-    tracks = [t.track for t in tl_tracks]
     uri = context.lookup_playlist_uri_from_name(name)
     playlist = uri is not None and context.core.playlists.lookup(uri).get()
     if not playlist:
         # Create new playlist
-        _playlistcreate(context, name, tracks)
+        _create_playlist(context, name, tracks)
     else:
         # Overwrite existing playlist
         playlist = playlist.replace(tracks=tracks)

tests/mpd/protocol/test_stored_playlists.py

@@ -223,10 +223,12 @@ class PlaylistsHandlerTest(protocol.BaseTestCase):
         self.backend.playlists.set_dummy_playlists([
             Playlist(
                 name='name', uri='dummy:a1', tracks=[tracks[0]])])
+
         self.send_request('playlistadd "name" "dummy:b"')
+
         self.assertInResponse('OK')
         self.assertEqual(
-            2, len(self.backend.playlists.get_items("dummy:a1").get()))
+            2, len(self.backend.playlists.get_items('dummy:a1').get()))
 
     def test_playlistadd_creates_playlist(self):
         tracks = [
@@ -236,7 +238,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase):
         self.send_request('playlistadd "name" "dummy:a"')
         self.assertInResponse('OK')
         self.assertNotEqual(
-            None, self.backend.playlists.lookup("dummy:name").get())
+            None, self.backend.playlists.lookup('dummy:name').get())
 
     def test_playlistclear(self):
         self.backend.playlists.set_dummy_playlists([
@@ -290,8 +292,7 @@ class PlaylistsHandlerTest(protocol.BaseTestCase):
                 name='old_name', uri='dummy:a1', tracks=[Track(uri='b')])])
         self.send_request('rename "old_name" "new_name"')
         self.assertInResponse('OK')
-        self.assertNotEqual(
+        self.assertIsNotNone(self.backend.playlists.lookup("dummy:new_name").get())
-            None, self.backend.playlists.lookup("dummy:new_name").get())
 
     def test_rm(self):
         self.backend.playlists.set_dummy_playlists([