permission issues. putting on hold.

compiles but doesnt actually ping the targets.  all come back as failure.

Cargo.lock

@@ -243,7 +243,7 @@ checksum = "829d955a0bb380ef178a640b91779e3987da38c9aea133b20614cfed8cdea9c6"
 dependencies = [
  "bitflags",
  "crossterm_winapi",
- "mio",
+ "mio 1.0.3",
  "parking_lot",
  "rustix",
  "signal-hook",
@@ -383,6 +383,95 @@ version = "0.1.5"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2"
 
+[[package]]
+name = "futures"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "65bc07b1a8bc7c85c5f2e110c476c7389b4554ba72af57d8445ea63a576b0876"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-executor",
+ "futures-io",
+ "futures-sink",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-channel"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2dff15bf788c671c1934e366d07e30c1814a8ef514e1af724a602e8a2fbe1b10"
+dependencies = [
+ "futures-core",
+ "futures-sink",
+]
+
+[[package]]
+name = "futures-core"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "05f29059c0c2090612e8d742178b0580d2dc940c837851ad723096f87af6663e"
+
+[[package]]
+name = "futures-executor"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "1e28d1d997f585e54aebc3f97d39e72338912123a67330d723fdbb564d646c9f"
+dependencies = [
+ "futures-core",
+ "futures-task",
+ "futures-util",
+]
+
+[[package]]
+name = "futures-io"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9e5c1b78ca4aae1ac06c48a526a655760685149f0d465d21f37abfe57ce075c6"
+
+[[package]]
+name = "futures-macro"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "162ee34ebcb7c64a8abebc059ce0fee27c2262618d7b60ed8faf72fef13c3650"
+dependencies = [
+ "proc-macro2",
+ "quote",
+ "syn",
+]
+
+[[package]]
+name = "futures-sink"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e575fab7d1e0dcb8d0c7bcf9a63ee213816ab51902e6d244a95819acacf1d4f7"
+
+[[package]]
+name = "futures-task"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "f90f7dce0722e95104fcb095585910c0977252f286e354b5e3bd38902cd99988"
+
+[[package]]
+name = "futures-util"
+version = "0.3.31"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9fa08315bb612088cc391249efdc3bc77536f16c91f6cf495e6fbe85b20a4a81"
+dependencies = [
+ "futures-channel",
+ "futures-core",
+ "futures-io",
+ "futures-macro",
+ "futures-sink",
+ "futures-task",
+ "memchr",
+ "pin-project-lite",
+ "pin-utils",
+ "slab",
+]
+
 [[package]]
 name = "gimli"
 version = "0.28.1"
@@ -540,6 +629,18 @@ dependencies = [
  "adler",
 ]
 
+[[package]]
+name = "mio"
+version = "0.8.11"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a4a650543ca06a924e8b371db273b2756685faae30f8487da1b56505a8f78b0c"
+dependencies = [
+ "libc",
+ "log",
+ "wasi",
+ "windows-sys 0.48.0",
+]
+
 [[package]]
 name = "mio"
 version = "1.0.3"
@@ -593,7 +694,7 @@ dependencies = [
  "libc",
  "redox_syscall",
  "smallvec",
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -608,6 +709,25 @@ version = "0.2.16"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "3b3cff922bd51709b605d9ead9aa71031d81447142d828eb4a6eba76fe619f9b"
 
+[[package]]
+name = "pin-utils"
+version = "0.1.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8b870d8c151b6f2fb93e84a13146138f05d02ed11c7e7c54f8826aaaf7c9f184"
+
+[[package]]
+name = "ping-rs"
+version = "0.1.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "d873f038f84371f9c7fa13f6afea4d5f1fbcd5070ba8eb7af2a6d41c768eff8b"
+dependencies = [
+ "futures",
+ "mio 0.8.11",
+ "paste",
+ "socket2",
+ "windows",
+]
+
 [[package]]
 name = "portable-atomic"
 version = "1.11.0"
@@ -634,6 +754,7 @@ dependencies = [
  "csv",
  "env_logger",
  "log",
+ "ping-rs",
  "ratatui",
 ]
 
@@ -803,7 +924,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "34db1a06d485c9142248b7a054f034b349b212551f3dfd19c94d45a754a217cd"
 dependencies = [
  "libc",
- "mio",
+ "mio 1.0.3",
  "signal-hook",
 ]
 
@@ -816,12 +937,31 @@ dependencies = [
  "libc",
 ]
 
+[[package]]
+name = "slab"
+version = "0.4.9"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f92a496fb766b417c996b9c5e57daf2f7ad3b0bebe1ccfca4856390e3d3bb67"
+dependencies = [
+ "autocfg",
+]
+
 [[package]]
 name = "smallvec"
 version = "1.15.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "8917285742e9f3e1683f0a9c4e6b57960b7314d0b08d30d1ecd426713ee2eee9"
 
+[[package]]
+name = "socket2"
+version = "0.4.10"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9f7916fc008ca5542385b89a3d3ce689953c143e9304a9bf8beec1de48994c0d"
+dependencies = [
+ "libc",
+ "winapi",
+]
+
 [[package]]
 name = "static_assertions"
 version = "1.1.0"
@@ -993,13 +1133,37 @@ version = "0.4.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
 
+[[package]]
+name = "windows"
+version = "0.43.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "04662ed0e3e5630dfa9b26e4cb823b817f1a9addda855d973a9458c236556244"
+dependencies = [
+ "windows_aarch64_gnullvm 0.42.2",
+ "windows_aarch64_msvc 0.42.2",
+ "windows_i686_gnu 0.42.2",
+ "windows_i686_msvc 0.42.2",
+ "windows_x86_64_gnu 0.42.2",
+ "windows_x86_64_gnullvm 0.42.2",
+ "windows_x86_64_msvc 0.42.2",
+]
+
+[[package]]
+name = "windows-sys"
+version = "0.48.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "677d2418bec65e3338edb076e806bc1ec15693c5d0104683f2efe857f61056a9"
+dependencies = [
+ "windows-targets 0.48.5",
+]
+
 [[package]]
 name = "windows-sys"
 version = "0.52.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
 ]
 
 [[package]]
@@ -1008,7 +1172,22 @@ version = "0.59.0"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
 dependencies = [
- "windows-targets",
+ "windows-targets 0.52.6",
+]
+
+[[package]]
+name = "windows-targets"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9a2fa6e2155d7247be68c096456083145c183cbbbc2764150dda45a87197940c"
+dependencies = [
+ "windows_aarch64_gnullvm 0.48.5",
+ "windows_aarch64_msvc 0.48.5",
+ "windows_i686_gnu 0.48.5",
+ "windows_i686_msvc 0.48.5",
+ "windows_x86_64_gnu 0.48.5",
+ "windows_x86_64_gnullvm 0.48.5",
+ "windows_x86_64_msvc 0.48.5",
 ]
 
 [[package]]
@@ -1017,28 +1196,64 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
 dependencies = [
- "windows_aarch64_gnullvm",
+ "windows_aarch64_gnullvm 0.52.6",
- "windows_aarch64_msvc",
+ "windows_aarch64_msvc 0.52.6",
- "windows_i686_gnu",
+ "windows_i686_gnu 0.52.6",
  "windows_i686_gnullvm",
- "windows_i686_msvc",
+ "windows_i686_msvc 0.52.6",
- "windows_x86_64_gnu",
+ "windows_x86_64_gnu 0.52.6",
- "windows_x86_64_gnullvm",
+ "windows_x86_64_gnullvm 0.52.6",
- "windows_x86_64_msvc",
+ "windows_x86_64_msvc 0.52.6",
 ]
 
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "597a5118570b68bc08d8d59125332c54f1ba9d9adeedeef5b99b02ba2b0698f8"
+
+[[package]]
+name = "windows_aarch64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "2b38e32f0abccf9987a4e3079dfb67dcd799fb61361e53e2882c3cbaf0d905d8"
+
 [[package]]
 name = "windows_aarch64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
 
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e08e8864a60f06ef0d0ff4ba04124db8b0fb3be5776a5cd47641e942e58c4d43"
+
+[[package]]
+name = "windows_aarch64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "dc35310971f3b2dbbf3f0690a219f40e2d9afcf64f9ab7cc1be722937c26b4bc"
+
 [[package]]
 name = "windows_aarch64_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
 
+[[package]]
+name = "windows_i686_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "c61d927d8da41da96a81f029489353e68739737d3beca43145c8afec9a31a84f"
+
+[[package]]
+name = "windows_i686_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "a75915e7def60c94dcef72200b9a8e58e5091744960da64ec734a6c6e9b3743e"
+
 [[package]]
 name = "windows_i686_gnu"
 version = "0.52.6"
@@ -1051,24 +1266,72 @@ version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
 
+[[package]]
+name = "windows_i686_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "44d840b6ec649f480a41c8d80f9c65108b92d89345dd94027bfe06ac444d1060"
+
+[[package]]
+name = "windows_i686_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8f55c233f70c4b27f66c523580f78f1004e8b5a8b659e05a4eb49d4166cca406"
+
 [[package]]
 name = "windows_i686_msvc"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
 
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "8de912b8b8feb55c064867cf047dda097f92d51efad5b491dfb98f6bbb70cb36"
+
+[[package]]
+name = "windows_x86_64_gnu"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "53d40abd2583d23e4718fddf1ebec84dbff8381c07cae67ff7768bbf19c6718e"
+
 [[package]]
 name = "windows_x86_64_gnu"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
 
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "26d41b46a36d453748aedef1486d5c7a85db22e56aff34643984ea85514e94a3"
+
+[[package]]
+name = "windows_x86_64_gnullvm"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "0b7b52767868a23d5bab768e390dc5f5c55825b6d30b86c844ff2dc7414044cc"
+
 [[package]]
 name = "windows_x86_64_gnullvm"
 version = "0.52.6"
 source = "registry+https://github.com/rust-lang/crates.io-index"
 checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
 
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.42.2"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "9aec5da331524158c6d1a4ac0ab1541149c0b9505fde06423b02f5ef0106b9f0"
+
+[[package]]
+name = "windows_x86_64_msvc"
+version = "0.48.5"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "ed94fce61571a4006852b7389a063ab983c02eb1bb37b47f8272ce92d06d9538"
+
 [[package]]
 name = "windows_x86_64_msvc"
 version = "0.52.6"

Cargo.toml

@@ -15,5 +15,8 @@ color-eyre = "0.6.3"
 crossterm = "0.28.1"
 ratatui = "0.29.0"
 
+# Internal Ping
+ping-rs = "0.1"
+
 [[bin]]
 name = "pp"

peterborough.txt

@@ -1,4 +1,3 @@
-address,name
 10.3.100.1,Belleville Gateway
 10.11.31.3,Belleville VPN 11-31
 10.12.32.1,Belleville VPN 12-32

src/app_settings.rs

@@ -1,10 +0,0 @@
-use std::path::PathBuf;
-use clap::Parser;
-
-#[derive(Parser, Debug)]
-#[command(version, about, long_about = None)]
-pub struct AppSettings {
-    /// File of list of hosts
-    #[arg(short, long)]
-    pub ping_host_file: Option<PathBuf>,
-}

src/bin/pp.rs

@@ -11,13 +11,50 @@ use clap::Parser;
 use pp::ping_result::PingResult;
 use pp::ping_request::PingRequest;
 use pp::manager::Manager;
-use pp::{duration_to_string, SECONDS_BETWEEN_DISPLAY};
+use pp::SECONDS_BETWEEN_DISPLAY;
 use pp::target_state::TargetState;
 use std::{env, error::Error, ffi::OsString, process};
 use color_eyre::owo_colors::OwoColorize;
 use crossterm::style::Stylize;
 use log::debug;
-use pp::app_settings::AppSettings;
+const SECONDS_IN_MINUTE: u32 = 60;
+const SECONDS_IN_HOUR: u32 = SECONDS_IN_MINUTE * 60;
+const SECONDS_IN_DAY: u32 = SECONDS_IN_HOUR * 24;
+
+pub fn duration_to_string(to_convert: Duration) -> String {
+    let mut total_seconds = to_convert.as_secs() as u32;
+    let mut working_string = String::new();
+
+    if total_seconds > 86400 {
+        // days
+        let num_days = (total_seconds / SECONDS_IN_DAY) as u32;
+        working_string = format!("{} days", num_days);
+        total_seconds = total_seconds - (num_days * SECONDS_IN_DAY);
+    }
+
+    if total_seconds > 3600 {
+        // hours
+        let num_hours = (total_seconds / SECONDS_IN_HOUR) as u32;
+        if num_hours > 0 {
+            working_string = format!("{} {} hours", working_string, num_hours);
+            total_seconds = total_seconds - (num_hours * SECONDS_IN_HOUR);
+        }
+    }
+    if total_seconds > 60 {
+        let num_minutes = (total_seconds / SECONDS_IN_MINUTE) as u32;
+        if num_minutes > 0 {
+            working_string = format!("{} {} minutes", working_string, num_minutes);
+            total_seconds = total_seconds - (num_minutes * SECONDS_IN_MINUTE);
+        }
+        // minutes
+    }
+
+
+    working_string = format!("{} {} seconds", working_string, total_seconds);
+
+    working_string
+}
+
 
 struct PPState {}
 
@@ -80,7 +117,7 @@ impl PPState {
     }
 
     pub fn build_targets_from_file(filename: Option<PathBuf>) -> BTreeMap<String, TargetState> {
-        // PPState::get_default_targets();
+        PPState::get_default_targets();
         if let Some(file) = filename {
             let mut working = BTreeMap::new();
             if !&file.exists() {
@@ -118,7 +155,13 @@ impl PPState {
     }
 
     /// Simple program to greet a person
-
+    #[derive(Parser, Debug)]
+    #[command(version, about, long_about = None)]
+    pub struct AppSettings {
+        /// File of list of hosts
+        #[arg(short, long)]
+        ping_host_file: Option<PathBuf>,
+    }
 
     fn main() {
         // Get App Settings

src/bin/rat.rs

@@ -1,13 +0,0 @@
-use clap::Parser;
-use pp::app_settings::AppSettings;
-use pp::tui::ratatui_app::RatatuiApp;
-fn main() -> color_eyre::Result<()> {
-    // find out what file we are using to get our hosts
-    let settings = AppSettings::parse();
-
-    color_eyre::install()?;
-    let terminal = ratatui::init();
-    let result = RatatuiApp::new(settings.ping_host_file).run(terminal);
-    ratatui::restore();
-    result
-}

src/lib.rs

@@ -1,51 +1,8 @@
-use std::time::Duration;
-
 pub mod manager;
 pub mod ping_request;
 pub mod ping_result;
 pub mod target_state;
-pub mod tui;
+mod tui;
-pub mod app_settings;
 
 pub const SECONDS_BETWEEN_DISPLAY: u32 = 1;
 pub const SECONDS_BETWEEN_PING: u32 = 2;
-
-const SECONDS_IN_MINUTE: u32 = 60;
-const SECONDS_IN_HOUR: u32 = SECONDS_IN_MINUTE * 60;
-const SECONDS_IN_DAY: u32 = SECONDS_IN_HOUR * 24;
-
-
-pub fn duration_to_string(to_convert: Duration) -> String {
-    let mut total_seconds = to_convert.as_secs() as u32;
-    let mut working_string = String::new();
-
-    if total_seconds > 86400 {
-        // days
-        let num_days = (total_seconds / SECONDS_IN_DAY) as u32;
-        working_string = format!("{} days", num_days);
-        total_seconds = total_seconds - (num_days * SECONDS_IN_DAY);
-    }
-
-    if total_seconds > 3600 {
-        // hours
-        let num_hours = (total_seconds / SECONDS_IN_HOUR) as u32;
-        if num_hours > 0 {
-            working_string = format!("{} {} hours", working_string, num_hours);
-            total_seconds = total_seconds - (num_hours * SECONDS_IN_HOUR);
-        }
-    }
-    if total_seconds > 60 {
-        let num_minutes = (total_seconds / SECONDS_IN_MINUTE) as u32;
-        if num_minutes > 0 {
-            working_string = format!("{} {} minutes", working_string, num_minutes);
-            total_seconds = total_seconds - (num_minutes * SECONDS_IN_MINUTE);
-        }
-        // minutes
-    }
-
-
-    working_string = format!("{} {} seconds", working_string, total_seconds);
-
-    working_string
-}
-

src/manager.rs

@@ -1,17 +1,15 @@
-use std::net::Ipv4Addr;
+use std::net::{IpAddr, Ipv4Addr};
 use std::process::Command;
 use std::sync::mpsc::Sender;
 use std::thread;
 use std::time::{Duration, SystemTime};
+use ping_rs::send_ping;
 use crate::ping_request::PingRequest;
 use crate::ping_result::PingResult;
 use crate::SECONDS_BETWEEN_PING;
 
 pub struct Manager;
 
-const WIN_PING_SUCCESS: i32 = 1;
-const LIN_PING_SUCCESS: i32 = 0;
-
 impl Manager {
     pub fn spawn_manager_thread(targets: Vec<Ipv4Addr>, sender: Sender<PingResult>) {
         let local_targets = targets.clone();
@@ -34,27 +32,25 @@ impl Manager {
             let mut result = 0;
             let mut success = true;
             let start_time = SystemTime::now();
-            #[cfg(any(target_os="windows"))] {
+
-                result = Command::new("c:/windows/system32/ping.exe").arg(request.target.to_string())
+            let target_address = IpAddr::from(request.target);
-                    .arg("-n 1")
+
-                    .arg(format!("-w {}", crate::SECONDS_BETWEEN_PING))
+            let options = ping_rs::PingOptions { ttl: 128, dont_fragment: false };
-                    .arg("-4")
+            let data = [1,2,3,4];
-                    .output().unwrap().status.code().unwrap_or(255);
+            let result = send_ping(&target_address, Duration::from_secs(10), &data, Some(&options));
-                success = result == WIN_PING_SUCCESS as i32;;
+
-            }
-            #[cfg(any(target_os="linux"))] {
-                result = Command::new("/usr/bin/ping").arg(request.target.to_string())
-                    .arg("-c 1")
-                    .arg("-4")
-                    .arg(format!("-w {}", SECONDS_BETWEEN_PING))
-                    .arg("-W 1")
-                    .output().unwrap().status.code().unwrap_or(255);
-                success = result == LIN_PING_SUCCESS as i32;
-            }
             let ping_duration = SystemTime::now()
                 .duration_since(start_time)
                 .unwrap_or(Duration::from_secs(600));
-            let success = ping_duration.as_millis() >= SECONDS_BETWEEN_PING as u128 && success;
+
+            let success = match &result {
+                Ok(reply) => {
+                    println!("Good reply -> {}/{}/{}", reply.address, data.len(), reply.rtt);
+                    true
+                },
+                Err(e) => { println!("ERROR {:?}", e); false }
+            };
+
             sender.send(PingResult {
                 target: local_request.target,
                 success,

src/tui/mod.rs

@@ -1,3 +0,0 @@
-pub mod target_state_widget;
-pub mod ratatui_app;
-mod ratatui_ui;

src/tui/ratatui_app.rs

@@ -1,209 +0,0 @@
-use color_eyre::Result;
-use std::collections::BTreeMap;
-use std::fs::File;
-use std::net::Ipv4Addr;
-use std::path::PathBuf;
-use std::str::FromStr;
-use std::sync::mpsc;
-use std::sync::mpsc::Receiver;
-use std::time::{Duration, SystemTime};
-use crossterm::event;
-use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
-use ratatui::{DefaultTerminal, Frame};
-use ratatui::prelude::*;
-use ratatui::widgets::{Block, Paragraph};
-use crate::duration_to_string;
-use crate::manager::Manager;
-use crate::ping_result::PingResult;
-use crate::target_state::TargetState;
-use crate::tui::ratatui_ui::RatatuiUi;
-
-#[derive(Default)]
-pub enum RatatuiScreens {
-    #[default]
-    Monitoring,
-    Exiting
-}
-
-#[derive(Default)]
-pub struct RatatuiApp {
-    running: bool,
-    state: BTreeMap<String, TargetState>,
-    current_screen: RatatuiScreens
-}
-
-impl RatatuiApp {
-    pub fn run(mut self, mut terminal: DefaultTerminal) -> Result<()> {
-        self.running = true;
-        // start the 'manager' thread that spawns its ping threads as needed
-        let (sender, receiver) = mpsc::channel::<PingResult>();
-        Manager::spawn_manager_thread(self.targets_as_vec(), sender);
-        while self.running {
-            // check for any waiting ping results...
-            self.consume_waiting_results(&receiver);
-
-            match self.current_screen {
-                RatatuiScreens::Monitoring => {
-                    terminal.draw(|frame| RatatuiUi::monitoring_mode(frame, &self.state)).expect("Unable to draw to screen");
-                    self.handle_monitoring_crossterm_events();
-                }
-                RatatuiScreens::Exiting => {
-                    terminal.draw(| frame | RatatuiUi::exiting_mode(frame));
-                    self.handle_exiting_crossterm_events();
-                }
-            }
-
-                //            self.handle_crossterm_events()?;
-        }
-        Ok(())
-    }
-
-    fn consume_waiting_results(&mut self, receiver: &Receiver<PingResult>) {
-        let mut local_state = self.state.clone();
-        if let Ok(new_message) = receiver.recv_timeout(Duration::from_millis(10)) {
-            // find the right TargetState
-            for (name, mut current_state) in local_state.clone() {
-                if current_state.target == new_message.target {
-                    let last_alive_change = if new_message.success == current_state.alive {
-                        current_state.last_alive_change
-                    } else {
-                        SystemTime::now()
-                    };
-
-                    let new_state = TargetState {
-                        name: current_state.name.clone(),
-                        target: current_state.target,
-                        alive: new_message.success,
-                        last_rtt: new_message.rtt,
-                        last_alive_change,
-                    };
-                    local_state.insert(name.clone(), new_state);
-                }
-            }
-        }
-        self.state = local_state;
-    }
-
-    fn targets_as_vec(&self) -> Vec<Ipv4Addr> {
-        let mut working = vec![];
-        for (_, current) in &self.state {
-            working.push(current.target);
-        }
-        working
-    }
-
-    fn render(&mut self, frame: &mut Frame) {
-        match self.current_screen {
-            RatatuiScreens::Monitoring => { RatatuiUi::monitoring_mode(frame, &self.state) }
-            RatatuiScreens::Exiting => { RatatuiUi::exiting_mode(frame)}
-        }
-    }
-
-    fn handle_monitoring_crossterm_events(&mut self) -> Result<()> {
-        if event::poll(Duration::from_millis(100))? {
-            match event::read()? {
-                Event::Key(key) if key.kind == KeyEventKind::Press => {
-                    match (key.modifiers, key.code) {
-                        (_, KeyCode::Esc) => {
-                            self.current_screen = RatatuiScreens::Exiting;
-                        }
-                        _ => {}
-                    }
-                },
-                _ => {}
-            }
-        }
-        Ok(())
-    }
-
-    fn handle_exiting_crossterm_events(&mut self) -> Result<()> {
-        if event::poll(Duration::from_millis(100))? {
-            match event::read()? {
-                Event::Key(key) if key.kind == KeyEventKind::Press => {
-                    match key.code {
-                        KeyCode::Enter => { self.running = false; }
-                        KeyCode::Char('y') | KeyCode::Char('Y') => { self.running = false;
-                        }
-                        KeyCode::Char('n') | KeyCode::Char('N') => { self.current_screen = RatatuiScreens::Monitoring }
-                        _ => {}
-                    }
-                }
-                _ => {}
-            }
-        }
-        Ok(())
-    }
-
-    fn handle_crossterm_events(&mut self) -> Result<()> {
-        if event::poll(Duration::from_millis(100))? {
-            match event::read()? {
-                // it's important to check KeyEventKind::Press to avoid handling key release events
-                Event::Key(key) if key.kind == KeyEventKind::Press => self.on_key_event(key),
-                Event::Mouse(_) => {}
-                Event::Resize(_, _) => {}
-                _ => {}
-            }
-        }
-        Ok(())
-    }
-
-    fn quit(&mut self) { self.running = false; }
-
-    /// Handles the key events and updates the state of [`App`].
-    fn on_key_event(&mut self, key: KeyEvent) {
-        match (key.modifiers, key.code) {
-            (_, KeyCode::Esc | KeyCode::Char('q'))
-            | (KeyModifiers::CONTROL, KeyCode::Char('c') |
-            KeyCode::Char('C')) => { self.quit() }
-            // Add other key handlers here.
-            _ => {}
-        }
-    }
-    pub fn new(option: Option<PathBuf>) -> Self {
-        let targets = if let Some(file) = option {
-            let mut working = BTreeMap::new();
-            if !&file.exists() {
-                RatatuiApp::get_default_targets()
-            } else {
-                let real_file = File::open(file);
-                let mut rdr = csv::Reader::from_reader(real_file.unwrap());
-                for result in rdr.records() {
-                    let record = result.unwrap();
-                    working.insert(record[1].to_string(),
-                    TargetState {
-                        name: record[1].to_string(),
-                        target: Ipv4Addr::from_str(&record[0]).unwrap(),
-                        alive: false,
-                        last_alive_change: SystemTime::now(),
-                        last_rtt: 0
-                    });
-                }
-                working
-            }
-        } else { RatatuiApp::get_default_targets() };
-        let mut working = Self::default();
-        working.state = targets;
-        working
-    }
-
-    fn get_default_targets() -> BTreeMap<String, TargetState> {
-        let mut working = BTreeMap::new();
-
-        working.insert("1111 DNS".to_string(), TargetState {
-            name: "1111 DNS".to_string(),
-            target: Ipv4Addr::new(1,1,1,1),
-            ..TargetState::default()
-        });
-        working.insert("Google DNS".to_string(), TargetState {
-            name: "Google DNS".to_string(),
-            target: Ipv4Addr::new(8,8,8,8),
-            ..TargetState::default()
-        });
-        working.insert("Test Site 1".to_string(), TargetState {
-            name: "Test Site 1".to_string(),
-            target: Ipv4Addr::new(216,234,202,122),
-            ..TargetState::default()
-        });
-        working
-    }
-}

src/tui/ratatui_ui.rs

@@ -1,80 +0,0 @@
-use std::collections::BTreeMap;
-use std::time::SystemTime;
-use ratatui::Frame;
-use ratatui::prelude::*;
-use ratatui::widgets::{Block, Paragraph};
-use crate::duration_to_string;
-use crate::target_state::TargetState;
-
-pub struct RatatuiUi {}
-
-impl RatatuiUi {
-    pub fn exiting_mode(frame: &mut Frame) {
-        let title = Line::from("Exit?")
-            .bold()
-            .red()
-            .centered();
-        let mut body = "Do you want to exit? (Y/N)";
-        frame.render_widget(
-            Paragraph::new(body)
-                .block(Block::bordered().title(title))
-                .centered(),
-            frame.area()
-        );
-    }
-    pub fn monitoring_mode(frame: &mut Frame, state: &BTreeMap<String, TargetState>) {
-        let layout = Layout::default()
-            .direction(Direction::Vertical)
-            .constraints([
-                Constraint::Fill(1),
-                Constraint::Length(3)
-            ])
-            .split(frame.area());
-
-        let title = Line::from("PP Sample App")
-            .bold()
-            .blue()
-            .centered();
-        let mut working = vec![]; // Line::from("Empty");
-        for (title, current) in state {
-            let mut name_field = format!("{} ({})", current.name.clone(), current.target.clone());
-
-            while name_field.len() < 40 {
-                name_field.push(' ');
-            }
-
-            let name_style = if current.alive {
-                Style::default().fg(Color::Green)
-            } else {
-                Style::default().fg(Color::Red)
-            };
-
-            working.push(Line::from(vec![
-                Span::styled(name_field, name_style),
-                Span::styled(current.alive.to_string(), Style::default()),
-                Span::styled(current.last_rtt.to_string(), Style::default()),
-                Span::styled(
-                              format!("{} ago.", duration_to_string(
-                                  SystemTime::now()
-                                      .duration_since(current.last_alive_change)
-                                      .unwrap()
-                              )), Style::default())
-                ]));
-        }
-
-        let footer_text = "Press <ESC> to exit | Press + to Add a Host | Press - to Delete a host";
-
-        frame.render_widget(
-            Paragraph::new(working)
-                .block(Block::bordered().title(title)),
-            layout[0],
-        );
-
-        frame.render_widget(
-            Paragraph::new(footer_text)
-                .block(Block::bordered())
-                .centered(),
-            layout[1]
-        );
-    }
-}

src/tui/target_state_widget.rs

@@ -1,11 +0,0 @@
-use ratatui::buffer::Cell;
-use ratatui::prelude::*;
-
-pub struct TargetStateWidget;
-
-impl Widget for TargetStateWidget {
-    fn render(self, area: Rect, buf: &mut Buffer)
-    {
-
-    }
-}