diff --git a/src/commands.rs b/src/commands.rs index 72fd5f2..0dd6f23 100644 --- a/src/commands.rs +++ b/src/commands.rs @@ -192,7 +192,7 @@ macro_rules! empty_command_request { } fn serialize(&self) -> String { - Self::COMMAND.to_string() + Self::COMMAND.to_string() + "\n" } fn parse( @@ -259,7 +259,7 @@ macro_rules! single_item_command_request { } fn serialize(&self) -> String { - format!("{} {}", Self::COMMAND, self.0) + format!("{} {}\n", Self::COMMAND, self.0) } fn parse( @@ -308,8 +308,8 @@ macro_rules! single_optional_item_command_request { fn serialize(&self) -> String { match &self.0 { - Some(item) => format!("{} {}", Self::COMMAND, item), - None => Self::COMMAND.to_string(), + Some(item) => format!("{} {}\n", Self::COMMAND, item), + None => Self::COMMAND.to_string() + "\n", } } diff --git a/src/commands/controlling_playback/pause.rs b/src/commands/controlling_playback/pause.rs index d1807a3..bdaa406 100644 --- a/src/commands/controlling_playback/pause.rs +++ b/src/commands/controlling_playback/pause.rs @@ -23,9 +23,9 @@ impl CommandRequest<'_> for PauseRequest { fn serialize(&self) -> String { match self.0 { - Some(true) => format!("{} 1", Self::COMMAND), - Some(false) => format!("{} 0", Self::COMMAND), - None => Self::COMMAND.to_string(), + Some(true) => format!("{} 1\n", Self::COMMAND), + Some(false) => format!("{} 0\n", Self::COMMAND), + None => Self::COMMAND.to_string() + "\n", } } diff --git a/src/commands/controlling_playback/seek.rs b/src/commands/controlling_playback/seek.rs index 961626c..5381554 100644 --- a/src/commands/controlling_playback/seek.rs +++ b/src/commands/controlling_playback/seek.rs @@ -29,7 +29,7 @@ impl CommandRequest<'_> for SeekRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.songpos, self.time) + format!("{} {} {}\n", Self::COMMAND, self.songpos, self.time) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/controlling_playback/seekcur.rs b/src/commands/controlling_playback/seekcur.rs index a354f81..8a5c09a 100644 --- a/src/commands/controlling_playback/seekcur.rs +++ b/src/commands/controlling_playback/seekcur.rs @@ -35,7 +35,7 @@ impl CommandRequest<'_> for SeekCurRequest { SeekMode::RelativeReverse => format!("-{}", self.time), }; - format!("{} {}", Self::COMMAND, time_str) + format!("{} {}\n", Self::COMMAND, time_str) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/controlling_playback/seekid.rs b/src/commands/controlling_playback/seekid.rs index 9a7c8c9..a661a6c 100644 --- a/src/commands/controlling_playback/seekid.rs +++ b/src/commands/controlling_playback/seekid.rs @@ -29,7 +29,7 @@ impl CommandRequest<'_> for SeekIdRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.songid, self.time) + format!("{} {} {}\n", Self::COMMAND, self.songid, self.time) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/mounts_and_neighbors/mount.rs b/src/commands/mounts_and_neighbors/mount.rs index 708fd5b..d62c2d2 100644 --- a/src/commands/mounts_and_neighbors/mount.rs +++ b/src/commands/mounts_and_neighbors/mount.rs @@ -31,7 +31,7 @@ impl CommandRequest<'_> for MountRequest { fn serialize(&self) -> String { debug_assert!(self.path.to_str().is_some()); format!( - "{} {} {}", + "{} {} {}\n", Self::COMMAND, self.path.to_str().unwrap_or(""), self.uri diff --git a/src/commands/mounts_and_neighbors/unmount.rs b/src/commands/mounts_and_neighbors/unmount.rs index dc0b8db..85eb05b 100644 --- a/src/commands/mounts_and_neighbors/unmount.rs +++ b/src/commands/mounts_and_neighbors/unmount.rs @@ -27,7 +27,7 @@ impl CommandRequest<'_> for UnmountRequest { fn serialize(&self) -> String { debug_assert!(self.0.to_str().is_some()); format!( - "{} {}", + "{} {}\n", Self::COMMAND, self.0.to_str().unwrap_or("") ) diff --git a/src/commands/music_database/albumart.rs b/src/commands/music_database/albumart.rs index d986c86..34ad341 100644 --- a/src/commands/music_database/albumart.rs +++ b/src/commands/music_database/albumart.rs @@ -32,7 +32,7 @@ impl CommandRequest<'_> for AlbumArtRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.uri, self.offset) + format!("{} {} {}\n", Self::COMMAND, self.uri, self.offset) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/music_database/count.rs b/src/commands/music_database/count.rs index a1e7bac..4193d36 100644 --- a/src/commands/music_database/count.rs +++ b/src/commands/music_database/count.rs @@ -37,6 +37,7 @@ impl CommandRequest<'_> for CountRequest { if let Some(group) = self.group.as_ref() { cmd.push_str(&format!(" group {}", group)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/music_database/find.rs b/src/commands/music_database/find.rs index c501ed7..bb34b48 100644 --- a/src/commands/music_database/find.rs +++ b/src/commands/music_database/find.rs @@ -43,6 +43,7 @@ impl CommandRequest<'_> for FindRequest { if let Some(window) = &self.window { cmd.push_str(&format!(" window {}", window)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/music_database/findadd.rs b/src/commands/music_database/findadd.rs index 4d3bd64..d677b95 100644 --- a/src/commands/music_database/findadd.rs +++ b/src/commands/music_database/findadd.rs @@ -47,6 +47,7 @@ impl CommandRequest<'_> for FindAddRequest { if let Some(position) = &self.position { cmd.push_str(&format!(" position {}", position)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/music_database/list.rs b/src/commands/music_database/list.rs index 0b29f4d..8e18bf9 100644 --- a/src/commands/music_database/list.rs +++ b/src/commands/music_database/list.rs @@ -48,6 +48,7 @@ impl CommandRequest<'_> for ListRequest { if let Some(window) = &self.window { cmd.push_str(&format!(" window {}", window)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/music_database/readpicture.rs b/src/commands/music_database/readpicture.rs index 5ef92d9..d583ed5 100644 --- a/src/commands/music_database/readpicture.rs +++ b/src/commands/music_database/readpicture.rs @@ -34,7 +34,7 @@ impl CommandRequest<'_> for ReadPictureRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.uri, self.offset) + format!("{} {} {}\n", Self::COMMAND, self.uri, self.offset) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/music_database/search.rs b/src/commands/music_database/search.rs index 1645433..f9f4b84 100644 --- a/src/commands/music_database/search.rs +++ b/src/commands/music_database/search.rs @@ -43,6 +43,7 @@ impl CommandRequest<'_> for SearchRequest { if let Some(window) = &self.window { cmd.push_str(&format!(" window {}", window)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/music_database/searchadd.rs b/src/commands/music_database/searchadd.rs index b150166..85bc88c 100644 --- a/src/commands/music_database/searchadd.rs +++ b/src/commands/music_database/searchadd.rs @@ -47,6 +47,7 @@ impl CommandRequest<'_> for SearchAddRequest { if let Some(position) = &self.position { cmd.push_str(&format!(" position {}", position)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/music_database/searchaddpl.rs b/src/commands/music_database/searchaddpl.rs index 12e27cf..60b6c7b 100644 --- a/src/commands/music_database/searchaddpl.rs +++ b/src/commands/music_database/searchaddpl.rs @@ -57,6 +57,7 @@ impl CommandRequest<'_> for SearchAddPlRequest { if let Some(position) = &self.position { cmd.push_str(&format!(" position {}", position)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/music_database/searchcount.rs b/src/commands/music_database/searchcount.rs index d92f613..ce73318 100644 --- a/src/commands/music_database/searchcount.rs +++ b/src/commands/music_database/searchcount.rs @@ -39,6 +39,7 @@ impl CommandRequest<'_> for SearchCountRequest { if let Some(group) = &self.group { cmd.push_str(&format!(" group {}", group)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/playback_options/random.rs b/src/commands/playback_options/random.rs index 65f6cba..c1e554f 100644 --- a/src/commands/playback_options/random.rs +++ b/src/commands/playback_options/random.rs @@ -23,7 +23,7 @@ impl CommandRequest<'_> for RandomRequest { fn serialize(&self) -> String { let state = if self.0 { "1" } else { "0" }; - format!("{} {}", Self::COMMAND, state) + format!("{} {}\n", Self::COMMAND, state) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/playback_options/repeat.rs b/src/commands/playback_options/repeat.rs index 08087d3..68a4c59 100644 --- a/src/commands/playback_options/repeat.rs +++ b/src/commands/playback_options/repeat.rs @@ -23,7 +23,7 @@ impl CommandRequest<'_> for RepeatRequest { fn serialize(&self) -> String { let state = if self.0 { "1" } else { "0" }; - format!("{} {}", Self::COMMAND, state) + format!("{} {}\n", Self::COMMAND, state) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/querying_mpd_status/idle.rs b/src/commands/querying_mpd_status/idle.rs index 6ef9598..9654666 100644 --- a/src/commands/querying_mpd_status/idle.rs +++ b/src/commands/querying_mpd_status/idle.rs @@ -32,9 +32,9 @@ impl CommandRequest<'_> for IdleRequest { .map(|subsystem| subsystem.to_string()) .collect::>() .join(","); - format!("{} {}", Self::COMMAND, subsystems_str) + format!("{} {}\n", Self::COMMAND, subsystems_str) } - None => Self::COMMAND.to_string(), + None => Self::COMMAND.to_string() + "\n", } } diff --git a/src/commands/queue/add.rs b/src/commands/queue/add.rs index f5df8c0..9b7e588 100644 --- a/src/commands/queue/add.rs +++ b/src/commands/queue/add.rs @@ -30,8 +30,8 @@ impl CommandRequest<'_> for AddRequest { fn serialize(&self) -> String { match self.position { - Some(position) => format!("{} {} {}", Self::COMMAND, self.uri, position), - None => format!("{} {}", Self::COMMAND, self.uri), + Some(position) => format!("{} {} {}\n", Self::COMMAND, self.uri, position), + None => format!("{} {}\n", Self::COMMAND, self.uri), } } diff --git a/src/commands/queue/addid.rs b/src/commands/queue/addid.rs index df2385e..9be6e03 100644 --- a/src/commands/queue/addid.rs +++ b/src/commands/queue/addid.rs @@ -31,8 +31,8 @@ impl CommandRequest<'_> for AddIdRequest { fn serialize(&self) -> String { match self.position { - Some(pos) => format!("{} {} {}", Self::COMMAND, self.uri, pos), - None => format!("{} {}", Self::COMMAND, self.uri), + Some(pos) => format!("{} {} {}\n", Self::COMMAND, self.uri, pos), + None => format!("{} {}\n", Self::COMMAND, self.uri), } } diff --git a/src/commands/queue/addtagid.rs b/src/commands/queue/addtagid.rs index cf07ac1..a09c432 100644 --- a/src/commands/queue/addtagid.rs +++ b/src/commands/queue/addtagid.rs @@ -35,7 +35,7 @@ impl CommandRequest<'_> for AddTagIdRequest { fn serialize(&self) -> String { format!( - "{} {} {} {}", + "{} {} {} {}\n", Self::COMMAND, self.songid, self.tag_name, diff --git a/src/commands/queue/cleartagid.rs b/src/commands/queue/cleartagid.rs index 768d5f1..10309f1 100644 --- a/src/commands/queue/cleartagid.rs +++ b/src/commands/queue/cleartagid.rs @@ -31,7 +31,7 @@ impl CommandRequest<'_> for ClearTagIdRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.songid, self.tag_name) + format!("{} {} {}\n", Self::COMMAND, self.songid, self.tag_name) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/queue/move_.rs b/src/commands/queue/move_.rs index 6a0bda8..d1e0a24 100644 --- a/src/commands/queue/move_.rs +++ b/src/commands/queue/move_.rs @@ -29,7 +29,7 @@ impl CommandRequest<'_> for MoveRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.from_or_range, self.to) + format!("{} {} {}\n", Self::COMMAND, self.from_or_range, self.to) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/queue/moveid.rs b/src/commands/queue/moveid.rs index 9ac7533..c1e4051 100644 --- a/src/commands/queue/moveid.rs +++ b/src/commands/queue/moveid.rs @@ -29,7 +29,7 @@ impl CommandRequest<'_> for MoveIdRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.id, self.to) + format!("{} {} {}\n", Self::COMMAND, self.id, self.to) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/queue/playlistfind.rs b/src/commands/queue/playlistfind.rs index 8000f77..f961998 100644 --- a/src/commands/queue/playlistfind.rs +++ b/src/commands/queue/playlistfind.rs @@ -44,6 +44,7 @@ impl CommandRequest<'_> for PlaylistFindRequest { if let Some(window) = &self.window { cmd.push_str(&format!(" window {}", window)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/queue/playlistsearch.rs b/src/commands/queue/playlistsearch.rs index 78f92e1..1e283ce 100644 --- a/src/commands/queue/playlistsearch.rs +++ b/src/commands/queue/playlistsearch.rs @@ -43,6 +43,7 @@ impl CommandRequest<'_> for PlaylistSearchRequest { if let Some(window) = &self.window { cmd.push_str(&format!(" window {}", window)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/queue/plchanges.rs b/src/commands/queue/plchanges.rs index 722d250..3f7fff5 100644 --- a/src/commands/queue/plchanges.rs +++ b/src/commands/queue/plchanges.rs @@ -33,8 +33,8 @@ impl CommandRequest<'_> for PlChangesRequest { fn serialize(&self) -> String { match self.window.as_ref() { - Some(window) => format!("{} {} {}", Self::COMMAND, self.version, window), - None => format!("{} {}", Self::COMMAND, self.version), + Some(window) => format!("{} {} {}\n", Self::COMMAND, self.version, window), + None => format!("{} {}\n", Self::COMMAND, self.version), } } diff --git a/src/commands/queue/plchangesposid.rs b/src/commands/queue/plchangesposid.rs index 7e30471..0fb1854 100644 --- a/src/commands/queue/plchangesposid.rs +++ b/src/commands/queue/plchangesposid.rs @@ -33,8 +33,8 @@ impl CommandRequest<'_> for PlChangesPosIdRequest { fn serialize(&self) -> String { match self.window.as_ref() { - Some(window) => format!("{} {} {}", Self::COMMAND, self.version, window), - None => format!("{} {}", Self::COMMAND, self.version), + Some(window) => format!("{} {} {}\n", Self::COMMAND, self.version, window), + None => format!("{} {}\n", Self::COMMAND, self.version), } } diff --git a/src/commands/queue/prio.rs b/src/commands/queue/prio.rs index d854f3a..9fe18bf 100644 --- a/src/commands/queue/prio.rs +++ b/src/commands/queue/prio.rs @@ -29,7 +29,7 @@ impl CommandRequest<'_> for PrioRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.prio, self.window) + format!("{} {} {}\n", Self::COMMAND, self.prio, self.window) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/queue/prioid.rs b/src/commands/queue/prioid.rs index ebed4ee..7d80712 100644 --- a/src/commands/queue/prioid.rs +++ b/src/commands/queue/prioid.rs @@ -35,7 +35,7 @@ impl CommandRequest<'_> for PrioIdRequest { .map(|id| id.to_string()) .collect::>() .join(","); - format!("{} {} {}", Self::COMMAND, self.prio, songids) + format!("{} {} {}\n", Self::COMMAND, self.prio, songids) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/queue/rangeid.rs b/src/commands/queue/rangeid.rs index bd840a7..4e5f564 100644 --- a/src/commands/queue/rangeid.rs +++ b/src/commands/queue/rangeid.rs @@ -32,7 +32,7 @@ impl CommandRequest<'_> for RangeIdRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.songid, self.time_interval) + format!("{} {} {}\n", Self::COMMAND, self.songid, self.time_interval) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/queue/swap.rs b/src/commands/queue/swap.rs index d01f03e..dd28c43 100644 --- a/src/commands/queue/swap.rs +++ b/src/commands/queue/swap.rs @@ -29,7 +29,7 @@ impl CommandRequest<'_> for SwapRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.songpos1, self.songpos2) + format!("{} {} {}\n", Self::COMMAND, self.songpos1, self.songpos2) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/queue/swapid.rs b/src/commands/queue/swapid.rs index b13a94b..0f4813f 100644 --- a/src/commands/queue/swapid.rs +++ b/src/commands/queue/swapid.rs @@ -29,7 +29,7 @@ impl CommandRequest<'_> for SwapIdRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.songid1, self.songid2) + format!("{} {} {}\n", Self::COMMAND, self.songid1, self.songid2) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/stickers/sticker_dec.rs b/src/commands/stickers/sticker_dec.rs index 3c84d95..53fee14 100644 --- a/src/commands/stickers/sticker_dec.rs +++ b/src/commands/stickers/sticker_dec.rs @@ -37,7 +37,7 @@ impl CommandRequest<'_> for StickerDecRequest { fn serialize(&self) -> String { format!( - "{} {} {} {} {}", + "{} {} {} {} {}\n", Self::COMMAND, self.sticker_type, self.uri, diff --git a/src/commands/stickers/sticker_delete.rs b/src/commands/stickers/sticker_delete.rs index b610d15..eb9c8ee 100644 --- a/src/commands/stickers/sticker_delete.rs +++ b/src/commands/stickers/sticker_delete.rs @@ -35,7 +35,7 @@ impl CommandRequest<'_> for StickerDeleteRequest { fn serialize(&self) -> String { format!( - "{} {} {} {}", + "{} {} {} {}\n", Self::COMMAND, self.sticker_type, self.uri, diff --git a/src/commands/stickers/sticker_find.rs b/src/commands/stickers/sticker_find.rs index 0fe3872..417563e 100644 --- a/src/commands/stickers/sticker_find.rs +++ b/src/commands/stickers/sticker_find.rs @@ -60,6 +60,7 @@ impl CommandRequest<'_> for StickerFindRequest { if let Some(window) = &self.window { cmd.push_str(&format!(" window {}", window)); } + cmd.push_str("\n"); cmd } diff --git a/src/commands/stickers/sticker_get.rs b/src/commands/stickers/sticker_get.rs index 7ea687d..9238823 100644 --- a/src/commands/stickers/sticker_get.rs +++ b/src/commands/stickers/sticker_get.rs @@ -35,7 +35,7 @@ impl CommandRequest<'_> for StickerGetRequest { fn serialize(&self) -> String { format!( - "{} {} {} {}", + "{} {} {} {}\n", Self::COMMAND, self.sticker_type, self.uri, diff --git a/src/commands/stickers/sticker_inc.rs b/src/commands/stickers/sticker_inc.rs index b3a06e9..4596c5b 100644 --- a/src/commands/stickers/sticker_inc.rs +++ b/src/commands/stickers/sticker_inc.rs @@ -37,7 +37,7 @@ impl CommandRequest<'_> for StickerIncRequest { fn serialize(&self) -> String { format!( - "{} {} {} {} {}", + "{} {} {} {} {}\n", Self::COMMAND, self.sticker_type, self.uri, diff --git a/src/commands/stickers/sticker_list.rs b/src/commands/stickers/sticker_list.rs index 030d859..c6b34c8 100644 --- a/src/commands/stickers/sticker_list.rs +++ b/src/commands/stickers/sticker_list.rs @@ -34,7 +34,7 @@ impl CommandRequest<'_> for StickerListRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.sticker_type, self.uri) + format!("{} {} {}\n", Self::COMMAND, self.sticker_type, self.uri) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/stickers/sticker_set.rs b/src/commands/stickers/sticker_set.rs index cc4d304..ac06fe3 100644 --- a/src/commands/stickers/sticker_set.rs +++ b/src/commands/stickers/sticker_set.rs @@ -37,7 +37,7 @@ impl CommandRequest<'_> for StickerSetRequest { fn serialize(&self) -> String { format!( - "{} {} {} {} {}", + "{} {} {} {} {}\n", Self::COMMAND, self.sticker_type, self.uri, diff --git a/src/commands/stickers/stickernamestypes.rs b/src/commands/stickers/stickernamestypes.rs index 102ea1b..6097fcc 100644 --- a/src/commands/stickers/stickernamestypes.rs +++ b/src/commands/stickers/stickernamestypes.rs @@ -32,9 +32,9 @@ impl CommandRequest<'_> for StickerNamesTypesRequest { fn serialize(&self) -> String { if let Some(sticker_type) = &self.0 { - format!("{} {}", Self::COMMAND, sticker_type) + format!("{} {}\n", Self::COMMAND, sticker_type) } else { - Self::COMMAND.to_string() + Self::COMMAND.to_string() + "\n" } } diff --git a/src/commands/stored_playlists/listplaylist.rs b/src/commands/stored_playlists/listplaylist.rs index 42f2ee7..d75a61b 100644 --- a/src/commands/stored_playlists/listplaylist.rs +++ b/src/commands/stored_playlists/listplaylist.rs @@ -36,9 +36,9 @@ impl CommandRequest<'_> for ListPlaylistRequest { fn serialize(&self) -> String { if let Some(range) = &self.range { - format!("{} {} {}", Self::COMMAND, self.name, range) + format!("{} {} {}\n", Self::COMMAND, self.name, range) } else { - format!("{} {}", Self::COMMAND, self.name) + format!("{} {}\n", Self::COMMAND, self.name) } } diff --git a/src/commands/stored_playlists/listplaylistinfo.rs b/src/commands/stored_playlists/listplaylistinfo.rs index de4fe30..6fab7a6 100644 --- a/src/commands/stored_playlists/listplaylistinfo.rs +++ b/src/commands/stored_playlists/listplaylistinfo.rs @@ -33,8 +33,8 @@ impl CommandRequest<'_> for ListPlaylistInfoRequest { fn serialize(&self) -> String { match self.range.as_ref() { - Some(range) => format!("{} {} {}", Self::COMMAND, self.name, range), - None => format!("{} {}", Self::COMMAND, self.name), + Some(range) => format!("{} {} {}\n", Self::COMMAND, self.name, range), + None => format!("{} {}\n", Self::COMMAND, self.name), } } diff --git a/src/commands/stored_playlists/load.rs b/src/commands/stored_playlists/load.rs index dbfb953..067a365 100644 --- a/src/commands/stored_playlists/load.rs +++ b/src/commands/stored_playlists/load.rs @@ -36,16 +36,16 @@ impl CommandRequest<'_> for LoadRequest { fn serialize(&self) -> String { match (self.range.as_ref(), self.position.as_ref()) { (Some(range), Some(pos)) => { - format!("{} {} {} {}", Self::COMMAND, self.name, range, pos) + format!("{} {} {} {}\n", Self::COMMAND, self.name, range, pos) } (Some(range), None) => { - format!("{} {} {}", Self::COMMAND, self.name, range) + format!("{} {} {}\n", Self::COMMAND, self.name, range) } (None, Some(pos)) => { - format!("{} {} {}", Self::COMMAND, self.name, pos) + format!("{} {} {}\n", Self::COMMAND, self.name, pos) } (None, None) => { - format!("{} {}", Self::COMMAND, self.name) + format!("{} {}\n", Self::COMMAND, self.name) } } } diff --git a/src/commands/stored_playlists/playlistadd.rs b/src/commands/stored_playlists/playlistadd.rs index 26d3374..ec8055c 100644 --- a/src/commands/stored_playlists/playlistadd.rs +++ b/src/commands/stored_playlists/playlistadd.rs @@ -37,7 +37,7 @@ impl CommandRequest<'_> for PlaylistAddRequest { match self.position { Some(pos) => { format!( - "{} {} {} {}", + "{} {} {} {}\n", Self::COMMAND, self.playlist_name, self.uri, @@ -45,7 +45,7 @@ impl CommandRequest<'_> for PlaylistAddRequest { ) } None => { - format!("{} {} {}", Self::COMMAND, self.playlist_name, self.uri) + format!("{} {} {}\n", Self::COMMAND, self.playlist_name, self.uri) } } } diff --git a/src/commands/stored_playlists/playlistdelete.rs b/src/commands/stored_playlists/playlistdelete.rs index 1f0e098..2371d09 100644 --- a/src/commands/stored_playlists/playlistdelete.rs +++ b/src/commands/stored_playlists/playlistdelete.rs @@ -34,7 +34,12 @@ impl CommandRequest<'_> for PlaylistDeleteRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.playlist_name, self.position) + format!( + "{} {} {}\n", + Self::COMMAND, + self.playlist_name, + self.position + ) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/stored_playlists/playlistmove.rs b/src/commands/stored_playlists/playlistmove.rs index 4e604eb..4a21974 100644 --- a/src/commands/stored_playlists/playlistmove.rs +++ b/src/commands/stored_playlists/playlistmove.rs @@ -37,7 +37,7 @@ impl CommandRequest<'_> for PlaylistMoveRequest { match self.from.as_ref() { Some(from) => { format!( - "{} {} {} {}", + "{} {} {} {}\n", Self::COMMAND, self.playlist_name, from, @@ -45,7 +45,7 @@ impl CommandRequest<'_> for PlaylistMoveRequest { ) } None => { - format!("{} {} {}", Self::COMMAND, self.playlist_name, self.to) + format!("{} {} {}\n", Self::COMMAND, self.playlist_name, self.to) } } } diff --git a/src/commands/stored_playlists/rename.rs b/src/commands/stored_playlists/rename.rs index cbb7e6a..d9c1699 100644 --- a/src/commands/stored_playlists/rename.rs +++ b/src/commands/stored_playlists/rename.rs @@ -30,7 +30,7 @@ impl CommandRequest<'_> for RenameRequest { } fn serialize(&self) -> String { - format!("{} {} {}", Self::COMMAND, self.old_name, self.new_name) + format!("{} {} {}\n", Self::COMMAND, self.old_name, self.new_name) } fn parse(mut parts: RequestTokenizer<'_>) -> Result { diff --git a/src/commands/stored_playlists/save.rs b/src/commands/stored_playlists/save.rs index 662cbb0..68163f6 100644 --- a/src/commands/stored_playlists/save.rs +++ b/src/commands/stored_playlists/save.rs @@ -34,10 +34,10 @@ impl CommandRequest<'_> for SaveRequest { fn serialize(&self) -> String { match self.mode.as_ref() { Some(mode) => { - format!("{} {} {}", Self::COMMAND, self.playlist_name, mode) + format!("{} {} {}\n", Self::COMMAND, self.playlist_name, mode) } None => { - format!("{} {}", Self::COMMAND, self.playlist_name) + format!("{} {}\n", Self::COMMAND, self.playlist_name) } } } diff --git a/src/commands/stored_playlists/searchplaylist.rs b/src/commands/stored_playlists/searchplaylist.rs index ecc4772..4dd1246 100644 --- a/src/commands/stored_playlists/searchplaylist.rs +++ b/src/commands/stored_playlists/searchplaylist.rs @@ -39,6 +39,7 @@ impl CommandRequest<'_> for SearchPlaylistRequest { if let Some(range) = &self.range { cmd.push_str(&format!(" {}", range)); } + cmd.push_str("\n"); cmd }