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

Implement a proper request tokenizer

Browse Source
This commit is contained in:
Oystein Kristoffer Tveit
2025-11-24 14:18:30 +09:00
parent 3bd7aaaad2
commit b5fbaadca2
136 changed files with 883 additions and 365 deletions
Download Patch File Download Diff File Expand all files Collapse all files

168
src/commands.rs
View File

@@ -1,9 +1,6 @@
use std::{
collections::{HashMap, HashSet},
str::SplitWhitespace,
};
use std::collections::{HashMap, HashSet};
use crate::Request;
use crate::{Request, request_tokenizer::RequestTokenizer};
mod audio_output_devices;
mod client_to_client;
@@ -53,27 +50,23 @@ pub trait Command {
// self.serialize_response().into_bytes()
// }
// TODO: `parse_request` should be using a more custom splitter, that can handle
// quoted strings and escape characters. This is what mpd uses to provide arguments
// with spaces and whatnot.
// A function to parse the remaining parts of the command, split by whitespace
fn parse_request(parts: SplitWhitespace<'_>) -> RequestParserResult<'_>;
fn parse_request(parts: RequestTokenizer<'_>) -> RequestParserResult<'_>;
fn parse_raw_request(raw: &str) -> RequestParserResult<'_> {
let (line, rest) = raw
.split_once('\n')
.ok_or(RequestParserError::UnexpectedEOF)?;
let mut parts = line.split_whitespace();
let mut tokenized = RequestTokenizer::new(line);
let command_name = parts
let command_name = tokenized
.next()
.ok_or(RequestParserError::SyntaxError(0, line.to_string()))?
.trim();
debug_assert!(command_name == Self::COMMAND);
Self::parse_request(parts).map(|(req, _)| (req, rest))
Self::parse_request(tokenized).map(|(req, _)| (req, rest))
}
fn parse_response(
@@ -381,6 +374,155 @@ pub(crate) use get_next_property;
pub(crate) use get_optional_property;
pub(crate) use get_property;
/*******************/
pub const COMMAND_NAMES: &[&str] = &[
// Audio output devices
DisableOutput::COMMAND,
EnableOutput::COMMAND,
Outputs::COMMAND,
OutputSet::COMMAND,
ToggleOutput::COMMAND,
// Client to client
Channels::COMMAND,
ReadMessages::COMMAND,
SendMessage::COMMAND,
Subscribe::COMMAND,
Unsubscribe::COMMAND,
// Connection settings
BinaryLimit::COMMAND,
Close::COMMAND,
Kill::COMMAND,
Password::COMMAND,
Ping::COMMAND,
Protocol::COMMAND,
ProtocolAll::COMMAND,
ProtocolAvailable::COMMAND,
ProtocolClear::COMMAND,
ProtocolDisable::COMMAND,
ProtocolEnable::COMMAND,
TagTypes::COMMAND,
TagTypesAll::COMMAND,
TagTypesAvailable::COMMAND,
TagTypesClear::COMMAND,
TagTypesDisable::COMMAND,
TagTypesEnable::COMMAND,
TagTypesReset::COMMAND,
// Controlling playback
Next::COMMAND,
Pause::COMMAND,
Play::COMMAND,
PlayId::COMMAND,
Previous::COMMAND,
Seek::COMMAND,
SeekCur::COMMAND,
SeekId::COMMAND,
Stop::COMMAND,
// Mounts and neighbors
ListMounts::COMMAND,
ListNeighbors::COMMAND,
Mount::COMMAND,
Unmount::COMMAND,
// Music database
AlbumArt::COMMAND,
Count::COMMAND,
Find::COMMAND,
FindAdd::COMMAND,
GetFingerprint::COMMAND,
List::COMMAND,
ListAll::COMMAND,
ListAllInfo::COMMAND,
ListFiles::COMMAND,
LsInfo::COMMAND,
ReadComments::COMMAND,
ReadPicture::COMMAND,
Rescan::COMMAND,
Search::COMMAND,
SearchAdd::COMMAND,
SearchAddPl::COMMAND,
SearchCount::COMMAND,
Update::COMMAND,
// Partition commands
DelPartition::COMMAND,
ListPartitions::COMMAND,
MoveOutput::COMMAND,
NewPartition::COMMAND,
Partition::COMMAND,
// Playback options
Consume::COMMAND,
Crossfade::COMMAND,
GetVol::COMMAND,
MixRampDb::COMMAND,
MixRampDelay::COMMAND,
Random::COMMAND,
Repeat::COMMAND,
ReplayGainMode::COMMAND,
ReplayGainStatus::COMMAND,
SetVol::COMMAND,
Single::COMMAND,
Volume::COMMAND,
// Querying mpd status
ClearError::COMMAND,
CurrentSong::COMMAND,
Idle::COMMAND,
Stats::COMMAND,
Status::COMMAND,
// Queue
Add::COMMAND,
AddId::COMMAND,
AddTagId::COMMAND,
Clear::COMMAND,
ClearTagId::COMMAND,
Delete::COMMAND,
DeleteId::COMMAND,
Move::COMMAND,
MoveId::COMMAND,
Playlist::COMMAND,
PlaylistFind::COMMAND,
PlaylistId::COMMAND,
PlaylistInfo::COMMAND,
PlaylistSearch::COMMAND,
PlChanges::COMMAND,
PlChangesPosId::COMMAND,
Prio::COMMAND,
PrioId::COMMAND,
RangeId::COMMAND,
Shuffle::COMMAND,
Swap::COMMAND,
SwapId::COMMAND,
// Reflection
Commands::COMMAND,
Config::COMMAND,
Decoders::COMMAND,
NotCommands::COMMAND,
UrlHandlers::COMMAND,
// Stickers
StickerDec::COMMAND,
StickerDelete::COMMAND,
StickerFind::COMMAND,
StickerGet::COMMAND,
StickerInc::COMMAND,
StickerList::COMMAND,
StickerSet::COMMAND,
StickerNames::COMMAND,
StickerNamesTypes::COMMAND,
StickerTypes::COMMAND,
// Stored playlists
ListPlaylist::COMMAND,
ListPlaylistInfo::COMMAND,
ListPlaylists::COMMAND,
Load::COMMAND,
PlaylistAdd::COMMAND,
PlaylistClear::COMMAND,
PlaylistDelete::COMMAND,
PlaylistLength::COMMAND,
PlaylistMove::COMMAND,
Rename::COMMAND,
Rm::COMMAND,
Save::COMMAND,
SearchPlaylist::COMMAND,
];
#[cfg(test)]
mod tests {
use super::*;

3
src/commands/audio_output_devices/disableoutput.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -19,7 +20,7 @@ impl Command for DisableOutput {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let output_id = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
debug_assert!(parts.next().is_none());

3
src/commands/audio_output_devices/enableoutput.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -19,7 +20,7 @@ impl Command for EnableOutput {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let output_id = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
debug_assert!(parts.next().is_none());

11
src/commands/audio_output_devices/outputs.rs
View File

@@ -2,9 +2,12 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
expect_property_type,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
expect_property_type,
},
};
pub struct Outputs;
@@ -29,7 +32,7 @@ impl Command for Outputs {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Outputs, ""))
}

3
src/commands/audio_output_devices/outputset.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -32,7 +33,7 @@ impl Command for OutputSet {
)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let output_id = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let attribute_name = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let attribute_value = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;

3
src/commands/audio_output_devices/toggleoutput.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -19,7 +20,7 @@ impl Command for ToggleOutput {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let output_id = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
debug_assert!(parts.next().is_none());

3
src/commands/client_to_client/channels.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
expect_property_type,
@@ -24,7 +25,7 @@ impl Command for Channels {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Channels, ""))

3
src/commands/client_to_client/readmessages.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
expect_property_type,
@@ -27,7 +28,7 @@ impl Command for ReadMessages {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ReadMessages, ""))

3
src/commands/client_to_client/sendmessage.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -25,7 +26,7 @@ impl Command for SendMessage {
format!("{} {} {}", Self::COMMAND, request.channel, request.message)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let channel = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
// TODO: SplitWhitespace::remainder() is unstable, use when stable

3
src/commands/client_to_client/subscribe.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for Subscribe {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let channel_name = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
debug_assert!(parts.next().is_none());

3
src/commands/client_to_client/unsubscribe.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for Unsubscribe {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let channel_name = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
debug_assert!(parts.next().is_none());

11
src/commands/connection_settings/binary_limit.rs
View File

@@ -1,6 +1,9 @@
use crate::commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
};
pub struct BinaryLimit;
@@ -14,7 +17,7 @@ impl Command for BinaryLimit {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let limit = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let limit = limit
.parse()

7
src/commands/connection_settings/close.rs
View File

@@ -1,5 +1,6 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
pub struct Close;
@@ -13,7 +14,7 @@ impl Command for Close {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Close, ""))
}

7
src/commands/connection_settings/kill.rs
View File

@@ -1,5 +1,6 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
pub struct Kill;
@@ -13,7 +14,7 @@ impl Command for Kill {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Kill, ""))
}

11
src/commands/connection_settings/password.rs
View File

@@ -1,6 +1,9 @@
use crate::commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
};
pub struct Password;
@@ -14,7 +17,7 @@ impl Command for Password {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let password = parts
.next()
.ok_or(RequestParserError::UnexpectedEOF)?

7
src/commands/connection_settings/ping.rs
View File

@@ -1,5 +1,6 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
pub struct Ping;
@@ -13,7 +14,7 @@ impl Command for Ping {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Ping, ""))
}

3
src/commands/connection_settings/protocol.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserResult, ResponseAttributes, ResponseParserError, expect_property_type,
},
@@ -18,7 +19,7 @@ impl Command for Protocol {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Protocol, ""))
}

3
src/commands/connection_settings/protocol_all.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
};
@@ -14,7 +15,7 @@ impl Command for ProtocolAll {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ProtocolAll, ""))
}

3
src/commands/connection_settings/protocol_available.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserResult, ResponseAttributes, ResponseParserError, expect_property_type,
},
@@ -18,7 +19,7 @@ impl Command for ProtocolAvailable {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ProtocolAvailable, ""))
}

3
src/commands/connection_settings/protocol_clear.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
};
@@ -14,7 +15,7 @@ impl Command for ProtocolClear {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ProtocolClear, ""))
}

3
src/commands/connection_settings/protocol_disable.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -19,7 +20,7 @@ impl Command for ProtocolDisable {
format!("{} {}", Self::COMMAND, request.join(" "))
}
fn parse_request(parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let mut parts = parts.peekable();
if parts.peek().is_none() {
return Err(RequestParserError::UnexpectedEOF);

3
src/commands/connection_settings/protocol_enable.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -19,7 +20,7 @@ impl Command for ProtocolEnable {
format!("{} {}", Self::COMMAND, request.join(" "))
}
fn parse_request(parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let mut parts = parts.peekable();
if parts.peek().is_none() {
return Err(RequestParserError::UnexpectedEOF);

11
src/commands/connection_settings/tag_types.rs
View File

@@ -1,6 +1,9 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
expect_property_type,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
expect_property_type,
},
};
pub struct TagTypes;
@@ -16,7 +19,7 @@ impl Command for TagTypes {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::TagTypes, ""))
}

3
src/commands/connection_settings/tag_types_all.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
};
@@ -14,7 +15,7 @@ impl Command for TagTypesAll {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::TagTypesAll, ""))
}

3
src/commands/connection_settings/tag_types_available.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserResult, ResponseAttributes, ResponseParserError, expect_property_type,
},
@@ -18,7 +19,7 @@ impl Command for TagTypesAvailable {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::TagTypesAvailable, ""))
}

3
src/commands/connection_settings/tag_types_clear.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
};
@@ -14,7 +15,7 @@ impl Command for TagTypesClear {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::TagTypesClear, ""))
}

3
src/commands/connection_settings/tag_types_disable.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -19,7 +20,7 @@ impl Command for TagTypesDisable {
format!("{} {}", Self::COMMAND, request.join(" "))
}
fn parse_request(parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let mut parts = parts.peekable();
if parts.peek().is_none() {
return Err(RequestParserError::UnexpectedEOF);

3
src/commands/connection_settings/tag_types_enable.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -19,7 +20,7 @@ impl Command for TagTypesEnable {
format!("{} {}", Self::COMMAND, request.join(" "))
}
fn parse_request(parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let mut parts = parts.peekable();
if parts.peek().is_none() {
return Err(RequestParserError::UnexpectedEOF);

3
src/commands/connection_settings/tag_types_reset.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -19,7 +20,7 @@ impl Command for TagTypesReset {
format!("{} {}", Self::COMMAND, request.join(" "))
}
fn parse_request(parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let mut parts = parts.peekable();
if parts.peek().is_none() {
return Err(RequestParserError::UnexpectedEOF);

7
src/commands/controlling_playback/next.rs
View File

@@ -1,5 +1,6 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
pub struct Next;
@@ -13,7 +14,7 @@ impl Command for Next {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Next, ""))
}

11
src/commands/controlling_playback/pause.rs
View File

@@ -1,6 +1,9 @@
use crate::commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
};
pub struct Pause;
@@ -18,7 +21,7 @@ impl Command for Pause {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let result = match parts.next() {
Some("0") => Ok((Request::Pause(Some(false)), "")),
Some("1") => Ok((Request::Pause(Some(true)), "")),

3
src/commands/controlling_playback/play.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for Play {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let songpos = match parts.next() {
Some(s) => s
.parse::<SongPosition>()

3
src/commands/controlling_playback/playid.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for PlayId {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let songid = match parts.next() {
Some(s) => s
.parse::<SongId>()

7
src/commands/controlling_playback/previous.rs
View File

@@ -1,5 +1,6 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
pub struct Previous;
@@ -13,7 +14,7 @@ impl Command for Previous {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Previous, ""))
}

3
src/commands/controlling_playback/seek.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -25,7 +26,7 @@ impl Command for Seek {
format!("{} {} {}", Self::COMMAND, request.songpos, request.time)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let songpos = match parts.next() {
Some(s) => s
.parse::<SongPosition>()

3
src/commands/controlling_playback/seekcur.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -32,7 +33,7 @@ impl Command for SeekCur {
format!("{} {}", Self::COMMAND, time_str)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let time_raw = match parts.next() {
Some(t) => t,
None => return Err(RequestParserError::UnexpectedEOF),

3
src/commands/controlling_playback/seekid.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -25,7 +26,7 @@ impl Command for SeekId {
format!("{} {} {}", Self::COMMAND, request.songid, request.time)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let songid = match parts.next() {
Some(s) => s
.parse::<SongId>()

7
src/commands/controlling_playback/stop.rs
View File

@@ -1,5 +1,6 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
pub struct Stop;
@@ -13,7 +14,7 @@ impl Command for Stop {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Stop, ""))
}

3
src/commands/mounts_and_neighbors/listmounts.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserResult, ResponseAttributes, ResponseParserError, expect_property_type,
},
@@ -16,7 +17,7 @@ impl Command for ListMounts {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ListMounts, ""))
}

3
src/commands/mounts_and_neighbors/listneighbors.rs
View File

@@ -2,6 +2,7 @@ use std::collections::HashMap;
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserResult, ResponseAttributes, ResponseParserError, expect_property_type,
},
@@ -20,7 +21,7 @@ impl Command for ListNeighbors {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ListNeighbors, ""))
}

3
src/commands/mounts_and_neighbors/mount.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -24,7 +25,7 @@ impl Command for Mount {
format!("{} {} {}", Self::COMMAND, request.path, request.uri)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let path = parts
.next()
.ok_or(RequestParserError::UnexpectedEOF)?

3
src/commands/mounts_and_neighbors/unmount.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -18,7 +19,7 @@ impl Command for Unmount {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let path = parts
.next()
.ok_or(RequestParserError::UnexpectedEOF)?

3
src/commands/music_database/albumart.rs
View File

@@ -3,6 +3,7 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError, get_and_parse_property, get_property,
@@ -33,7 +34,7 @@ impl Command for AlbumArt {
format!("{} {} {}", Self::COMMAND, request.uri, request.offset)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = match parts.next() {
Some(s) => s,
None => return Err(RequestParserError::UnexpectedEOF),

12
src/commands/music_database/count.rs
View File

@@ -3,12 +3,13 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError, get_and_parse_property,
},
common::GroupType,
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct Count;
@@ -38,8 +39,13 @@ impl Command for Count {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
let filter = parse_filter(&mut parts)?;
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let group = if let Some("group") = parts.next() {
let group = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;

12
src/commands/music_database/find.rs
View File

@@ -1,12 +1,13 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
common::{Sort, WindowRange},
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct Find;
@@ -37,8 +38,13 @@ impl Command for Find {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
let filter = parse_filter(&mut parts)?;
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let mut sort_or_window = parts.next();
let mut sort = None;

12
src/commands/music_database/findadd.rs
View File

@@ -1,12 +1,13 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
common::{SongPosition, Sort, WindowRange},
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct FindAdd;
@@ -38,8 +39,13 @@ impl Command for FindAdd {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
let filter = parse_filter(&mut parts)?;
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let mut sort_or_window_or_position = parts.next();
let mut sort = None;

3
src/commands/music_database/getfingerprint.rs
View File

@@ -3,6 +3,7 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError, get_and_parse_property,
@@ -26,7 +27,7 @@ impl Command for GetFingerprint {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let uri = uri
.parse()

12
src/commands/music_database/list.rs
View File

@@ -1,12 +1,13 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError, expect_property_type,
},
common::{GroupType, TagName},
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct List;
@@ -33,14 +34,19 @@ impl Command for List {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let tagname = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let tagname = tagname
.parse()
.map_err(|_| RequestParserError::SyntaxError(1, tagname.to_owned()))?;
// TODO: This should be optional
let filter = parse_filter(&mut parts)?;
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let group = if let Some("group") = parts.next() {
let group = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;

3
src/commands/music_database/listall.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -24,7 +25,7 @@ impl Command for ListAll {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = parts
.next()
.map(|s| {

3
src/commands/music_database/listallinfo.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -25,7 +26,7 @@ impl Command for ListAllInfo {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = parts
.next()
.map(|s| {

3
src/commands/music_database/listfiles.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -24,7 +25,7 @@ impl Command for ListFiles {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = parts
.next()
.map(|s| {

3
src/commands/music_database/lsinfo.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError, expect_property_type,
@@ -30,7 +31,7 @@ impl Command for LsInfo {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = parts
.next()
.map(|s| {

3
src/commands/music_database/readcomments.rs
View File

@@ -1,6 +1,7 @@
use std::collections::HashMap;
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, GenericResponseValue, Request, RequestParserError, RequestParserResult,
ResponseAttributes, ResponseParserError,
@@ -21,7 +22,7 @@ impl Command for ReadComments {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let uri = uri
.parse()

3
src/commands/music_database/readpicture.rs
View File

@@ -3,6 +3,7 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError, get_and_parse_property, get_optional_property, get_property,
@@ -34,7 +35,7 @@ impl Command for ReadPicture {
format!("{} {} {}", Self::COMMAND, request.uri, request.offset)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = match parts.next() {
Some(s) => s,
None => return Err(RequestParserError::UnexpectedEOF),

3
src/commands/music_database/rescan.rs
View File

@@ -3,6 +3,7 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
get_and_parse_property,
@@ -29,7 +30,7 @@ impl Command for Rescan {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = parts.next().map(|s| s.to_string());
debug_assert!(parts.next().is_none());

12
src/commands/music_database/search.rs
View File

@@ -1,12 +1,13 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
common::{Sort, WindowRange},
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct Search;
@@ -37,8 +38,13 @@ impl Command for Search {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
let filter = parse_filter(&mut parts)?;
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let mut sort_or_window = parts.next();
let mut sort = None;

12
src/commands/music_database/searchadd.rs
View File

@@ -1,12 +1,13 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
common::{SongPosition, Sort, WindowRange},
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct SearchAdd;
@@ -38,8 +39,13 @@ impl Command for SearchAdd {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
let filter = parse_filter(&mut parts)?;
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let mut sort_or_window_or_position = parts.next();
let mut sort = None;

12
src/commands/music_database/searchaddpl.rs
View File

@@ -1,12 +1,13 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
common::{PlaylistName, SongPosition, Sort, WindowRange},
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct SearchAddPl;
@@ -44,13 +45,18 @@ impl Command for SearchAddPl {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let playlist_name = parts
.next()
.ok_or(RequestParserError::UnexpectedEOF)?
.to_string();
let filter = parse_filter(&mut parts)?;
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let mut sort_or_window_or_position = parts.next();
let mut sort = None;

12
src/commands/music_database/searchcount.rs
View File

@@ -3,12 +3,13 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError, get_and_parse_property,
},
common::GroupType,
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct SearchCount;
@@ -38,8 +39,13 @@ impl Command for SearchCount {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
let filter = parse_filter(&mut parts)?;
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let group = if let Some("group") = parts.next() {
let group = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;

3
src/commands/music_database/update.rs
View File

@@ -3,6 +3,7 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
get_and_parse_property,
@@ -29,7 +30,7 @@ impl Command for Update {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = parts.next().map(|s| s.to_string());
debug_assert!(parts.next().is_none());

3
src/commands/partition_commands/delpartition.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for DelPartition {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let partition = parts
.next()
.ok_or(RequestParserError::UnexpectedEOF)?

3
src/commands/partition_commands/listpartitions.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
expect_property_type,
@@ -19,7 +20,7 @@ impl Command for ListPartitions {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ListPartitions, ""))
}

11
src/commands/partition_commands/moveoutput.rs
View File

@@ -1,6 +1,9 @@
use crate::commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
};
pub struct MoveOutput;
@@ -14,7 +17,7 @@ impl Command for MoveOutput {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let output_name = parts
.next()
.ok_or(RequestParserError::UnexpectedEOF)?

3
src/commands/partition_commands/newpartition.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for NewPartition {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let partition = parts
.next()
.ok_or(RequestParserError::UnexpectedEOF)?

3
src/commands/partition_commands/partition.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for Partition {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let partition = parts
.next()
.ok_or(RequestParserError::UnexpectedEOF)?

3
src/commands/playback_options/consume.rs
View File

@@ -1,6 +1,7 @@
use std::str::FromStr;
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -19,7 +20,7 @@ impl Command for Consume {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let state = match parts.next() {
Some(s) => crate::common::BoolOrOneshot::from_str(s)
.map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?,

3
src/commands/playback_options/crossfade.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for Crossfade {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let seconds = match parts.next() {
Some(s) => s
.parse::<Seconds>()

3
src/commands/playback_options/getvol.rs
View File

@@ -1,6 +1,7 @@
use std::collections::HashMap;
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
get_and_parse_property,
@@ -19,7 +20,7 @@ impl Command for GetVol {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::GetVol, ""))
}

11
src/commands/playback_options/mixrampdb.rs
View File

@@ -1,6 +1,9 @@
use crate::commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
};
pub struct MixRampDb;
@@ -14,7 +17,7 @@ impl Command for MixRampDb {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let db = match parts.next() {
Some(s) => s
.parse::<f32>()

3
src/commands/playback_options/mixrampdelay.rs
View File

@@ -1,4 +1,5 @@
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -17,7 +18,7 @@ impl Command for MixRampDelay {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let seconds = match parts.next() {
Some(s) => s
.parse::<Seconds>()

11
src/commands/playback_options/random.rs
View File

@@ -1,6 +1,9 @@
use crate::commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
};
pub struct Random;
@@ -15,7 +18,7 @@ impl Command for Random {
format!("{} {}", Self::COMMAND, state)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let state = match parts.next() {
Some("0") => false,
Some("1") => true,

11
src/commands/playback_options/repeat.rs
View File

@@ -1,6 +1,9 @@
use crate::commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
},
};
pub struct Repeat;
@@ -15,7 +18,7 @@ impl Command for Repeat {
format!("{} {}", Self::COMMAND, state)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let state = match parts.next() {
Some("0") => false,
Some("1") => true,

3
src/commands/playback_options/replay_gain_mode.rs
View File

@@ -1,6 +1,7 @@
use std::str::FromStr;
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -19,7 +20,7 @@ impl Command for ReplayGainMode {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let mode = match parts.next() {
Some(s) => ReplayGainModeMode::from_str(s)
.map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?,

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

@@ -3,6 +3,7 @@ use std::{collections::HashMap, str::FromStr};
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
get_property,
@@ -26,7 +27,7 @@ impl Command for ReplayGainStatus {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ReplayGainStatus, ""))
}

3
src/commands/playback_options/setvol.rs
View File

@@ -1,6 +1,7 @@
use std::str::FromStr;
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -19,7 +20,7 @@ impl Command for SetVol {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let volume = match parts.next() {
Some(s) => VolumeValue::from_str(s)
.map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?,

3
src/commands/playback_options/single.rs
View File

@@ -1,6 +1,7 @@
use std::str::FromStr;
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -19,7 +20,7 @@ impl Command for Single {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let state = match parts.next() {
Some(s) => crate::common::BoolOrOneshot::from_str(s)
.map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?,

3
src/commands/playback_options/volume.rs
View File

@@ -1,6 +1,7 @@
use std::str::FromStr;
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -19,7 +20,7 @@ impl Command for Volume {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let change = match parts.next() {
Some(s) => VolumeValue::from_str(s)
.map_err(|_| RequestParserError::SyntaxError(0, s.to_owned()))?,

7
src/commands/querying_mpd_status/clearerror.rs
View File

@@ -1,5 +1,6 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
/// Clears the current error message in status (this is also accomplished by any command that starts playback)
@@ -14,7 +15,7 @@ impl Command for ClearError {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::ClearError, ""))

7
src/commands/querying_mpd_status/currentsong.rs
View File

@@ -1,7 +1,8 @@
use serde::{Deserialize, Serialize};
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
/// Displays the song info of the current song (same song that is identified in status)
@@ -19,7 +20,7 @@ impl Command for CurrentSong {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::CurrentSong, ""))

5
src/commands/querying_mpd_status/idle.rs
View File

@@ -1,5 +1,6 @@
use std::str::{FromStr, SplitWhitespace};
use std::str::FromStr;
use crate::request_tokenizer::RequestTokenizer;
use crate::common::SubSystem;
use crate::commands::{
@@ -29,7 +30,7 @@ impl Command for Idle {
}
}
fn parse_request(mut parts: SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let result = parts
.next()
.map_or(Ok((Request::Idle(None), "")), |subsystems| {

11
src/commands/querying_mpd_status/stats.rs
View File

@@ -2,9 +2,12 @@ use std::collections::HashMap;
use serde::{Deserialize, Serialize};
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
get_and_parse_optional_property, get_and_parse_property,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
get_and_parse_optional_property, get_and_parse_property,
},
};
pub struct Stats;
@@ -29,7 +32,7 @@ impl Command for Stats {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Stats, ""))

3
src/commands/querying_mpd_status/status.rs
View File

@@ -3,6 +3,7 @@ use std::str::FromStr;
use serde::{Deserialize, Serialize};
use crate::request_tokenizer::RequestTokenizer;
use crate::common::{Audio, BoolOrOneshot, SongId, SongPosition};
use crate::commands::{
@@ -167,7 +168,7 @@ impl Command for Status {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Status, ""))

3
src/commands/queue/add.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError,
@@ -28,7 +29,7 @@ impl Command for Add {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = match parts.next() {
Some(s) => s,
None => return Err(RequestParserError::UnexpectedEOF),

3
src/commands/queue/addid.rs
View File

@@ -1,6 +1,7 @@
use serde::{Deserialize, Serialize};
use crate::{
request_tokenizer::RequestTokenizer,
commands::{
Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
ResponseParserError, get_next_and_parse_property,
@@ -33,7 +34,7 @@ impl Command for AddId {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let uri = match parts.next() {
Some(s) => s,
None => return Err(RequestParserError::UnexpectedEOF),

3
src/commands/queue/addtagid.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -32,7 +33,7 @@ impl Command for AddTagId {
)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let songid = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let songid = songid
.parse()

7
src/commands/queue/clear.rs
View File

@@ -1,5 +1,6 @@
use crate::commands::{
Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError,
use crate::{
request_tokenizer::RequestTokenizer,
commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
};
pub struct Clear;
@@ -13,7 +14,7 @@ impl Command for Clear {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Clear, ""))
}

3
src/commands/queue/cleartagid.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -25,7 +26,7 @@ impl Command for ClearTagId {
format!("{} {} {}", Self::COMMAND, request.songid, request.tag_name)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let songid = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let songid = songid
.parse()

3
src/commands/queue/delete.rs
View File

@@ -2,6 +2,7 @@ use std::str::FromStr;
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -19,7 +20,7 @@ impl Command for Delete {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let pos_or_range = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let one_or_range = OneOrRange::from_str(pos_or_range)
.map_err(|_| RequestParserError::SyntaxError(0, pos_or_range.to_string()))?;

3
src/commands/queue/deleteid.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -17,7 +18,7 @@ impl Command for DeleteId {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let id = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let id = id
.parse()

3
src/commands/queue/move_.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -25,7 +26,7 @@ impl Command for Move {
format!("{} {} {}", Self::COMMAND, request.from_or_range, request.to)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let from_or_range = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let from_or_range = from_or_range
.parse()

3
src/commands/queue/moveid.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -25,7 +26,7 @@ impl Command for MoveId {
format!("{} {} {}", Self::COMMAND, request.id, request.to)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let id = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let id = id
.parse()

3
src/commands/queue/playlist.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
};
@@ -14,7 +15,7 @@ impl Command for Playlist {
Self::COMMAND.to_string()
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
debug_assert!(parts.next().is_none());
Ok((Request::Playlist, ""))
}

12
src/commands/queue/playlistfind.rs
View File

@@ -2,11 +2,12 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
common::{Sort, WindowRange},
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct PlaylistFind;
@@ -34,8 +35,13 @@ impl Command for PlaylistFind {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
let filter = parse_filter(&mut parts)?;
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let mut sort_or_window = parts.next();
let mut sort = None;

3
src/commands/queue/playlistid.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -17,7 +18,7 @@ impl Command for PlaylistId {
format!("{} {}", Self::COMMAND, request)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let id = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let id = id
.parse()

3
src/commands/queue/playlistinfo.rs
View File

@@ -1,5 +1,6 @@
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -20,7 +21,7 @@ impl Command for PlaylistInfo {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let one_or_range = parts
.next()
.map(|s| {

12
src/commands/queue/playlistsearch.rs
View File

@@ -2,11 +2,12 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
common::{Sort, WindowRange},
filter::{Filter, parse_filter},
filter::Filter,
};
pub struct PlaylistSearch;
@@ -34,8 +35,13 @@ impl Command for PlaylistSearch {
cmd
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
let filter = parse_filter(&mut parts)?;
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let filter = match parts.next() {
Some(f) => {
Filter::parse(f).map_err(|_| RequestParserError::SyntaxError(1, f.to_owned()))?
}
None => return Err(RequestParserError::UnexpectedEOF),
};
let mut sort_or_window = parts.next();
let mut sort = None;

3
src/commands/queue/plchanges.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -28,7 +29,7 @@ impl Command for PlChanges {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let version = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let version = version
.parse()

3
src/commands/queue/plchangesposid.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -28,7 +29,7 @@ impl Command for PlChangesPosId {
}
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let version = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let version = version
.parse()

3
src/commands/queue/prio.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -25,7 +26,7 @@ impl Command for Prio {
format!("{} {} {}", Self::COMMAND, request.prio, request.window)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let prio = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let prio = prio
.parse()

3
src/commands/queue/prioid.rs
View File

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
use crate::{
Request,
request_tokenizer::RequestTokenizer,
commands::{
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
},
@@ -31,7 +32,7 @@ impl Command for PrioId {
format!("{} {} {}", Self::COMMAND, request.prio, songids)
}
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
let prio = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
let prio = prio
.parse()

Some files were not shown because too many files have changed in this diff Show More