commands: split response tokenizer into separate file

src/commands/queue/add.rs

@@ -1,12 +1,10 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
-        ResponseParserError,
-    },
+    commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
     common::{SongPosition, Uri},
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct Add;

src/commands/queue/addid.rs

@@ -1,12 +1,10 @@
 use serde::{Deserialize, Serialize};
 
 use crate::{
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, Request, RequestParserError, RequestParserResult, ResponseAttributes,
-        ResponseParserError, get_next_and_parse_property,
-    },
+    commands::{Command, Request, RequestParserError, RequestParserResult, ResponseParserError},
     common::{SongId, SongPosition, Uri},
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::{ResponseAttributes, get_next_and_parse_property},
 };
 
 pub struct AddId;

src/commands/queue/addtagid.rs

@@ -2,11 +2,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     common::{SongId, TagName, TagValue},
+    request_tokenizer::RequestTokenizer,
 };
 
 pub struct AddTagId;

src/commands/queue/clear.rs

@@ -1,6 +1,7 @@
 use crate::{
+    commands::{Command, Request, RequestParserResult, ResponseParserError},
     request_tokenizer::RequestTokenizer,
-    commands::{Command, Request, RequestParserResult, ResponseAttributes, ResponseParserError},
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct Clear;

src/commands/queue/cleartagid.rs

@@ -2,11 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::{SongId, TagName},
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct ClearTagId;

src/commands/queue/delete.rs

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

src/commands/queue/deleteid.rs

@@ -1,10 +1,9 @@
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::SongId,
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct DeleteId;

src/commands/queue/move_.rs

@@ -2,11 +2,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     common::{AbsouluteRelativeSongPosition, OneOrRange},
+    request_tokenizer::RequestTokenizer,
 };
 
 pub struct Move;

src/commands/queue/moveid.rs

@@ -2,11 +2,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
     commands::{
         Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
     },
     common::{AbsouluteRelativeSongPosition, SongId},
+    request_tokenizer::RequestTokenizer,
 };
 
 pub struct MoveId;

src/commands/queue/playlist.rs

@@ -1,7 +1,8 @@
 use crate::{
     Request,
+    commands::{Command, RequestParserResult, ResponseParserError},
     request_tokenizer::RequestTokenizer,
-    commands::{Command, RequestParserResult, ResponseAttributes, ResponseParserError},
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct Playlist;

src/commands/queue/playlistfind.rs

@@ -2,12 +2,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::{Sort, WindowRange},
     filter::Filter,
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct PlaylistFind;

src/commands/queue/playlistid.rs

@@ -1,10 +1,9 @@
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::SongId,
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct PlaylistId;

src/commands/queue/playlistinfo.rs

@@ -1,10 +1,9 @@
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::OneOrRange,
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct PlaylistInfo;

src/commands/queue/playlistsearch.rs

@@ -2,12 +2,11 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::{Sort, WindowRange},
     filter::Filter,
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct PlaylistSearch;

src/commands/queue/plchanges.rs

@@ -2,11 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::{Version, WindowRange},
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct PlChanges;

src/commands/queue/plchangesposid.rs

@@ -2,11 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::{Version, WindowRange},
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct PlChangesPosId;

src/commands/queue/prio.rs

@@ -2,11 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::{Priority, WindowRange},
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct Prio;

src/commands/queue/prioid.rs

@@ -2,11 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::{Priority, SongId},
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct PrioId;

src/commands/queue/rangeid.rs

@@ -2,11 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::{SongId, TimeInterval},
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct RangeId;

src/commands/queue/shuffle.rs

@@ -1,10 +1,9 @@
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::OneOrRange,
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct Shuffle;

src/commands/queue/swap.rs

@@ -2,11 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::SongPosition,
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct Swap;

src/commands/queue/swapid.rs

@@ -2,11 +2,10 @@ use serde::{Deserialize, Serialize};
 
 use crate::{
     Request,
-    request_tokenizer::RequestTokenizer,
-    commands::{
-        Command, RequestParserError, RequestParserResult, ResponseAttributes, ResponseParserError,
-    },
+    commands::{Command, RequestParserError, RequestParserResult, ResponseParserError},
     common::SongId,
+    request_tokenizer::RequestTokenizer,
+    response_tokenizer::ResponseAttributes,
 };
 
 pub struct SwapId;