commands: fix some syntax errors reporting literals

src/commands/music_database/count.rs

@@ -23,12 +23,12 @@ impl Command for Count {
         let filter = parse_filter(&mut parts)?;
 
         let group = if let Some("group") = parts.next() {
+            let group = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
+
             Some(
-                parts
+                group
-                    .next()
-                    .ok_or(RequestParserError::UnexpectedEOF)?
                     .parse()
-                    .map_err(|_| RequestParserError::SyntaxError(1, "group".to_owned()))?,
+                    .map_err(|_| RequestParserError::SyntaxError(1, group.to_owned()))?,
             )
         } else {
             None

src/commands/music_database/getfingerprint.rs

@@ -19,7 +19,7 @@ impl Command for GetFingerprint {
         let uri = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
         let uri = uri
             .parse()
-            .map_err(|_| RequestParserError::SyntaxError(1, "uri".to_owned()))?;
+            .map_err(|_| RequestParserError::SyntaxError(1, uri.to_owned()))?;
 
         debug_assert!(parts.next().is_none());
 

src/commands/music_database/list.rs

@@ -18,7 +18,7 @@ impl Command for List {
         let tagtype = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
         let tagtype = tagtype
             .parse()
-            .map_err(|_| RequestParserError::SyntaxError(1, "tagtype".to_owned()))?;
+            .map_err(|_| RequestParserError::SyntaxError(1, tagtype.to_owned()))?;
 
         // TODO: This should be optional
         let filter = parse_filter(&mut parts)?;
@@ -28,7 +28,7 @@ impl Command for List {
             Some(
                 group
                     .parse()
-                    .map_err(|_| RequestParserError::SyntaxError(1, "group".to_owned()))?,
+                    .map_err(|_| RequestParserError::SyntaxError(1, group.to_owned()))?,
             )
         } else {
             None
@@ -50,11 +50,11 @@ impl Command for List {
         let list = parts
             .0
             .iter()
-            .map(|(_, v)| match v {
+            .map(|(k, v)| match v {
                 GenericResponseValue::Text(value) => Ok(value.to_string()),
-                GenericResponseValue::Binary(_) => Err(
+                GenericResponseValue::Binary(_) => {
-                    ResponseParserError::UnexpectedPropertyType("handler", "Binary"),
+                    Err(ResponseParserError::UnexpectedPropertyType(k, "Binary"))
-                ),
+                }
             })
             .collect::<Result<Vec<_>, ResponseParserError>>()?;
 

src/commands/music_database/listall.rs

@@ -17,7 +17,7 @@ impl Command for ListAll {
             .next()
             .map(|s| {
                 s.parse()
-                    .map_err(|_| RequestParserError::SyntaxError(1, "uri".to_owned()))
+                    .map_err(|_| RequestParserError::SyntaxError(1, s.to_owned()))
             })
             .transpose()?;
 

src/commands/music_database/listallinfo.rs

@@ -18,7 +18,7 @@ impl Command for ListAllInfo {
             .next()
             .map(|s| {
                 s.parse()
-                    .map_err(|_| RequestParserError::SyntaxError(1, "uri".to_owned()))
+                    .map_err(|_| RequestParserError::SyntaxError(1, s.to_owned()))
             })
             .transpose()?;
 

src/commands/music_database/listfiles.rs

@@ -17,7 +17,7 @@ impl Command for ListFiles {
             .next()
             .map(|s| {
                 s.parse()
-                    .map_err(|_| RequestParserError::SyntaxError(1, "uri".to_owned()))
+                    .map_err(|_| RequestParserError::SyntaxError(1, s.to_owned()))
             })
             .transpose()?;
 

src/commands/music_database/lsinfo.rs

@@ -17,7 +17,7 @@ impl Command for LsInfo {
             .next()
             .map(|s| {
                 s.parse()
-                    .map_err(|_| RequestParserError::SyntaxError(1, "uri".to_owned()))
+                    .map_err(|_| RequestParserError::SyntaxError(1, s.to_owned()))
             })
             .transpose()?;
 

src/commands/music_database/readcomments.rs

@@ -17,7 +17,7 @@ impl Command for ReadComments {
         let uri = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
         let uri = uri
             .parse()
-            .map_err(|_| RequestParserError::SyntaxError(1, "uri".to_owned()))?;
+            .map_err(|_| RequestParserError::SyntaxError(1, uri.to_owned()))?;
 
         debug_assert!(parts.next().is_none());
 

src/commands/music_database/searchcount.rs

@@ -23,12 +23,11 @@ impl Command for SearchCount {
         let filter = parse_filter(&mut parts)?;
 
         let group = if let Some("group") = parts.next() {
+            let group = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
             Some(
-                parts
+                group
-                    .next()
-                    .ok_or(RequestParserError::UnexpectedEOF)?
                     .parse()
-                    .map_err(|_| RequestParserError::SyntaxError(1, "group".to_owned()))?,
+                    .map_err(|_| RequestParserError::SyntaxError(1, group.to_owned()))?,
             )
         } else {
             None

src/commands/stickers/sticker_list.rs

@@ -17,12 +17,12 @@ impl Command for StickerList {
         let sticker_type = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
         let sticker_type = sticker_type
             .parse()
-            .map_err(|_| RequestParserError::SyntaxError(1, "sticker_type".to_owned()))?;
+            .map_err(|_| RequestParserError::SyntaxError(1, sticker_type.to_owned()))?;
 
         let uri = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
         let uri = uri
             .parse()
-            .map_err(|_| RequestParserError::SyntaxError(1, "uri".to_owned()))?;
+            .map_err(|_| RequestParserError::SyntaxError(1, uri.to_owned()))?;
 
         debug_assert!(parts.next().is_none());