Implement a proper request tokenizer

src/commands/queue/add.rs

@@ -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),

src/commands/queue/addid.rs

@@ -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),

src/commands/queue/addtagid.rs

@@ -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()

src/commands/queue/clear.rs

@@ -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, ""))
     }

src/commands/queue/cleartagid.rs

@@ -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()

src/commands/queue/delete.rs

@@ -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()))?;

src/commands/queue/deleteid.rs

@@ -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()

src/commands/queue/move_.rs

@@ -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()

src/commands/queue/moveid.rs

@@ -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()

src/commands/queue/playlist.rs

@@ -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, ""))
     }

src/commands/queue/playlistfind.rs

@@ -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;

src/commands/queue/playlistid.rs

@@ -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()

src/commands/queue/playlistinfo.rs

@@ -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| {

src/commands/queue/playlistsearch.rs

@@ -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;

src/commands/queue/plchanges.rs

@@ -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()

src/commands/queue/plchangesposid.rs

@@ -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()

src/commands/queue/prio.rs

@@ -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()

src/commands/queue/prioid.rs

@@ -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()

src/commands/queue/rangeid.rs

@@ -2,6 +2,7 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
+    request_tokenizer::RequestTokenizer,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
@@ -30,7 +31,7 @@ impl Command for RangeId {
         )
     }
 
-    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()

src/commands/queue/shuffle.rs

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

src/commands/queue/swap.rs

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

src/commands/queue/swapid.rs

@@ -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 SwapId {
         format!("{} {} {}", Self::COMMAND, request.songid1, request.songid2)
     }
 
-    fn parse_request(mut parts: std::str::SplitWhitespace<'_>) -> RequestParserResult<'_> {
+    fn parse_request(mut parts: RequestTokenizer<'_>) -> RequestParserResult<'_> {
         let songid1 = parts.next().ok_or(RequestParserError::UnexpectedEOF)?;
         let songid1 = songid1
             .parse()