refactor(whirl_server::net): move orphan functions to methods within property list struct

3 files changed, 118 insertions, 145 deletions

diff --git a/crates/whirl_server/src/cmd/commands/property/create.rs b/crates/whirl_server/src/cmd/commands/property/create.rs
index d689857..c9f0e04 100644
--- a/crates/whirl_server/src/cmd/commands/property/create.rs
+++ b/crates/whirl_server/src/cmd/commands/property/create.rs
@@ -22,147 +22,135 @@ use crate::{
       VAR_SMTP_SERVER,
       VAR_UPDATETIME,
     },
-    converter::property_list_to_bytes,
-    structure::NetworkProperty,
+    network_property::NetworkProperty,
+    property_list::PropertyList,
   },
 };
 
 pub fn property_update_as_distributor() -> Vec<u8> {
-  property_list_to_bytes(
-    Command::PropUpd as i32,
-    0xFF,
-    vec![
-      NetworkProperty {
-        prop_id: VAR_MAIL_DOMAIN,
-        value:   "worlds3d.com".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SMTP_SERVER,
-        value:   "mail.worlds.net:25".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SCRIPT_SERVER,
-        value:   "http://www-dynamic.us.worlds.net/cgi-bin".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_EXTERNAL_HTTP_SERVER,
-        value:   "http://www-static.us.worlds.net".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SERVERTYPE,
-        value:   "1".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_PROTOCOL,
-        value:   "24".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_APPNAME,
-        value:   Config::get().whirlsplash.worldsmaster_username,
-      },
-    ],
-  )
+  PropertyList(vec![
+    NetworkProperty {
+      prop_id: VAR_MAIL_DOMAIN,
+      value:   "worlds3d.com".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SMTP_SERVER,
+      value:   "mail.worlds.net:25".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SCRIPT_SERVER,
+      value:   "http://www-dynamic.us.worlds.net/cgi-bin".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_EXTERNAL_HTTP_SERVER,
+      value:   "http://www-static.us.worlds.net".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SERVERTYPE,
+      value:   "1".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_PROTOCOL,
+      value:   "24".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_APPNAME,
+      value:   Config::get().whirlsplash.worldsmaster_username,
+    },
+  ])
+  .as_bytes(Command::PropUpd as i32, 0xFF)
 }
 
 pub fn property_update_as_hub() -> Vec<u8> {
-  property_list_to_bytes(
-    Command::PropUpd as i32,
-    0xFF,
-    vec![
-      NetworkProperty {
-        prop_id: VAR_UPDATETIME,
-        value:   "1000000".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_MAIL_DOMAIN,
-        value:   "worlds3d.com".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SMTP_SERVER,
-        value:   "mail.worlds.net:25".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SCRIPT_SERVER,
-        value:   "http://www-dynamic.us.worlds.net/cgi-bin".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_EXTERNAL_HTTP_SERVER,
-        value:   "http://www-static.us.worlds.net".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SERVERTYPE,
-        value:   "3".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_PROTOCOL,
-        value:   "24".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_APPNAME,
-        value:   Config::get().whirlsplash.worldsmaster_username,
-      },
-    ],
-  )
+  PropertyList(vec![
+    NetworkProperty {
+      prop_id: VAR_UPDATETIME,
+      value:   "1000000".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_MAIL_DOMAIN,
+      value:   "worlds3d.com".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SMTP_SERVER,
+      value:   "mail.worlds.net:25".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SCRIPT_SERVER,
+      value:   "http://www-dynamic.us.worlds.net/cgi-bin".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_EXTERNAL_HTTP_SERVER,
+      value:   "http://www-static.us.worlds.net".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SERVERTYPE,
+      value:   "3".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_PROTOCOL,
+      value:   "24".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_APPNAME,
+      value:   Config::get().whirlsplash.worldsmaster_username,
+    },
+  ])
+  .as_bytes(Command::PropUpd as i32, 0xFF)
 }
 
 pub fn property_request_as_distributor() -> Vec<u8> {
-  property_list_to_bytes(
-    Command::SessInit as i32,
-    0x01,
-    vec![
-      NetworkProperty {
-        prop_id: VAR_ERROR,
-        value:   "0".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_APPNAME,
-        value:   Config::get().whirlsplash.worldsmaster_username,
-      },
-      NetworkProperty {
-        prop_id: VAR_PROTOCOL,
-        value:   "24".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SERVERTYPE,
-        value:   "1".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SERIAL,
-        value:   "DWLV000000000000".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_PRIV,
-        value:   "0".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_CHANNEL,
-        value:   "dimension-1".to_string(),
-      },
-    ],
-  )
+  PropertyList(vec![
+    NetworkProperty {
+      prop_id: VAR_ERROR,
+      value:   "0".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_APPNAME,
+      value:   Config::get().whirlsplash.worldsmaster_username,
+    },
+    NetworkProperty {
+      prop_id: VAR_PROTOCOL,
+      value:   "24".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SERVERTYPE,
+      value:   "1".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SERIAL,
+      value:   "DWLV000000000000".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_PRIV,
+      value:   "0".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_CHANNEL,
+      value:   "dimension-1".to_string(),
+    },
+  ])
+  .as_bytes(Command::SessInit as i32, 0x01)
 }
 
 pub fn property_request_as_hub() -> Vec<u8> {
-  property_list_to_bytes(
-    Command::SessInit as i32,
-    0x01,
-    vec![
-      NetworkProperty {
-        prop_id: VAR_ERROR,
-        value:   "0".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_SERVERTYPE,
-        value:   "3".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_UPDATETIME,
-        value:   "1000000".to_string(),
-      },
-      NetworkProperty {
-        prop_id: VAR_PROTOCOL,
-        value:   "24".to_string(),
-      },
-    ],
-  )
+  PropertyList(vec![
+    NetworkProperty {
+      prop_id: VAR_ERROR,
+      value:   "0".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_SERVERTYPE,
+      value:   "3".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_UPDATETIME,
+      value:   "1000000".to_string(),
+    },
+    NetworkProperty {
+      prop_id: VAR_PROTOCOL,
+      value:   "24".to_string(),
+    },
+  ])
+  .as_bytes(Command::SessInit as i32, 0x01)
 }
diff --git a/crates/whirl_server/src/cmd/commands/property/mod.rs b/crates/whirl_server/src/cmd/commands/property/mod.rs
index 83b015b..8405101 100644
--- a/crates/whirl_server/src/cmd/commands/property/mod.rs
+++ b/crates/whirl_server/src/cmd/commands/property/mod.rs
@@ -2,4 +2,3 @@
 // SPDX-License-Identifier: GPL-3.0-only
 
 pub mod create;
-pub mod parse;
diff --git a/crates/whirl_server/src/cmd/commands/property/parse.rs b/crates/whirl_server/src/cmd/commands/property/parse.rs
deleted file mode 100644
index 415d19f..0000000
--- a/crates/whirl_server/src/cmd/commands/property/parse.rs
+++ /dev/null
@@ -1,14 +0,0 @@
-// Copyleft (ɔ) 2021-2021 The Whirlsplash Collective
-// SPDX-License-Identifier: GPL-3.0-only
-
-use crate::net::structure::NetworkProperty;
-
-pub fn find_property_in_property_list(
-  property_list: &[NetworkProperty],
-  property: i32,
-) -> &NetworkProperty {
-  property_list
-    .iter()
-    .find(|i| i.prop_id == property)
-    .unwrap()
-}