Merge lp:~gawhelan/exaile/DBus-enqueue into lp:exaile/0.3.3

[Graham Whelan]

[Graham Whelan (gawhelan)]

Added an enqueue method to the DBus interface. This accepts a list of filenames and adds them to the current playlist.

This also enables enqueuing from the command line, accepting a list of filenames or reading a null separated list from stdin.

This allows for the following usage:

Add a single track
$ exaile $HOME/Music/Artist/Album/track01.mp3

Add multiple tracks
$ exaile $HOME/Music/Artist/Album/track01.mp3 $HOME/Music/Artist/Album/track02.mp3

Add all tracks within a folder
$ exaile $HOME/Music/Artist/Album/*.mp3

Add all tracks within a folder and it's sub-folders
$ find $HOME/Music/Artist -name *.mp3 -print0 | exaile -

[Johannes Sasongko (sjohannes)]

Thanks, they would be quite handy indeed.

Just one question about this bit:

+ # if '-' is the first argument then we look for a null
+ # separated list of filenames from stdin.
+ # This enables: find PATH -name *.mp3 -print0 | exaile -
+ if args[0] == '-':
+ args = sys.stdin.read().split('\0')

Do you think it will be better to allow newline characters as the separator as well? I know files may have newline chars in them, but it's not common at all, and I'm guessing the convenience of doing `cat list_of_files.txt | exaile -` outweighs the limitation.

In any case, I'm approving the merge, pending your response.

review: Approve

[lp:~gawhelan/exaile/DBus-enqueue]

1820. By Graham Whelan on 2009-03-27

Changed command line to accept a newline-separated list of files rather than a null-separated list

[Graham Whelan (gawhelan)]

Johannes Sasongko wrote:
"Do you think it will be better to allow newline characters as the separator as well? I know files may have newline chars in them, but it's not common at all, and I'm guessing the convenience of doing `cat list_of_files.txt | exaile -` outweighs the limitation."

I considered using newline as the separator but I decided to play it safe and use null. I think you're right though, the convenience of using newline does outweigh the limitations, so I've changed it.

I don't think it's necessary to support both. You could add a `-0` option which accepts a null-separated list, but like you said, filenames containing newline chars are so rare I doubt it would be of much use.

[Johannes Sasongko (sjohannes)]

Thanks. I've merged your latest changes to trunk.

=== modified file 'xl/xldbus.py'
--- xl/xldbus.py	2009-03-24 23:16:10 +0000
+++ xl/xldbus.py	2009-03-26 23:55:26 +0000
@@ -13,6 +13,7 @@
 # Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
 
 from xl.nls import gettext as _
+from xl.track import Track
 import dbus, dbus.service, gobject, sys
 from optparse import OptionParser
 
@@ -38,12 +39,16 @@
                 'org.exaile.ExaileInterface')
             iface.test_service('testing dbus service')
 
-            # check for one argument, if it doesn't begin with a it's probably
-            # a url
-            args = sys.argv[2:]
-            if not [x for x in args if x.startswith('-')]:
-                for arg in args:
-                    iface.play_file(arg)
+            # Assume that args are files to be added to the current playlist.
+            # This enables:    exaile PATH/*.mp3
+            if args:
+                # if '-' is the first argument then we look for a null 
+                # separated list of filenames from stdin.
+                # This enables:    find PATH -name *.mp3 -print0 | exaile -
+                if args[0] == '-':
+                    args = sys.stdin.read().split('\0')
+                iface.enqueue(args)
+                do_exit = True
 
             info_commands = ('get_artist', 'get_title', 'get_album',
                 'get_length', 'get_rating')
@@ -153,3 +158,12 @@
             Plays the specified file
         """
         self.exaile.gui.open_uri(filename)
+
+    @dbus.service.method("org.exaile.ExaileInterface", "as")
+    def enqueue(self, filenames):
+        """
+            Adds the specified files to the current playlist
+        """
+        tracks = [Track(f) for f in filenames]
+        self.exaile.queue.current_playlist.add_tracks(tracks)
+