From 8badfefe28589792ce96079d72b60ac84bc2a4ad Mon Sep 17 00:00:00 2001 From: Fuwn Date: Fri, 30 Apr 2021 13:17:15 -0700 Subject: refactor(commands): rename subscribe command module to subscribe_room subscribe_room and subscribe are different commands, this is to ensure to mixups occur when referencing either of the modules. --- src/server/cmd/commands/subscribe/mod.rs | 5 ----- src/server/cmd/commands/subscribe/parse.rs | 21 --------------------- src/server/cmd/commands/subscribe/structure.rs | 10 ---------- src/server/cmd/commands/subscribe_room/mod.rs | 5 +++++ src/server/cmd/commands/subscribe_room/parse.rs | 21 +++++++++++++++++++++ src/server/cmd/commands/subscribe_room/structure.rs | 10 ++++++++++ 6 files changed, 36 insertions(+), 36 deletions(-) delete mode 100644 src/server/cmd/commands/subscribe/mod.rs delete mode 100644 src/server/cmd/commands/subscribe/parse.rs delete mode 100644 src/server/cmd/commands/subscribe/structure.rs create mode 100644 src/server/cmd/commands/subscribe_room/mod.rs create mode 100644 src/server/cmd/commands/subscribe_room/parse.rs create mode 100644 src/server/cmd/commands/subscribe_room/structure.rs (limited to 'src/server') diff --git a/src/server/cmd/commands/subscribe/mod.rs b/src/server/cmd/commands/subscribe/mod.rs deleted file mode 100644 index 8018a71..0000000 --- a/src/server/cmd/commands/subscribe/mod.rs +++ /dev/null @@ -1,5 +0,0 @@ -// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective -// SPDX-License-Identifier: GPL-3.0-only - -mod parse; -mod structure; diff --git a/src/server/cmd/commands/subscribe/parse.rs b/src/server/cmd/commands/subscribe/parse.rs deleted file mode 100644 index 82d480f..0000000 --- a/src/server/cmd/commands/subscribe/parse.rs +++ /dev/null @@ -1,21 +0,0 @@ -// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective -// SPDX-License-Identifier: GPL-3.0-only - -use byteorder::{BigEndian, ReadBytesExt}; -use bytes::{Buf, BytesMut}; - -use crate::server::cmd::commands::subscribe::structure::SubscribeRoom; - -/// TODO: The functionality of this function has not been tested... TEST IT! -pub fn parse_subscribe_room(data: Vec) -> SubscribeRoom { - // https://stackoverflow.com/questions/41034635/how-do-i-convert-between-string-str-vecu8-and-u8 - let mut data = BytesMut::from(data.as_slice()).reader(); - - SubscribeRoom { - room_number: data.read_i16::().unwrap(), - distance: data.read_i16::().unwrap(), - x: data.read_i16::().unwrap(), - y: data.read_i16::().unwrap(), - z: data.read_i16::().unwrap(), - } -} diff --git a/src/server/cmd/commands/subscribe/structure.rs b/src/server/cmd/commands/subscribe/structure.rs deleted file mode 100644 index 1817cf8..0000000 --- a/src/server/cmd/commands/subscribe/structure.rs +++ /dev/null @@ -1,10 +0,0 @@ -// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective -// SPDX-License-Identifier: GPL-3.0-only - -pub struct SubscribeRoom { - pub room_number: i16, - pub distance: i16, - pub x: i16, - pub y: i16, - pub z: i16, -} diff --git a/src/server/cmd/commands/subscribe_room/mod.rs b/src/server/cmd/commands/subscribe_room/mod.rs new file mode 100644 index 0000000..8018a71 --- /dev/null +++ b/src/server/cmd/commands/subscribe_room/mod.rs @@ -0,0 +1,5 @@ +// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective +// SPDX-License-Identifier: GPL-3.0-only + +mod parse; +mod structure; diff --git a/src/server/cmd/commands/subscribe_room/parse.rs b/src/server/cmd/commands/subscribe_room/parse.rs new file mode 100644 index 0000000..82d480f --- /dev/null +++ b/src/server/cmd/commands/subscribe_room/parse.rs @@ -0,0 +1,21 @@ +// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective +// SPDX-License-Identifier: GPL-3.0-only + +use byteorder::{BigEndian, ReadBytesExt}; +use bytes::{Buf, BytesMut}; + +use crate::server::cmd::commands::subscribe::structure::SubscribeRoom; + +/// TODO: The functionality of this function has not been tested... TEST IT! +pub fn parse_subscribe_room(data: Vec) -> SubscribeRoom { + // https://stackoverflow.com/questions/41034635/how-do-i-convert-between-string-str-vecu8-and-u8 + let mut data = BytesMut::from(data.as_slice()).reader(); + + SubscribeRoom { + room_number: data.read_i16::().unwrap(), + distance: data.read_i16::().unwrap(), + x: data.read_i16::().unwrap(), + y: data.read_i16::().unwrap(), + z: data.read_i16::().unwrap(), + } +} diff --git a/src/server/cmd/commands/subscribe_room/structure.rs b/src/server/cmd/commands/subscribe_room/structure.rs new file mode 100644 index 0000000..1817cf8 --- /dev/null +++ b/src/server/cmd/commands/subscribe_room/structure.rs @@ -0,0 +1,10 @@ +// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective +// SPDX-License-Identifier: GPL-3.0-only + +pub struct SubscribeRoom { + pub room_number: i16, + pub distance: i16, + pub x: i16, + pub y: i16, + pub z: i16, +} -- cgit v1.2.3