commands: use real Filter type
This commit is contained in:
@@ -2,6 +2,7 @@ use crate::{
|
||||
commands::{
|
||||
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
|
||||
},
|
||||
filter::parse_filter,
|
||||
Request,
|
||||
};
|
||||
|
||||
@@ -12,8 +13,7 @@ impl Command for PlaylistFind {
|
||||
const COMMAND: &'static str = "playlistfind";
|
||||
|
||||
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
|
||||
let filter = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
|
||||
let filter = filter.to_string();
|
||||
let filter = parse_filter(&mut parts)?;
|
||||
|
||||
let mut sort_or_window = parts.next();
|
||||
let mut sort = None;
|
||||
|
||||
@@ -2,6 +2,7 @@ use crate::{
|
||||
commands::{
|
||||
Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
|
||||
},
|
||||
filter::parse_filter,
|
||||
Request,
|
||||
};
|
||||
|
||||
@@ -12,10 +13,7 @@ impl Command for PlaylistSearch {
|
||||
const COMMAND: &'static str = "playlistsearch";
|
||||
|
||||
fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
|
||||
let filter = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
|
||||
let filter = filter
|
||||
.parse()
|
||||
.map_err(|_| RequestParserError::SyntaxError(0, filter.to_string()))?;
|
||||
let filter = parse_filter(&mut parts)?;
|
||||
|
||||
let mut sort_or_window = parts.next();
|
||||
let mut sort = None;
|
||||
|
||||
Reference in New Issue
Block a user