Factor out sticker parsing.

Author: tomprince

src/client.rs

@@ -22,6 +22,7 @@ use status::{ReplayGain, Status};
 use std::convert::From;
 use std::io::{BufRead, Lines, Read, Write};
 use std::net::{TcpStream, ToSocketAddrs};
+use sticker::Sticker;
 use version::Version;
 
 // Client {{{
@@ -600,8 +601,8 @@ impl<S: Read + Write> Client<S> {
     pub fn sticker(&mut self, typ: &str, uri: &str, name: &str) -> Result<String> {
         self.run_command("sticker get", (typ, uri, name))
             // TODO: This should parse to a `Sticker` type.
-            .and_then(|_| self.read_field::<String>("sticker"))
-            .and_then(|s| s.splitn(2, '=').nth(1).map(str::to_owned).ok_or_else(|| Error::Proto(ProtoError::BadSticker)))
+            .and_then(|_| self.read_field::<Sticker>("sticker"))
+            .map(|s| s.value)
     }
 
     /// Set sticker value for a given object, identified by type and uri

src/lib.rs

@@ -51,6 +51,7 @@ pub mod search;
 pub mod message;
 pub mod idle;
 pub mod mount;
+mod sticker;
 
 mod proto;
 pub mod client;

src/sticker.rs

@@ -0,0 +1,23 @@
+use error::ParseError;
+use std::str::FromStr;
+
+pub struct Sticker {
+    pub name: String,
+    pub value: String,
+}
+
+impl FromStr for Sticker {
+    type Err = ParseError;
+    fn from_str(s: &str) -> Result<Sticker, ParseError> {
+        let mut parts = s.splitn(2, '=');
+        match (parts.next(), parts.next()) {
+            (Some(name), Some(value)) => {
+                Ok(Sticker {
+                    name: name.to_owned(),
+                    value: value.to_owned(),
+                })
+            }
+            _ => Err(ParseError::BadValue(s.to_owned())),
+        }
+    }
+}