From: W. Trevor King <wking@drexel.edu>
Date: Mon, 16 Aug 2010 14:48:19 +0000 (-0400)
Subject: Fix playlist filename preservation for 'load playlist' and 'new playlist'
X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=df84350d950dfdad8f281e22ead8056c7167d0fb;p=hooke.git

Fix playlist filename preservation for 'load playlist' and 'new playlist'
---

diff --git a/hooke/plugin/playlist.py b/hooke/plugin/playlist.py
index 2b9caa8..1439ba6 100644
--- a/hooke/plugin/playlist.py
+++ b/hooke/plugin/playlist.py
@@ -127,7 +127,9 @@ class PlaylistAddingCommand (Command):
     def _set_playlist(self, hooke, params, playlist):
         """Attach a new playlist.
         """
-        playlist.name = params['output playlist']
+        playlist_names = [p.name for p in hooke.playlists]
+        if playlist.name in playlist_names or playlist.name == None:
+            playlist.name = params['output playlist']  # HACK: override input name.  How to tell if it is callback-generated?
         hooke.playlists.append(playlist)
 
 
@@ -249,9 +251,6 @@ Drivers for loading curves.
     def _run(self, hooke, inqueue, outqueue, params):
         p = FilePlaylist(drivers=params['drivers'], path=params['input'])
         p.load(hooke=hooke)
-        playlist_names = [playlist.name for playlist in hooke.playlists]
-        if p.name in playlist_names or p.name == None:
-            p.name = params['output playlist']  # HACK: override input name.  How to tell if it is callback-generated?
         self._set_playlist(hooke, params, p)
 	outqueue.put(p)
 
diff --git a/hooke/plugin/playlists.py b/hooke/plugin/playlists.py
index ccd5020..df80999 100644
--- a/hooke/plugin/playlists.py
+++ b/hooke/plugin/playlists.py
@@ -119,7 +119,4 @@ Default filename for future saves.
             drivers=hooke.drivers,
             path=params['file'],
             )
-        playlist_names = [playlist.name for playlist in hooke.playlists]
-        if p.name in playlist_names or p.name == None:
-            p.name = params['output playlist']  # HACK: override input name.  How to tell if it is callback-generated?
-        hooke.playlists.append(p)
+        self._set_playlist(hooke, params, p)