style: some style changes

Author: Cyberdolfi

src/database/mod.rs

@@ -1,3 +1,4 @@
+use std::net::Ipv4Addr;
 use std::time::{SystemTime, UNIX_EPOCH};
 use serde::{Deserialize, Serialize};
 use url::Url;
@@ -100,15 +101,15 @@ pub fn parse_to_url(host: &str, port: u16, user: &str, password: Option<&str>, d
     Ok(url)
 }
 
-pub fn parse_server(ip: String, port: u16, ping: Ping, query: Option<Query>, join: Option<Join>) -> (ServerInfo, ServerHistory) {
+pub fn parse_server(ip: Ipv4Addr, port: u16, ping: Ping, query: Option<Query>, join: Option<Join>) -> (ServerInfo, ServerHistory) {
     let now = SystemTime::now()
         .duration_since(UNIX_EPOCH)
         .unwrap_or_default()
         .as_secs() as i64;
 
     let info = ServerInfo {
         server_id: None,
-        server_ip: ip,
+        server_ip: ip.to_string(),
         server_port: port,
         last_seen: now,
         discovered: now,

src/randomizer.rs

@@ -11,6 +11,7 @@ pub enum IpType {
     PrivateOnly,
 }
 
+#[derive(Clone, Copy)]
 pub struct IpGenerator {
     network_u32: u32,
     range_size: u32,
@@ -77,11 +78,11 @@ impl IpGenerator {
     }
 }
 
-#[derive(Default)]
+#[derive(Default, Copy, Clone)]
 pub struct IpGeneratorBuilder {
     network: Option<Ipv4Addr>,
     prefix_len: Option<u8>,
-    count: u32,
+    amount: u32,
     ip_type: IpType,
 }
 
@@ -92,8 +93,8 @@ impl IpGeneratorBuilder {
         self
     }
 
-    pub fn count(mut self, count: u32) -> Self {
-        self.count = count;
+    pub fn amount(mut self, amount: u32) -> Self {
+        self.amount = amount;
         self
     }
 
@@ -114,7 +115,7 @@ impl IpGeneratorBuilder {
         IpGenerator {
             network_u32,
             range_size,
-            count: self.count,
+            count: self.amount,
             ip_type: self.ip_type,
             use_cidr,
         }

src/scanning/mod.rs

@@ -1,3 +1,4 @@
 pub mod scanner;
 pub mod file_scanner;
-pub mod utils;
+pub mod utils;
+pub mod crawler;