WIP

Cargo.lock

@@ -1,6 +1,6 @@
 # This file is automatically @generated by Cargo.
 # It is not intended for manual editing.
-version = 3
+version = 4
 
 [[package]]
 name = "diff"
@@ -19,9 +19,9 @@ dependencies = [
 
 [[package]]
 name = "indoc"
-version = "2.0.5"
+version = "2.0.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b248f5224d1d606005e02c97f5aa4e88eeb230488bcc03bc9ca4d7991399f2b5"
+checksum = "f4c7245a08504955605670dbf141fceab975f15ca21570696aebe9d2e71576bd"
 
 [[package]]
 name = "pretty_assertions"
@@ -35,36 +35,36 @@ dependencies = [
 
 [[package]]
 name = "proc-macro2"
-version = "1.0.88"
+version = "1.0.95"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "7c3a7fc5db1e57d5a779a352c8cdb57b29aa4c40cc69c3a68a7fedc815fbf2f9"
+checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
 dependencies = [
  "unicode-ident",
 ]
 
 [[package]]
 name = "quote"
-version = "1.0.37"
+version = "1.0.40"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "b5b9d34b8991d19d98081b46eacdd8eb58c6f2b201139f7c5f643cc155a633af"
+checksum = "1885c039570dc00dcb4ff087a89e185fd56bae234ddc7f056a945bf36467248d"
 dependencies = [
  "proc-macro2",
 ]
 
 [[package]]
 name = "serde"
-version = "1.0.210"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "c8e3592472072e6e22e0a54d5904d9febf8508f65fb8552499a1abc7d1078c3a"
+checksum = "5f0e2c6ed6606019b4e29e69dbaba95b11854410e5347d525002456dbbb786b6"
 dependencies = [
  "serde_derive",
 ]
 
 [[package]]
 name = "serde_derive"
-version = "1.0.210"
+version = "1.0.219"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "243902eda00fad750862fc144cea25caca5e20d615af0a81bee94ca738f1df1f"
+checksum = "5b0276cf7f2c73365f7157c8123c21cd9a50fbbd844757af28ca1f5925fc2a00"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -73,9 +73,9 @@ dependencies = [
 
 [[package]]
 name = "syn"
-version = "2.0.82"
+version = "2.0.101"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "83540f837a8afc019423a8edb95b52a8effe46957ee402287f4292fae35be021"
+checksum = "8ce2b7fc941b3a24138a0a7cf8e858bfc6a992e7978a068a5c760deb0ed43caf"
 dependencies = [
  "proc-macro2",
  "quote",
@@ -84,9 +84,9 @@ dependencies = [
 
 [[package]]
 name = "unicode-ident"
-version = "1.0.13"
+version = "1.0.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e91b56cd4cadaeb79bbf1a5645f6b4f8dc5bde8834ad5894a8db35fda9efa1fe"
+checksum = "5a5f39404a5da50712a4c1eecf25e90dd62b613502b7e925fd4e4d19b5c96512"
 
 [[package]]
 name = "yansi"

Cargo.toml

@@ -7,8 +7,8 @@ authors = [
 description = "A rust implementation of the mpd protocol, both client and serverside"
 repository = "https://git.pvv.ntnu.no/Grzegorz/empidee"
 documentation = "https://pages.pvv.ntnu.no/Grzegorz/empidee/main/docs/empidee/"
-edition = "2021"
-rust-version = "1.83.0"
+edition = "2024"
+rust-version = "1.85.0"
 
 [dependencies]
 serde = { version = "1.0.210", features = ["derive"] }

flake.lock

@@ -2,11 +2,11 @@
   "nodes": {
     "nixpkgs": {
       "locked": {
-        "lastModified": 1739866667,
-        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "lastModified": 1746461020,
+        "narHash": "sha256-7+pG1I9jvxNlmln4YgnlW4o+w0TZX24k688mibiFDUE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+        "rev": "3730d8a308f94996a9ba7c7138ede69c1b9ac4ae",
         "type": "github"
       },
       "original": {
@@ -29,11 +29,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740277845,
-        "narHash": "sha256-NNU0CdiaSbAeZ8tpDG4aFi9qtcdlItRvk8Xns9oBrVU=",
+        "lastModified": 1746585402,
+        "narHash": "sha256-Pf+ufu6bYNA1+KQKHnGMNEfTwpD9ZIcAeLoE2yPWIP0=",
         "owner": "oxalica",
         "repo": "rust-overlay",
-        "rev": "f933070c29f9c1c5457447a51903f27f76ebb519",
+        "rev": "72dd969389583664f87aa348b3458f2813693617",
         "type": "github"
       },
       "original": {

rustfmt.toml

@@ -0,0 +1 @@
+style_edition = "2024"

src/commands/client_to_client/channels.rs

@@ -1,8 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct Channels;

src/commands/client_to_client/readmessages.rs

@@ -1,8 +1,8 @@
 use serde::{Deserialize, Serialize};
 
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct ReadMessages;
@@ -34,8 +34,12 @@ impl Command for ReadMessages {
             let (ckey, cvalue) = channel_message_pair[0];
             let (mkey, mvalue) = channel_message_pair[1];
 
-            debug_assert!(ckey == "channel");
-            debug_assert!(mkey == "message");
+            if ckey != "channel" {
+                return Err(ResponseParserError::UnexpectedProperty(ckey));
+            }
+            if mkey != "message" {
+                return Err(ResponseParserError::UnexpectedProperty(mkey));
+            }
 
             let channel = expect_property_type!(Some(cvalue), "channel", Text).to_string();
             let message = expect_property_type!(Some(mvalue), "message", Text).to_string();

src/commands/connection_settings/protocol.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct Protocol;

src/commands/connection_settings/protocol_all.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ProtocolAll;

src/commands/connection_settings/protocol_available.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ProtocolAvailable;

src/commands/connection_settings/protocol_clear.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ProtocolClear;

src/commands/connection_settings/protocol_disable.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct ProtocolDisable;

src/commands/connection_settings/protocol_enable.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct ProtocolEnable;

src/commands/connection_settings/tag_types.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    Command, GenericResponseValue, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct TagTypes;
@@ -24,16 +24,7 @@ impl Command for TagTypes {
         let mut tagtypes = Vec::with_capacity(parts.len());
         for (key, value) in parts.into_iter() {
             debug_assert_eq!(key, "tagtype");
-
-            let tagtype = match value {
-                GenericResponseValue::Text(name) => name.to_string(),
-                GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(
-                        "tagtype", "Binary",
-                    ))
-                }
-            };
-
+            let tagtype = expect_property_type!(Some(value), "tagtype", Text).to_string();
             tagtypes.push(tagtype);
         }
 

src/commands/connection_settings/tag_types_all.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct TagTypesAll;

src/commands/connection_settings/tag_types_available.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct TagTypesAvailable;

src/commands/connection_settings/tag_types_clear.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct TagTypesClear;

src/commands/connection_settings/tag_types_disable.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct TagTypesDisable;

src/commands/connection_settings/tag_types_enable.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct TagTypesEnable;

src/commands/connection_settings/tag_types_reset.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct TagTypesReset;

src/commands/mounts_and_neighbors/listmounts.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ListMounts;

src/commands/mounts_and_neighbors/listneighbors.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct ListNeighbors;

src/commands/mounts_and_neighbors/mount.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Mount;

src/commands/mounts_and_neighbors/unmount.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Unmount;

src/commands/music_database/albumart.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, get_property, Command, Request, RequestParserError,
-        RequestParserResult, ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_and_parse_property, get_property,
     },
     common::Offset,
 };

src/commands/music_database/count.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_and_parse_property,
     },
     filter::parse_filter,
 };

src/commands/music_database/getfingerprint.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+    ResponseParserError, get_and_parse_property,
 };
 
 pub struct GetFingerprint;

src/commands/music_database/list.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{
-        expect_property_type, Command, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, expect_property_type,
     },
     filter::parse_filter,
 };

src/commands/music_database/readcomments.rs

@@ -2,7 +2,7 @@ use std::collections::HashMap;
 
 use crate::commands::{
     Command, GenericResponseValue, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    ResponseAttributes, ResponseParserError, expect_property_type,
 };
 
 pub struct ReadComments;
@@ -30,10 +30,12 @@ impl Command for ReadComments {
         let parts: HashMap<_, _> = parts.into();
 
         let comments = parts
-            .iter()
-            .map(|(k, v)| match v {
-                GenericResponseValue::Text(s) => Ok((k.to_string(), s.to_string())),
-                GenericResponseValue::Binary(_) => Err(ResponseParserError::SyntaxError(1, k)),
+            .into_iter()
+            .map(|(k, v)| {
+                Ok((
+                    k.to_string(),
+                    expect_property_type!(Some(v), k, Text).to_string(),
+                ))
             })
             .collect::<Result<HashMap<_, _>, ResponseParserError>>()?;
 

src/commands/music_database/readpicture.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, get_optional_property, get_property, Command, Request,
-        RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_and_parse_property, get_optional_property, get_property,
     },
     common::Offset,
 };

src/commands/music_database/rescan.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    get_and_parse_property,
 };
 
 pub struct Rescan;

src/commands/music_database/searchcount.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_and_parse_property,
     },
     filter::parse_filter,
 };

src/commands/music_database/update.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    get_and_parse_property,
 };
 
 pub struct Update;

src/commands/partition_commands/listpartitions.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct ListPartitions;

src/commands/playback_options/getvol.rs

@@ -2,8 +2,8 @@ use std::collections::HashMap;
 
 use crate::{
     commands::{
-        get_and_parse_property, Command, Request, RequestParserResult, ResponseAttributes,
-        ResponseParserError,
+        Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+        get_and_parse_property,
     },
     common::VolumeValue,
 };

src/commands/playback_options/replay_gain_status.rs

@@ -4,8 +4,8 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     commands::{
-        get_property, Command, Request, RequestParserResult, ResponseAttributes,
-        ResponseParserError,
+        Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+        get_property,
     },
     common::ReplayGainModeMode,
 };

src/commands/querying_mpd_status/stats.rs

@@ -3,8 +3,8 @@ use std::collections::HashMap;
 use serde::{Deserialize, Serialize};
 
 use crate::commands::{
-    get_and_parse_optional_property, get_and_parse_property, Command, Request, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    get_and_parse_optional_property, get_and_parse_property,
 };
 
 pub struct Stats;

src/commands/querying_mpd_status/status.rs

@@ -6,9 +6,9 @@ use serde::{Deserialize, Serialize};
 use crate::common::{Audio, BoolOrOneshot, SongId, SongPosition};
 
 use crate::commands::{
-    get_and_parse_optional_property, get_and_parse_property, get_optional_property, get_property,
     Command, GenericResponseValue, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    ResponseParserError, get_and_parse_optional_property, get_and_parse_property,
+    get_optional_property, get_property,
 };
 
 #[derive(Debug, Clone, PartialEq, Serialize, Deserialize)]

src/commands/queue/addid.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{
-        get_next_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, get_next_and_parse_property,
     },
     common::{SongId, SongPosition},
 };
@@ -40,8 +40,15 @@ impl Command for AddId {
     ) -> Result<Self::Response, ResponseParserError> {
         let parts: Vec<_> = parts.into();
         let mut iter = parts.into_iter();
+
         let (key, id) = get_next_and_parse_property!(iter, Text);
-        debug_assert!(key == "Id");
+
+        if key != "Id" {
+            return Err(ResponseParserError::UnexpectedProperty(key));
+        }
+
+        debug_assert!(iter.next().is_none());
+
         Ok(AddIdResponse { id })
     }
 }

src/commands/queue/addtagid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct AddTagId;

src/commands/queue/cleartagid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct ClearTagId;

src/commands/queue/delete.rs

@@ -1,11 +1,11 @@
 use std::str::FromStr;
 
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     common::OneOrRange,
-    Request,
 };
 
 pub struct Delete;

src/commands/queue/deleteid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct DeleteId;

src/commands/queue/move_.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Move;

src/commands/queue/moveid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct MoveId;

src/commands/queue/playlist.rs

@@ -1,6 +1,6 @@
 use crate::{
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
     Request,
+    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
 };
 
 pub struct Playlist;

src/commands/queue/playlistfind.rs

@@ -1,9 +1,9 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     filter::parse_filter,
-    Request,
 };
 
 pub struct PlaylistFind;

src/commands/queue/playlistid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PlaylistId;

src/commands/queue/playlistinfo.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PlaylistInfo;

src/commands/queue/playlistsearch.rs

@@ -1,9 +1,9 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     filter::parse_filter,
-    Request,
 };
 
 pub struct PlaylistSearch;

src/commands/queue/plchanges.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PlChanges;

src/commands/queue/plchangesposid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PlChangesPosId;

src/commands/queue/prio.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Prio;

src/commands/queue/prioid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct PrioId;

src/commands/queue/rangeid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct RangeId;

src/commands/queue/shuffle.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Shuffle;

src/commands/queue/swap.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct Swap;

src/commands/queue/swapid.rs

@@ -1,8 +1,8 @@
 use crate::{
+    Request,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
-    Request,
 };
 
 pub struct SwapId;

src/commands/reflection/commands.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    Command, GenericResponseValue, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct Commands;
@@ -25,14 +25,7 @@ impl Command for Commands {
             if key != "command" {
                 return Err(ResponseParserError::UnexpectedProperty(key));
             }
-            let value = match value {
-                GenericResponseValue::Text(value) => value,
-                GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(
-                        "handler", "Binary",
-                    ))
-                }
-            };
+            let value = expect_property_type!(Some(value), "command", Text);
             result.push(value.to_string());
         }
         Ok(result)

src/commands/reflection/config.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, get_property, Command, Request, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    get_and_parse_property, get_property,
 };
 
 pub struct Config;

src/commands/reflection/not_commands.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    Command, GenericResponseValue, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct NotCommands;
@@ -25,14 +25,7 @@ impl Command for NotCommands {
             if key != "command" {
                 return Err(ResponseParserError::UnexpectedProperty(key));
             }
-            let value = match value {
-                GenericResponseValue::Text(value) => value,
-                GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(
-                        "handler", "Binary",
-                    ))
-                }
-            };
+            let value = expect_property_type!(Some(value), "command", Text).to_string();
             result.push(value.to_string());
         }
         Ok(result)

src/commands/reflection/url_handlers.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    Command, GenericResponseValue, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct UrlHandlers;
@@ -25,14 +25,7 @@ impl Command for UrlHandlers {
             if key != "handler" {
                 return Err(ResponseParserError::UnexpectedProperty(key));
             }
-            let value = match value {
-                GenericResponseValue::Text(value) => value,
-                GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(
-                        "handler", "Binary",
-                    ))
-                }
-            };
+            let value = expect_property_type!(Some(value), "handler", Text);
             url_handlers.push(value.to_string());
         }
         Ok(url_handlers)

src/commands/stickers/sticker_find.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    Command, GenericResponseValue, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+    ResponseParserError, expect_property_type,
 };
 
 pub struct StickerFind;
@@ -84,21 +84,8 @@ impl Command for StickerFind {
             // TODO: debug assert that this is a valid sticker type
             // debug_assert!(uri.0 == "");
 
-            let uri = match uri.1 {
-                GenericResponseValue::Text(s) => s.to_string(),
-                GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(uri.0, "Binary"))
-                }
-            };
-
-            let sticker = match sticker.1 {
-                GenericResponseValue::Text(s) => s,
-                GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(
-                        "sticker", "Binary",
-                    ))
-                }
-            };
+            let uri = expect_property_type!(Some(uri.1), uri.0, Text).to_string();
+            let sticker = expect_property_type!(Some(sticker.1), sticker.0, Text);
 
             // TODO: This assumes the first = is the only one.
             //       See: https://github.com/MusicPlayerDaemon/MPD/issues/2166

src/commands/stickers/sticker_get.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    get_next_property, Command, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+    ResponseParserError, get_next_property,
 };
 
 pub struct StickerGet;

src/commands/stickers/sticker_list.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    Command, GenericResponseValue, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+    ResponseParserError, expect_property_type,
 };
 
 pub struct StickerList;
@@ -37,12 +37,7 @@ impl Command for StickerList {
 
         let result = parts
             .iter()
-            .map(|(_, v)| match v {
-                GenericResponseValue::Text(value) => Ok(value),
-                GenericResponseValue::Binary(_) => Err(
-                    ResponseParserError::UnexpectedPropertyType("sticker", "Binary"),
-                ),
-            })
+            .map(|(k, v)| Ok(expect_property_type!(Some(v), k, Text)))
             .collect::<Result<Vec<_>, ResponseParserError>>()?;
 
         result

src/commands/stickers/stickernames.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct StickerNames;

src/commands/stickers/stickernamestypes.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    Command, GenericResponseValue, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct StickerNamesTypes;
@@ -34,23 +34,8 @@ impl Command for StickerNamesTypes {
             debug_assert!(name_key == "name");
             debug_assert!(type_key == "type");
 
-            let name = match name_value {
-                GenericResponseValue::Text(s) => s.to_string(),
-                GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(
-                        "name", "Binary",
-                    ))
-                }
-            };
-
-            let sticker_type = match type_value {
-                GenericResponseValue::Text(s) => s.to_string(),
-                GenericResponseValue::Binary(_) => {
-                    return Err(ResponseParserError::UnexpectedPropertyType(
-                        "type", "Binary",
-                    ))
-                }
-            };
+            let name = expect_property_type!(Some(name_value), name_key, Text).to_string();
+            let sticker_type = expect_property_type!(Some(type_value), type_key, Text).to_string();
 
             result
                 .entry(name)

src/commands/stickers/stickertypes.rs

@@ -1,6 +1,6 @@
 use crate::commands::{
-    expect_property_type, Command, Request, RequestParserResult, ResponseAttributes,
-    ResponseParserError,
+    Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
+    expect_property_type,
 };
 
 pub struct StickerTypes;

src/commands/stored_playlists/listplaylist.rs

@@ -1,7 +1,7 @@
 use crate::{
     commands::{
-        Command, GenericResponseValue, Request, RequestParserError, RequestParserResult,
-        ResponseAttributes, ResponseParserError,
+        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+        ResponseParserError, expect_property_type,
     },
     common::PlaylistName,
 };
@@ -37,17 +37,12 @@ impl Command for ListPlaylist {
         parts: ResponseAttributes<'_>,
     ) -> Result<Self::Response, ResponseParserError> {
         let parts: Vec<_> = parts.into();
+
+        debug_assert!(parts.iter().all(|(k, _)| *k == "file"));
+
         parts
             .into_iter()
-            .map(|(name, value)| {
-                debug_assert_eq!(name, "file");
-                match value {
-                    GenericResponseValue::Text(value) => Ok(value.to_string()),
-                    GenericResponseValue::Binary(_) => Err(
-                        ResponseParserError::UnexpectedPropertyType("file", "Binary"),
-                    ),
-                }
-            })
+            .map(|(name, value)| Ok(expect_property_type!(Some(value), name, Text).to_string()))
             .collect::<Result<Vec<_>, _>>()
     }
 }

src/commands/stored_playlists/playlistlength.rs

@@ -1,8 +1,8 @@
 use std::collections::HashMap;
 
 use crate::commands::{
-    get_and_parse_property, Command, Request, RequestParserError, RequestParserResult,
-    ResponseAttributes, ResponseParserError,
+    Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
+    ResponseParserError, get_and_parse_property,
 };
 
 pub struct PlaylistLength;

src/request.rs

@@ -239,7 +239,7 @@ impl Request {
                         .ok_or(RequestParserError::MissingCommandListEnd(i))?;
                     match line.trim() {
                         "command_list_begin" => {
-                            return Err(RequestParserError::NestedCommandList(i))
+                            return Err(RequestParserError::NestedCommandList(i));
                         }
                         "command_list_end" => {
                             return Ok((Request::CommandList(commands), rest));

src/server.rs

@@ -1,4 +1,4 @@
-use crate::{common::SubSystem, Request, Response};
+use crate::{Request, Response, common::SubSystem};
 
 pub trait MPDServer {
     type Error;