Use SongPath for adding songs to the queue.

Author: tomprince

src/client.rs

@@ -237,8 +237,8 @@ impl<S: Read + Write> Client<S> {
     }
 
     /// Append a song into a queue
-    pub fn push<P: AsRef<str>>(&mut self, path: P) -> Result<Id> {
-        self.run_command("addid", path.as_ref())
+    pub fn push<P: ToSongPath>(&mut self, path: P) -> Result<Id> {
+        self.run_command("addid", path)
             .and_then(|_| self.read_field("Id"))
             .and_then(|v| {
                 self.expect_ok()
@@ -247,8 +247,8 @@ impl<S: Read + Write> Client<S> {
     }
 
     /// Insert a song into a given position in a queue
-    pub fn insert<P: AsRef<str>>(&mut self, path: P, pos: usize) -> Result<usize> {
-        self.run_command("addid", (path.as_ref(), pos))
+    pub fn insert<P: ToSongPath>(&mut self, path: P, pos: usize) -> Result<usize> {
+        self.run_command("addid", (path, pos))
             .and_then(|_| self.read_field("Id"))
             .and_then(|v| {
                 self.expect_ok()
@@ -383,8 +383,8 @@ impl<S: Read + Write> Client<S> {
     }
 
     /// Add new songs to a playlist
-    pub fn pl_push<N: ToPlaylistName, P: AsRef<str>>(&mut self, name: N, path: P) -> Result<()> {
-        self.run_command("playlistadd", (name.to_name(), path.as_ref()))
+    pub fn pl_push<N: ToPlaylistName, P: ToSongPath>(&mut self, name: N, path: P) -> Result<()> {
+        self.run_command("playlistadd", (name.to_name(), path))
             .and_then(|_| self.expect_ok())
     }
 

src/convert.rs

@@ -4,6 +4,7 @@
 use error::Error;
 use output::Output;
 use playlist::Playlist;
+use proto::ToArguments;
 use song::{self, Id, Song};
 use std::collections::BTreeMap;
 use std::ops::{Range, RangeFrom, RangeFull, RangeTo};
@@ -281,4 +282,35 @@ impl ToSongRange for song::Range {
         self
     }
 }
+
 // }}}
+
+pub trait ToSongPath {
+    fn to_path(&self) -> &str;
+}
+
+impl ToSongPath for Song {
+    fn to_path(&self) -> &str {
+        &self.file
+    }
+}
+
+impl<'a, T: ToSongPath> ToSongPath for &'a T {
+    fn to_path(&self) -> &str {
+        (*self).to_path()
+    }
+}
+
+impl ToSongPath for AsRef<str> {
+    fn to_path(&self) -> &str {
+        self.as_ref()
+    }
+}
+
+impl<T: ToSongPath> ToArguments for T {
+    fn to_arguments<F, E>(&self, f: &mut F) -> Result<(), E>
+        where F: FnMut(&str) -> Result<(), E>
+    {
+        self.to_path().to_arguments(f)
+    }
+}