Grzegorz/empidee
Grzegorz/empidee
1
0
Fork 0
Code Issues 17 Pull Requests Actions Releases Activity

commands: make macros usable without use statements

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit 2024-11-30 02:28:10 +01:00
parent 84f061a79f
commit 74074bf9c7
Signed by: oysteikt
GPG Key ID: 9F2F7D8250F35146
2 changed files with 45 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

78
src/commands.rs
View File

@ -139,18 +139,20 @@ impl<'a> From<ResponseAttributes<'a>> for HashMap<&'a str, GenericResponseValue<
macro_rules! get_property {
($parts:expr, $name:literal, $variant:ident) => {
match $parts.get($name) {
Some(GenericResponseValue::$variant(value)) => *value,
Some(crate::commands::GenericResponseValue::$variant(value)) => *value,
Some(value) => {
let actual_type = match value {
GenericResponseValue::Text(_) => "Text",
GenericResponseValue::Binary(_) => "Binary",
crate::commands::GenericResponseValue::Text(_) => "Text",
crate::commands::GenericResponseValue::Binary(_) => "Binary",
};
return Err(ResponseParserError::UnexpectedPropertyType(
$name,
actual_type,
));
return Err(
crate::commands::ResponseParserError::UnexpectedPropertyType(
$name,
actual_type,
),
);
}
None => return Err(ResponseParserError::MissingProperty($name)),
None => return Err(crate::commands::ResponseParserError::MissingProperty($name)),
}
};
}
@ -158,16 +160,18 @@ macro_rules! get_property {
macro_rules! get_optional_property {
($parts:expr, $name:literal, $variant:ident) => {
match $parts.get($name) {
Some(GenericResponseValue::$variant(value)) => Some(*value),
Some(crate::commands::GenericResponseValue::$variant(value)) => Some(*value),
Some(value) => {
let actual_type = match value {
GenericResponseValue::Text(_) => "Text",
GenericResponseValue::Binary(_) => "Binary",
crate::commands::GenericResponseValue::Text(_) => "Text",
crate::commands::GenericResponseValue::Binary(_) => "Binary",
};
return Err(ResponseParserError::UnexpectedPropertyType(
$name,
actual_type,
));
return Err(
crate::commands::ResponseParserError::UnexpectedPropertyType(
$name,
actual_type,
),
);
}
None => None,
}
@ -177,20 +181,22 @@ macro_rules! get_optional_property {
macro_rules! get_and_parse_property {
($parts:ident, $name:literal, $variant:ident) => {
match $parts.get($name) {
Some(GenericResponseValue::$variant(value)) => (*value)
Some(crate::commands::GenericResponseValue::$variant(value)) => (*value)
.parse()
.map_err(|_| ResponseParserError::InvalidProperty($name, value))?,
.map_err(|_| crate::commands::ResponseParserError::InvalidProperty($name, value))?,
Some(value) => {
let actual_type = match value {
GenericResponseValue::Text(_) => "Text",
GenericResponseValue::Binary(_) => "Binary",
crate::commands::GenericResponseValue::Text(_) => "Text",
crate::commands::GenericResponseValue::Binary(_) => "Binary",
};
return Err(ResponseParserError::UnexpectedPropertyType(
$name,
actual_type,
));
return Err(
crate::commands::ResponseParserError::UnexpectedPropertyType(
$name,
actual_type,
),
);
}
None => return Err(ResponseParserError::MissingProperty($name)),
None => return Err(crate::commands::ResponseParserError::MissingProperty($name)),
}
};
}
@ -198,20 +204,22 @@ macro_rules! get_and_parse_property {
macro_rules! get_and_parse_optional_property {
($parts:ident, $name:literal, $variant:ident) => {
match $parts.get($name) {
Some(GenericResponseValue::$variant(value)) => Some(
(*value)
.parse()
.map_err(|_| ResponseParserError::InvalidProperty($name, value))?,
),
Some(crate::commands::GenericResponseValue::$variant(value)) => {
Some((*value).parse().map_err(|_| {
crate::commands::ResponseParserError::InvalidProperty($name, value)
})?)
}
Some(value) => {
let actual_type = match value {
GenericResponseValue::Text(_) => "Text",
GenericResponseValue::Binary(_) => "Binary",
crate::commands::GenericResponseValue::Text(_) => "Text",
crate::commands::GenericResponseValue::Binary(_) => "Binary",
};
return Err(ResponseParserError::UnexpectedPropertyType(
$name,
actual_type,
));
return Err(
crate::commands::ResponseParserError::UnexpectedPropertyType(
$name,
actual_type,
),
);
}
None => None,
}

4
src/commands/playback_options/replay_gain_status.rs
View File

@ -2,8 +2,8 @@ use std::{collections::HashMap, str::FromStr};
use crate::{
commands::{
get_property, Command, GenericResponseValue, Request, RequestParserResult,
ResponseAttributes, ResponseParserError,
get_property, Command, Request, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
request::ReplayGainModeMode,
};