Compare commits
16 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
| 17780c02d5 | |||
| 141d0ee899 | |||
| 022359d3fd | |||
| 21b41f5593 | |||
| 9ff76954e0 | |||
| 8d0452d752 | |||
| 49092d9ad7 | |||
| 0261914cda | |||
| f5fa9877b3 | |||
| 7d830c4e3b | |||
| 6d55d96ca7 | |||
| e1b435bf7b | |||
| f57325bc6b | |||
| 613f22d31c | |||
| 002ad36068 | |||
| 4ec95af6d0 |
226
Cargo.lock
generated
226
Cargo.lock
generated
@ -32,6 +32,21 @@ version = "0.2.21"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "683d7910e743518b0e34f1186f92494becacb047c7b6bf616c96772180fef923"
|
||||
|
||||
[[package]]
|
||||
name = "android-tzdata"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "e999941b234f3131b00bc13c22d06e8c5ff726d1b6318ac7eb276997bbb4fef0"
|
||||
|
||||
[[package]]
|
||||
name = "android_system_properties"
|
||||
version = "0.1.5"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "819e7219dbd41043ac279b19830f2efc897156490d7fd6ea916720117ee66311"
|
||||
dependencies = [
|
||||
"libc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ansi_term"
|
||||
version = "0.12.1"
|
||||
@ -118,6 +133,12 @@ version = "2.9.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "5c8214115b7bf84099f1309324e63141d4c5d7cc26862f97a0a857dbefe165bd"
|
||||
|
||||
[[package]]
|
||||
name = "bumpalo"
|
||||
version = "3.17.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1628fb46dfa0b37568d12e5edd512553eccf6a22a78e8bde00bb4aed84d5bdbf"
|
||||
|
||||
[[package]]
|
||||
name = "cassowary"
|
||||
version = "0.3.0"
|
||||
@ -149,10 +170,24 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "baf1de4339761588bc0619e3cbc0120ee582ebb74b53b4efbf79117bd2da40fd"
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.36"
|
||||
name = "chrono"
|
||||
version = "0.4.40"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2df961d8c8a0d08aa9945718ccf584145eee3f3aa06cddbeac12933781102e04"
|
||||
checksum = "1a7964611d71df112cb1730f2ee67324fcf4d0fc6606acbbe9bfe06df124637c"
|
||||
dependencies = [
|
||||
"android-tzdata",
|
||||
"iana-time-zone",
|
||||
"js-sys",
|
||||
"num-traits",
|
||||
"wasm-bindgen",
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "clap"
|
||||
version = "4.5.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "eccb054f56cbd38340b380d4a8e69ef1f02f1af43db2f0cc817a4774d80ae071"
|
||||
dependencies = [
|
||||
"clap_builder",
|
||||
"clap_derive",
|
||||
@ -160,9 +195,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "clap_builder"
|
||||
version = "4.5.36"
|
||||
version = "4.5.37"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "132dbda40fb6753878316a489d5a1242a8ef2f0d9e47ba01c951ea8aa7d013a5"
|
||||
checksum = "efd9466fac8543255d3b1fcad4762c5e116ffe808c8a3043d4263cd4fd4862a2"
|
||||
dependencies = [
|
||||
"anstream",
|
||||
"anstyle",
|
||||
@ -235,6 +270,12 @@ dependencies = [
|
||||
"static_assertions",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "core-foundation-sys"
|
||||
version = "0.8.7"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b"
|
||||
|
||||
[[package]]
|
||||
name = "crossterm"
|
||||
version = "0.28.1"
|
||||
@ -406,6 +447,30 @@ version = "0.5.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
|
||||
|
||||
[[package]]
|
||||
name = "iana-time-zone"
|
||||
version = "0.1.63"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "b0c919e5debc312ad217002b8048a17b7d83f80703865bbfcfebb0458b0b27d8"
|
||||
dependencies = [
|
||||
"android_system_properties",
|
||||
"core-foundation-sys",
|
||||
"iana-time-zone-haiku",
|
||||
"js-sys",
|
||||
"log",
|
||||
"wasm-bindgen",
|
||||
"windows-core",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "iana-time-zone-haiku"
|
||||
version = "0.1.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "f31827a206f56af32e590ba56d5d2d085f558508192593743f16b2306495269f"
|
||||
dependencies = [
|
||||
"cc",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "ident_case"
|
||||
version = "1.0.1"
|
||||
@ -460,9 +525,9 @@ checksum = "4a5f13b858c8d314ee3e8f639011f7ccefe71f97f96e50151fb991f267928e2c"
|
||||
|
||||
[[package]]
|
||||
name = "jiff"
|
||||
version = "0.2.6"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1f33145a5cbea837164362c7bd596106eb7c5198f97d1ba6f6ebb3223952e488"
|
||||
checksum = "5a064218214dc6a10fbae5ec5fa888d80c45d611aba169222fc272072bf7aef6"
|
||||
dependencies = [
|
||||
"jiff-static",
|
||||
"log",
|
||||
@ -473,15 +538,25 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "jiff-static"
|
||||
version = "0.2.6"
|
||||
version = "0.2.10"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "43ce13c40ec6956157a3635d97a1ee2df323b263f09ea14165131289cb0f5c19"
|
||||
checksum = "199b7932d97e325aff3a7030e141eafe7f2c6268e1d1b24859b753a627f45254"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "js-sys"
|
||||
version = "0.3.77"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1cfaf33c695fc6e08064efbc1f72ec937429614f25eef83af942d0e227c3a28f"
|
||||
dependencies = [
|
||||
"once_cell",
|
||||
"wasm-bindgen",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "lazy_static"
|
||||
version = "1.5.0"
|
||||
@ -552,6 +627,15 @@ dependencies = [
|
||||
"windows-sys 0.52.0",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "num-traits"
|
||||
version = "0.2.19"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "071dfc062690e90b734c0b2273ce72ad0ffa95f0c74596bc250dcfd960262841"
|
||||
dependencies = [
|
||||
"autocfg",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "object"
|
||||
version = "0.32.2"
|
||||
@ -625,9 +709,10 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "pp"
|
||||
version = "0.1.1"
|
||||
version = "0.2.2-PREVIEW"
|
||||
dependencies = [
|
||||
"ansi_term",
|
||||
"chrono",
|
||||
"clap",
|
||||
"color-eyre",
|
||||
"crossterm",
|
||||
@ -639,9 +724,9 @@ dependencies = [
|
||||
|
||||
[[package]]
|
||||
name = "proc-macro2"
|
||||
version = "1.0.94"
|
||||
version = "1.0.95"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a31971752e70b8b2686d7e46ec17fb38dad4051d94024c88df49b667caea9c84"
|
||||
checksum = "02b3e5e68a3a1a02aad3ec490a98007cbc13c37cbe84a3cd7b8e406d76e7f778"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
@ -971,6 +1056,64 @@ version = "0.11.0+wasi-snapshot-preview1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "9c8d87e72b64a3b4db28d11ce29237c246188f4f51057d65a7eab63b7987e423"
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1edc8929d7499fc4e8f0be2262a241556cfc54a0bea223790e71446f2aab1ef5"
|
||||
dependencies = [
|
||||
"cfg-if",
|
||||
"once_cell",
|
||||
"rustversion",
|
||||
"wasm-bindgen-macro",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-backend"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "2f0a0651a5c2bc21487bde11ee802ccaf4c51935d0d3d42a6101f98161700bc6"
|
||||
dependencies = [
|
||||
"bumpalo",
|
||||
"log",
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7fe63fc6d09ed3792bd0897b314f53de8e16568c2b3f7982f468c0bf9bd0b407"
|
||||
dependencies = [
|
||||
"quote",
|
||||
"wasm-bindgen-macro-support",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-macro-support"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "8ae87ea40c9f689fc23f209965b6fb8a99ad69aeeb0231408be24920604395de"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
"wasm-bindgen-backend",
|
||||
"wasm-bindgen-shared",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "wasm-bindgen-shared"
|
||||
version = "0.2.100"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "1a05d73b933a847d6cccdda8f838a22ff101ad9bf93e33684f39c1f5f0eece3d"
|
||||
dependencies = [
|
||||
"unicode-ident",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "winapi"
|
||||
version = "0.3.9"
|
||||
@ -993,6 +1136,65 @@ version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
|
||||
|
||||
[[package]]
|
||||
name = "windows-core"
|
||||
version = "0.61.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
|
||||
dependencies = [
|
||||
"windows-implement",
|
||||
"windows-interface",
|
||||
"windows-link",
|
||||
"windows-result",
|
||||
"windows-strings",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-implement"
|
||||
version = "0.60.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "a47fddd13af08290e67f4acabf4b459f647552718f683a7b415d290ac744a836"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-interface"
|
||||
version = "0.59.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "bd9211b69f8dcdfa817bfd14bf1c97c9188afa36f4750130fcdf3f400eca9fa8"
|
||||
dependencies = [
|
||||
"proc-macro2",
|
||||
"quote",
|
||||
"syn",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-link"
|
||||
version = "0.1.1"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "76840935b766e1b0a05c0066835fb9ec80071d4c09a16f6bd5f7e655e3c14c38"
|
||||
|
||||
[[package]]
|
||||
name = "windows-result"
|
||||
version = "0.3.2"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "c64fd11a4fd95df68efcfee5f44a294fe71b8bc6a91993e2791938abcc712252"
|
||||
dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-strings"
|
||||
version = "0.4.0"
|
||||
source = "registry+https://github.com/rust-lang/crates.io-index"
|
||||
checksum = "7a2ba9642430ee452d5a7aa78d72907ebe8cfda358e8cb7918a2050581322f97"
|
||||
dependencies = [
|
||||
"windows-link",
|
||||
]
|
||||
|
||||
[[package]]
|
||||
name = "windows-sys"
|
||||
version = "0.52.0"
|
||||
|
||||
@ -1,6 +1,6 @@
|
||||
[package]
|
||||
name = "pp"
|
||||
version = "0.1.1"
|
||||
version = "0.2.2-PREVIEW"
|
||||
edition = "2024"
|
||||
|
||||
[dependencies]
|
||||
@ -15,8 +15,7 @@ color-eyre = "0.6.3"
|
||||
crossterm = "0.28.1"
|
||||
ratatui = "0.29.0"
|
||||
|
||||
[[bin]]
|
||||
name = "duration_to_string"
|
||||
|
||||
# Time Display
|
||||
chrono = "0.4"
|
||||
[[bin]]
|
||||
name = "pp"
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
address,name
|
||||
10.3.100.1,Belleville Router
|
||||
10.11.31.3,Belleville VPN 11-31
|
||||
10.12.32.1,Belleville VPN 12-32
|
||||
|
||||
@ -1,3 +1,4 @@
|
||||
address,name
|
||||
10.3.100.1,Belleville Router
|
||||
10.11.31.3,Belleville VPN 11-31
|
||||
10.12.32.1,Belleville VPN 12-32
|
||||
|
||||
@ -1,14 +1,20 @@
|
||||
10.3.100.1,Belleville Router
|
||||
10.11.31.3,Belleville VPN 11-31
|
||||
10.12.32.1,Belleville VPN 12-32
|
||||
10.11.21.1,Lindsay VPN 11-21
|
||||
10.12.22.1,Lindsay VPN 11-22
|
||||
8.8.8.8,Google DNS
|
||||
1.1.1.1,1111 DNS
|
||||
24.51.235.162,Peterborough Cogeco
|
||||
99.214.0.92,Peterborough Rogers
|
||||
216.234.202.122,Lindsay Starlink
|
||||
24.143.184.98,Lindsay Cogeco
|
||||
address,name
|
||||
10.3.100.1,Belleville Gateway
|
||||
10.11.31.1,Belleville VPN 11-31 (P)
|
||||
10.11.31.3,Belleville VPN 11-31 (B)
|
||||
10.12.32.1,Belleville VPN 12-32 (P)
|
||||
10.12.32.3,Belleville VPN 12-32 (B)
|
||||
192.186.110.6,Belleville Cogeco
|
||||
129.222.197.36,Belleville Starlink
|
||||
192.168.0.50,Sign
|
||||
10.2.100.1,Lindsay Gateway
|
||||
24.143.184.98,Lindsay Cogeco
|
||||
192.168.1.50,Lindsay Sign
|
||||
10.11.21.1,Lindsay VPN 11-21 (P)
|
||||
10.11.21.2,Lindsay VPN 11-21 (L)
|
||||
10.11.21.1,Lindsay VPN 11-22 (P)
|
||||
10.12.22.2,Lindsay VPN 11-22 (L)
|
||||
8.8.8.8,Google DNS
|
||||
1.1.1.1,1111 DNS
|
||||
192.168.0.1,Peterborough Gateway
|
||||
24.51.235.162,Peterborough Cogeco
|
||||
99.214.0.92,Peterborough Rogers
|
||||
|
||||
10
src/app_settings.rs
Normal file
10
src/app_settings.rs
Normal file
@ -0,0 +1,10 @@
|
||||
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, default_value = None)]
|
||||
pub ping_host_file: Option<PathBuf>,
|
||||
}
|
||||
@ -1,41 +0,0 @@
|
||||
use std::time::Duration;
|
||||
|
||||
pub fn duration_to_string(to_convert: Duration) -> String {
|
||||
let mut total_seconds = to_convert.as_secs();
|
||||
let mut working_string = String::new();
|
||||
|
||||
if total_seconds > 86400 {
|
||||
// days
|
||||
let num_days = total_seconds / 86400;
|
||||
working_string = format!("{} days", num_days);
|
||||
total_seconds = total_seconds - (num_days * 86400);
|
||||
}
|
||||
|
||||
if total_seconds > 3600 {
|
||||
// hours
|
||||
let num_hours = total_seconds / 3600;
|
||||
if num_hours > 0 {
|
||||
working_string = format!("{} {} hours", working_string, num_hours);
|
||||
total_seconds = total_seconds - (num_hours * 3600);
|
||||
}
|
||||
}
|
||||
if total_seconds > 60 {
|
||||
let num_minutes = total_seconds / 60;
|
||||
if num_minutes > 0 {
|
||||
working_string = format!("{} {} minutes", working_string, num_minutes);
|
||||
total_seconds = total_seconds - (num_minutes * 60);
|
||||
}
|
||||
// minutes
|
||||
}
|
||||
|
||||
|
||||
working_string = format!("{} {} seconds.", working_string, total_seconds);
|
||||
|
||||
working_string
|
||||
}
|
||||
fn main() {
|
||||
println!("1m 12s => {}", duration_to_string(Duration::from_secs(72)));
|
||||
println!("1h 1m 12s => {}", duration_to_string(Duration::from_secs(3672)));
|
||||
println!("1d 1h 1m 12s => {}", duration_to_string(Duration::from_secs(90072)));
|
||||
println!("30d 1h 1m 12s => {}", duration_to_string(Duration::from_secs(2595672)));
|
||||
}
|
||||
@ -1,83 +1,14 @@
|
||||
use std::collections::BTreeMap;
|
||||
use std::fs::File;
|
||||
use std::io;
|
||||
use std::io::BufRead;
|
||||
use std::net::Ipv4Addr;
|
||||
use std::path::{Path, PathBuf};
|
||||
use std::str::FromStr;
|
||||
use std::sync::mpsc;
|
||||
use std::time::{Duration, SystemTime};
|
||||
use clap::Parser;
|
||||
use pp::ping_result::PingResult;
|
||||
use pp::ping_request::PingRequest;
|
||||
use pp::manager::Manager;
|
||||
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::ppstate::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
|
||||
use ratatui::widgets::TableState;
|
||||
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();
|
||||
|
||||
print!("Creating new State...");
|
||||
let mut state = PPState::new_from_file(settings.ping_host_file.unwrap_or(PathBuf::from("INVALID FILE")));
|
||||
|
||||
// channel to send requests to ping
|
||||
let (ping_response_sender, ping_response_listener) = mpsc::channel::<PingResult>();
|
||||
|
||||
println!("Setting up requests for {} hosts.", state.ips_from_state().len());
|
||||
Manager::spawn_manager_thread(PPState::targets_states_from_state(&state), ping_response_sender.clone());
|
||||
|
||||
let mut display_loop_start = SystemTime::now();
|
||||
let mut duration_since_last_loop = SystemTime::now().duration_since(display_loop_start).unwrap();
|
||||
loop {
|
||||
state.check_for_ping(&ping_response_listener);
|
||||
|
||||
let now = SystemTime::now();
|
||||
|
||||
|
||||
duration_since_last_loop = now
|
||||
.duration_since(display_loop_start)
|
||||
.expect("unable to figure out how long ago we displayed stuff");
|
||||
if duration_since_last_loop.as_secs() > SECONDS_BETWEEN_DISPLAY as u64 {
|
||||
println!("DISPLAY LOOP");
|
||||
println!("Host \t\t\t\t\t | Alive \t | RTT \t\t");
|
||||
for current_result in state.targets_states_from_state() {
|
||||
let time_since_last_change = now
|
||||
.duration_since(current_result.last_alive_change)
|
||||
.unwrap_or(Duration::from_secs(0));
|
||||
let mut target_string = format!("{} ({})", current_result.name, current_result.target);
|
||||
while target_string.len() < 34 {
|
||||
target_string.push(' ');
|
||||
// target_string = format!("{} ", target_string);
|
||||
}
|
||||
|
||||
target_string = if current_result.alive {
|
||||
target_string.green().to_string()
|
||||
} else {
|
||||
target_string.red().to_string()
|
||||
};
|
||||
|
||||
println!("{} \t | {} \t | {}\t | Changed {}s ago",
|
||||
target_string,
|
||||
current_result.alive,
|
||||
current_result.last_rtt, time_since_last_change.as_secs()
|
||||
);
|
||||
}
|
||||
display_loop_start = now;
|
||||
}
|
||||
}
|
||||
color_eyre::install()?;
|
||||
let terminal = ratatui::init();
|
||||
let result = RatatuiApp::new(settings.ping_host_file).run(terminal);
|
||||
ratatui::restore();
|
||||
result
|
||||
}
|
||||
|
||||
139
src/bin/rat.rs
139
src/bin/rat.rs
@ -1,139 +0,0 @@
|
||||
use pp::tui::target_display::TargetDisplay;
|
||||
use std::net::Ipv4Addr;
|
||||
use std::sync::mpsc;
|
||||
use std::sync::mpsc::Receiver;
|
||||
use std::sync::mpsc::Sender;
|
||||
use std::time::Duration;
|
||||
|
||||
use color_eyre::Result;
|
||||
use crossterm::event;
|
||||
use crossterm::event::{Event, KeyCode, KeyEvent, KeyEventKind, KeyModifiers};
|
||||
use pp::ping_result::PingResult;
|
||||
use pp::target_state::TargetState;
|
||||
use ratatui::style::Stylize;
|
||||
use ratatui::text::Line;
|
||||
use ratatui::widgets::Paragraph;
|
||||
use ratatui::{DefaultTerminal, Frame};
|
||||
use std::collections::BTreeMap;
|
||||
use std::time::SystemTime;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct App {
|
||||
running: bool,
|
||||
counter: u32,
|
||||
known_hosts: Vec<Ipv4Addr>,
|
||||
targets: BTreeMap<String, TargetState>,
|
||||
result_tx: Option<Sender<PingResult>>,
|
||||
result_rx: Option<Receiver<PingResult>>,
|
||||
log_events: Vec<String>,
|
||||
}
|
||||
|
||||
impl App {
|
||||
pub fn new() -> Self {
|
||||
let mut working = Self::default();
|
||||
working.known_hosts.push(Ipv4Addr::new(127, 0, 0, 1));
|
||||
working.known_hosts.push(Ipv4Addr::new(8, 8, 8, 8));
|
||||
working.known_hosts.push(Ipv4Addr::new(1, 1, 1, 1));
|
||||
|
||||
working
|
||||
.targets
|
||||
.insert("Test Host 1".to_string(), TargetState {
|
||||
name: "Test Host 1".to_string(),
|
||||
target: Ipv4Addr::new(127, 0, 0, 1),
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
working
|
||||
.targets
|
||||
.insert("Test Host 2".to_string(), TargetState {
|
||||
target: Ipv4Addr::new(1, 1, 1, 1),
|
||||
name: "Test Host 2".to_string(),
|
||||
..Default::default()
|
||||
});
|
||||
|
||||
let (sender, receiver) = mpsc::channel::<PingResult>();
|
||||
working.result_tx = Some(sender);
|
||||
working.result_rx = Some(receiver);
|
||||
working
|
||||
}
|
||||
|
||||
pub fn run(mut self, mut terminal: DefaultTerminal) -> Result<()> {
|
||||
self.running = true;
|
||||
while self.running {
|
||||
// check if we have any waiting ping responses
|
||||
if let Ok(response) = self
|
||||
.result_rx
|
||||
.as_mut()
|
||||
.unwrap()
|
||||
.recv_timeout(Duration::from_millis(50))
|
||||
{
|
||||
let local_targets = self.targets.clone();
|
||||
for (name, current_state) in local_targets {
|
||||
if current_state.target == response.target {
|
||||
let last_alive_change = if response.success == current_state.alive {
|
||||
current_state.last_alive_change
|
||||
} else {
|
||||
SystemTime::now()
|
||||
};
|
||||
|
||||
let new_state = TargetState {
|
||||
name: name.clone(),
|
||||
target: current_state.target,
|
||||
alive: response.success,
|
||||
last_rtt: response.rtt,
|
||||
last_alive_change,
|
||||
};
|
||||
self.targets.insert(name.clone(), new_state);
|
||||
//self.set_target_state(current_state.name.clone(), new_state);
|
||||
}
|
||||
}
|
||||
}
|
||||
terminal.draw(|frame| self.render(frame))?;
|
||||
self.handle_crossterm_events()?;
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
fn render(&mut self, frame: &mut Frame) {
|
||||
let title = Line::from("PP Status").bold().centered().blue();
|
||||
|
||||
let mut body_string = String::new();
|
||||
for (name, target) in &self.targets {
|
||||
frame.render_widget(TargetDisplay::new(target.clone()), frame.area());
|
||||
body_string = format!("{}\n{} = {}", body_string, target.name, target.target);
|
||||
}
|
||||
|
||||
frame.render_widget(Paragraph::new(body_string), frame.area());
|
||||
}
|
||||
|
||||
fn handle_crossterm_events(&mut self) -> Result<()> {
|
||||
match event::read()? {
|
||||
Event::Key(key) if key.kind == KeyEventKind::Press => self.on_key_event(key),
|
||||
Event::Mouse(_) => {}
|
||||
Event::Resize(_, _) => {}
|
||||
_ => {}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
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(),
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn quit(&mut self) {
|
||||
self.running = false;
|
||||
}
|
||||
}
|
||||
|
||||
fn main() -> Result<()> {
|
||||
color_eyre::install()?;
|
||||
let terminal = ratatui::init();
|
||||
let result = App::new().run(terminal);
|
||||
ratatui::restore();
|
||||
println!("Exited.");
|
||||
result
|
||||
}
|
||||
44
src/lib.rs
44
src/lib.rs
@ -1,9 +1,51 @@
|
||||
use std::time::Duration;
|
||||
|
||||
pub mod manager;
|
||||
pub mod ping_request;
|
||||
pub mod ping_result;
|
||||
pub mod ppstate;
|
||||
pub mod target_state;
|
||||
pub 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
|
||||
}
|
||||
|
||||
|
||||
@ -1,12 +1,11 @@
|
||||
use crate::SECONDS_BETWEEN_PING;
|
||||
use crate::ping_request::PingRequest;
|
||||
use crate::ping_result::PingResult;
|
||||
use crate::target_state::TargetState;
|
||||
use std::net::Ipv4Addr;
|
||||
use std::process::Command;
|
||||
use std::sync::mpsc::Sender;
|
||||
use std::thread;
|
||||
use std::time::{Duration, SystemTime};
|
||||
use crate::ping_request::PingRequest;
|
||||
use crate::ping_result::PingResult;
|
||||
use crate::SECONDS_BETWEEN_PING;
|
||||
|
||||
pub struct Manager;
|
||||
|
||||
@ -14,17 +13,12 @@ const WIN_PING_SUCCESS: i32 = 1;
|
||||
const LIN_PING_SUCCESS: i32 = 0;
|
||||
|
||||
impl Manager {
|
||||
pub fn spawn_manager_thread(targets: Vec<TargetState>, sender: Sender<PingResult>) {
|
||||
pub fn spawn_manager_thread(targets: Vec<Ipv4Addr>, sender: Sender<PingResult>) {
|
||||
let local_targets = targets.clone();
|
||||
thread::spawn(move || {
|
||||
loop {
|
||||
for target in &local_targets {
|
||||
Manager::spawn_single_ping(
|
||||
PingRequest {
|
||||
target: target.target,
|
||||
},
|
||||
sender.clone(),
|
||||
);
|
||||
Manager::spawn_single_ping(PingRequest { target: *target }, sender.clone());
|
||||
}
|
||||
thread::sleep(Duration::from_secs(SECONDS_BETWEEN_PING as u64));
|
||||
}
|
||||
@ -32,53 +26,40 @@ impl Manager {
|
||||
}
|
||||
|
||||
// Spawns a thread that pings a target and sends the response back to the main thread
|
||||
// via the sender
|
||||
// via the sender
|
||||
fn spawn_single_ping(request: PingRequest, sender: Sender<PingResult>) {
|
||||
let local_request = request.clone();
|
||||
thread::spawn(move || {
|
||||
|
||||
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())
|
||||
#[cfg(any(target_os="windows"))] {
|
||||
result = Command::new("c:/windows/system32/ping.exe").arg(request.target.to_string())
|
||||
.arg("-n 1")
|
||||
.arg(format!("-w {}", crate::SECONDS_BETWEEN_PING))
|
||||
.arg("-4")
|
||||
.output()
|
||||
.unwrap()
|
||||
.status
|
||||
.code()
|
||||
.unwrap_or(255);
|
||||
success = result == WIN_PING_SUCCESS as i32;
|
||||
.output().unwrap().status.code().unwrap_or(255);
|
||||
success = result == WIN_PING_SUCCESS as i32;;
|
||||
}
|
||||
#[cfg(any(target_os = "linux"))]
|
||||
{
|
||||
result = Command::new("/usr/bin/ping")
|
||||
.arg(request.target.to_string())
|
||||
#[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);
|
||||
.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;
|
||||
sender
|
||||
.send(PingResult {
|
||||
target: local_request.target,
|
||||
success,
|
||||
rtt: ping_duration.as_millis() as u32,
|
||||
})
|
||||
.expect("Unable to send response");
|
||||
sender.send(PingResult {
|
||||
target: local_request.target,
|
||||
success,
|
||||
rtt: ping_duration.as_millis() as u32
|
||||
}).expect("Unable to send response");
|
||||
|
||||
// println!("Attempt for for {}", local_request.target);
|
||||
});
|
||||
|
||||
145
src/ppstate.rs
145
src/ppstate.rs
@ -1,145 +0,0 @@
|
||||
use crate::ping_result::PingResult;
|
||||
use crate::target_state::TargetState;
|
||||
use log::debug;
|
||||
use std::collections::BTreeMap;
|
||||
use std::fs::File;
|
||||
use std::net::Ipv4Addr;
|
||||
use std::path::PathBuf;
|
||||
use std::str::FromStr;
|
||||
use std::sync::mpsc::Receiver;
|
||||
use std::time::{Duration, SystemTime};
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct PPState {
|
||||
targets: BTreeMap<String, TargetState>,
|
||||
}
|
||||
|
||||
impl PPState {
|
||||
pub fn check_for_ping(&mut self, channel: &Receiver<PingResult>) {
|
||||
if let Ok(response) = channel.recv_timeout(Duration::from_millis(100)) {
|
||||
let local_targets = self.targets_states_from_state().clone();
|
||||
for current_state in local_targets {
|
||||
if current_state.target == response.target {
|
||||
let last_alive_change = if response.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: response.success,
|
||||
last_rtt: response.rtt,
|
||||
last_alive_change,
|
||||
};
|
||||
self.set_target_state(current_state.name.clone(), new_state);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn new_from_file(file_to_load_from: PathBuf) -> Self {
|
||||
let mut working = Self::new();
|
||||
working.targets = PPState::build_targets_from_file(Some(file_to_load_from));
|
||||
working
|
||||
}
|
||||
pub fn new() -> Self {
|
||||
Self::default()
|
||||
}
|
||||
pub fn get_default_targets() -> BTreeMap<String, TargetState> {
|
||||
let mut working = BTreeMap::new();
|
||||
working.insert("Localhost".to_string(), TargetState {
|
||||
name: "Localhost".to_string(),
|
||||
target: Ipv4Addr::new(127, 0, 0, 1),
|
||||
..TargetState::default()
|
||||
});
|
||||
|
||||
working.insert("Home Gateway".to_string(), TargetState {
|
||||
name: "Home Gateway".to_string(),
|
||||
target: Ipv4Addr::new(172, 24, 0, 1),
|
||||
..TargetState::default()
|
||||
});
|
||||
|
||||
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("Site IP 1".to_string(), TargetState {
|
||||
name: "Site IP 1".to_string(),
|
||||
target: Ipv4Addr::new(216, 121, 247, 231),
|
||||
..TargetState::default()
|
||||
});
|
||||
working.insert("Site IP 2".to_string(), TargetState {
|
||||
name: "Site IP 2".to_string(),
|
||||
target: Ipv4Addr::new(216, 234, 202, 122),
|
||||
..TargetState::default()
|
||||
});
|
||||
working.insert("Site IP 3".to_string(), TargetState {
|
||||
name: "Site IP 3".to_string(),
|
||||
target: Ipv4Addr::new(24, 143, 184, 98),
|
||||
..TargetState::default()
|
||||
});
|
||||
working
|
||||
}
|
||||
|
||||
pub fn build_targets_from_file(filename: Option<PathBuf>) -> BTreeMap<String, TargetState> {
|
||||
PPState::get_default_targets();
|
||||
if let Some(file) = filename {
|
||||
let mut working = BTreeMap::new();
|
||||
if !&file.exists() {
|
||||
debug!(
|
||||
"Cant load hosts from {:?}. Using default host list.",
|
||||
file.clone().as_os_str()
|
||||
);
|
||||
// use
|
||||
PPState::get_default_targets()
|
||||
} else {
|
||||
debug!("LOADING HOSTS FROM {:?}", file.to_str());
|
||||
let file = File::open(file);
|
||||
let mut rdr = csv::Reader::from_reader(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 {
|
||||
PPState::get_default_targets()
|
||||
}
|
||||
}
|
||||
|
||||
pub fn ips_from_state(&self) -> Vec<Ipv4Addr> {
|
||||
let mut working: Vec<Ipv4Addr> = vec![];
|
||||
for (name, current) in &self.targets {
|
||||
working.push(current.target);
|
||||
}
|
||||
working
|
||||
}
|
||||
|
||||
pub fn targets_states_from_state(&self) -> Vec<TargetState> {
|
||||
let mut working: Vec<TargetState> = vec![];
|
||||
for (_, target) in &self.targets {
|
||||
working.push(target.clone());
|
||||
}
|
||||
|
||||
working
|
||||
}
|
||||
|
||||
pub fn set_target_state(&mut self, key: String, value: TargetState) {
|
||||
self.targets.insert(key, value);
|
||||
}
|
||||
}
|
||||
@ -1,2 +1,7 @@
|
||||
pub mod target_display;
|
||||
mod multi_target_display;
|
||||
pub mod mode_editing;
|
||||
pub mod mode_monitoring;
|
||||
pub mod ratatui_app;
|
||||
pub mod target_state_widget;
|
||||
mod ratatui_screens;
|
||||
mod mode_deleting;
|
||||
mod mode_adding;
|
||||
|
||||
34
src/tui/mode_adding.rs
Normal file
34
src/tui/mode_adding.rs
Normal file
@ -0,0 +1,34 @@
|
||||
use std::time::Duration;
|
||||
use ratatui::Frame;
|
||||
use crate::tui::ratatui_app::RatatuiApp;
|
||||
use color_eyre::Result;
|
||||
use crossterm::event;
|
||||
use crossterm::event::{Event, KeyCode, KeyEventKind};
|
||||
use ratatui::widgets::{Block, Paragraph};
|
||||
use crate::tui::ratatui_screens::RatatuiScreens::Monitoring;
|
||||
|
||||
pub struct RatatuiAddingMode {}
|
||||
impl RatatuiAddingMode {
|
||||
pub fn render(frame: &mut Frame, state: &mut RatatuiApp) {
|
||||
frame.render_widget(
|
||||
Paragraph::new("Not Yet Written.")
|
||||
.block(Block::bordered())
|
||||
.centered(),
|
||||
frame.area()
|
||||
);
|
||||
}
|
||||
|
||||
pub fn handle_crossterm_events(app: &mut RatatuiApp) -> Result<()> {
|
||||
if event::poll(Duration::from_millis(100))? {
|
||||
match event::read()? {
|
||||
Event::Key(key) if key.kind == KeyEventKind::Press => match key.code {
|
||||
KeyCode::Esc => app.set_screen(Monitoring),
|
||||
_ => {}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
59
src/tui/mode_deleting.rs
Normal file
59
src/tui/mode_deleting.rs
Normal file
@ -0,0 +1,59 @@
|
||||
use std::time::Duration;
|
||||
use crossterm::event;
|
||||
use crossterm::event::{Event, KeyCode, KeyEventKind};
|
||||
use ratatui::Frame;
|
||||
use ratatui::style::Stylize;
|
||||
use ratatui::text::Line;
|
||||
use ratatui::widgets::{Block, Paragraph};
|
||||
use crate::tui::ratatui_app::RatatuiApp;
|
||||
use crate::tui::ratatui_screens::RatatuiScreens::Monitoring;
|
||||
use color_eyre::Result;
|
||||
|
||||
pub struct RatatuiDeletingMode {}
|
||||
|
||||
impl RatatuiDeletingMode {
|
||||
pub fn render(frame: &mut Frame, state: &mut RatatuiApp) {
|
||||
let title = Line::from("Delete Host").bold().red().centered();
|
||||
let as_list = state.state.clone();
|
||||
let mut nice_status = None;
|
||||
for (index, (label, data)) in as_list.iter().enumerate() {
|
||||
if index == state.selected_host {
|
||||
nice_status = Some(data);
|
||||
}
|
||||
}
|
||||
let mut body = format!("Do you really want to delete {} (Y/N)", nice_status.unwrap().name);
|
||||
|
||||
frame.render_widget(
|
||||
Paragraph::new(body)
|
||||
.block(Block::bordered().title(title))
|
||||
.centered(),
|
||||
frame.area()
|
||||
);
|
||||
}
|
||||
|
||||
pub fn handle_crossterm_events(app: &mut RatatuiApp) -> Result<()> {
|
||||
if event::poll(Duration::from_millis(100))? {
|
||||
match event::read()? {
|
||||
Event::Key(key) if key.kind == KeyEventKind::Press => match key.code {
|
||||
KeyCode::Enter | KeyCode::Char('y') | KeyCode::Char('Y') => {
|
||||
let as_list = &app.state.clone();
|
||||
for (index, (label, _)) in as_list.iter().enumerate() {
|
||||
if index == app.selected_host {
|
||||
app.state.remove(label).unwrap();
|
||||
app.set_screen(Monitoring)
|
||||
}
|
||||
}
|
||||
}
|
||||
KeyCode::Esc | KeyCode::Char('n') | KeyCode::Char('N') => {
|
||||
app.set_screen(Monitoring)
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
62
src/tui/mode_editing.rs
Normal file
62
src/tui/mode_editing.rs
Normal file
@ -0,0 +1,62 @@
|
||||
use std::collections::BTreeMap;
|
||||
use std::time::Duration;
|
||||
use crossterm::event;
|
||||
use crossterm::event::{Event, KeyCode, KeyEventKind};
|
||||
use ratatui::Frame;
|
||||
use ratatui::prelude::Line;
|
||||
use ratatui::style::Stylize;
|
||||
use ratatui::widgets::{Block, Paragraph};
|
||||
use crate::target_state::TargetState;
|
||||
use crate::tui::ratatui_app::RatatuiApp;
|
||||
use color_eyre::Result;
|
||||
use crate::tui::ratatui_screens::RatatuiScreens::Monitoring;
|
||||
|
||||
pub struct RatatuiEditingMode {}
|
||||
|
||||
impl RatatuiEditingMode {
|
||||
pub fn handle_crossterm_events(app: &mut RatatuiApp) -> Result<()> {
|
||||
if event::poll(Duration::from_millis(100))? {
|
||||
match event::read()? {
|
||||
Event::Key(key) if key.kind == KeyEventKind::Press => match key.code {
|
||||
KeyCode::Up => {
|
||||
println!("UP")
|
||||
}
|
||||
KeyCode::Down => {
|
||||
println!("Down")
|
||||
}
|
||||
KeyCode::Char('+') => {
|
||||
println!("ADD HOST")
|
||||
}
|
||||
KeyCode::Char('-') => {
|
||||
println!("Delete Host")
|
||||
}
|
||||
KeyCode::Char('q') => {
|
||||
app.set_running(false);
|
||||
}
|
||||
KeyCode::Esc => {
|
||||
app.set_screen(Monitoring);
|
||||
}
|
||||
KeyCode::Char('s') => {
|
||||
println!("Save to existing file.");
|
||||
}
|
||||
_ => {}
|
||||
},
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
|
||||
pub fn render(frame: &mut Frame, state: &mut BTreeMap<String, TargetState>) {
|
||||
let title = Line::from("Editing Hosts").bold().blue().centered();
|
||||
|
||||
let body_text = "This is the body text for editing hosts\n'q' to exit <esc> to return to monitoring";
|
||||
|
||||
frame.render_widget(
|
||||
Paragraph::new(body_text)
|
||||
.centered()
|
||||
.block(Block::new().title(title).blue()),
|
||||
frame.area(),
|
||||
);
|
||||
}
|
||||
}
|
||||
295
src/tui/mode_monitoring.rs
Normal file
295
src/tui/mode_monitoring.rs
Normal file
@ -0,0 +1,295 @@
|
||||
use crate::duration_to_string;
|
||||
use crate::target_state::TargetState;
|
||||
use crate::tui::ratatui_app::RatatuiApp;
|
||||
use color_eyre::Result;
|
||||
use crossterm::event;
|
||||
use crossterm::event::{Event, KeyCode, KeyEventKind};
|
||||
use ratatui::Frame;
|
||||
use ratatui::layout::Flex;
|
||||
use ratatui::prelude::*;
|
||||
use ratatui::widgets::{
|
||||
Block, Borders, Cell, Clear, List, ListItem, Paragraph, Row, Table, TableState,
|
||||
};
|
||||
use std::time::{Duration, SystemTime};
|
||||
|
||||
pub struct RatatuiMonitoringMode {}
|
||||
|
||||
impl RatatuiMonitoringMode {
|
||||
fn render_hosts_list(frame: &mut Frame, state: &mut RatatuiApp, area: Rect) {
|
||||
// Headers
|
||||
let headers = ["Host", "RTT", "Last Change"]
|
||||
.iter()
|
||||
.map(|h| Cell::from(*h));
|
||||
let header = Row::new(headers)
|
||||
.style(Style::default().fg(Color::Yellow).bold())
|
||||
.bottom_margin(1);
|
||||
|
||||
// Rows
|
||||
let mut rows = vec![];
|
||||
|
||||
for (_, current) in state.state.iter() {
|
||||
let name_field = format!(
|
||||
"{:<40}",
|
||||
format!("{} ({})", current.name.clone(), current.target.clone())
|
||||
);
|
||||
|
||||
let name_style = if current.alive {
|
||||
Style::default().fg(Color::Green)
|
||||
} else {
|
||||
Style::default().fg(Color::Red)
|
||||
};
|
||||
|
||||
rows.push(Row::new(vec![
|
||||
Cell::from(name_field).style(name_style),
|
||||
Cell::from(current.last_rtt.to_string()),
|
||||
Cell::from(format!(
|
||||
"{} ago.",
|
||||
duration_to_string(
|
||||
SystemTime::now()
|
||||
.duration_since(current.last_alive_change)
|
||||
.unwrap()
|
||||
)
|
||||
)),
|
||||
]));
|
||||
}
|
||||
|
||||
// Table Builder
|
||||
let table = Table::new(rows, vec![
|
||||
Constraint::Min(30),
|
||||
Constraint::Min(6),
|
||||
Constraint::Min(5),
|
||||
Constraint::Min(30),
|
||||
])
|
||||
.header(header)
|
||||
.block(
|
||||
Block::default()
|
||||
.title(Line::from(format!("PP v{}", env!("CARGO_PKG_VERSION"))))
|
||||
.borders(Borders::ALL),
|
||||
)
|
||||
.widths(&[
|
||||
Constraint::Fill(2), // Host
|
||||
Constraint::Min(4), // RTT
|
||||
Constraint::Min(30), // TIme Since
|
||||
])
|
||||
.row_highlight_style(
|
||||
Style::default()
|
||||
.bg(Color::Blue)
|
||||
.fg(Color::White)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
)
|
||||
.highlight_symbol(">> ");
|
||||
|
||||
// frame.render_widget(table, layouts[0]);
|
||||
frame.render_stateful_widget(table, area, &mut make_hosts_list_state(state.selected_host));
|
||||
}
|
||||
|
||||
fn render_logs(frame: &mut Frame, state: &mut RatatuiApp, logs_layout: Rect) {
|
||||
let list_items: Vec<ListItem> = state
|
||||
.get_log_entries(10)
|
||||
.iter()
|
||||
.map(|entry| ListItem::new(entry.clone()))
|
||||
.collect();
|
||||
|
||||
// Log
|
||||
frame.render_widget(
|
||||
List::new(list_items)
|
||||
.block(Block::default().title("Logs").borders(Borders::ALL))
|
||||
.highlight_style(
|
||||
Style::default()
|
||||
.fg(Color::Yellow)
|
||||
.add_modifier(Modifier::BOLD),
|
||||
),
|
||||
logs_layout,
|
||||
);
|
||||
}
|
||||
|
||||
fn render_footer_block(frame: &mut Frame, footer_layout: Rect) {
|
||||
frame.render_widget(
|
||||
Paragraph::new(
|
||||
"Press <ESC> or q to exit | Press d to delete host | Press a to add host",
|
||||
)
|
||||
.block(Block::bordered())
|
||||
.centered(),
|
||||
footer_layout,
|
||||
);
|
||||
}
|
||||
pub fn render(frame: &mut Frame, state: &mut RatatuiApp) {
|
||||
let layouts = Layout::default()
|
||||
.direction(Direction::Vertical)
|
||||
.constraints([
|
||||
Constraint::Fill(1), // Top Bar
|
||||
Constraint::Length(10), // Hosts
|
||||
Constraint::Length(3), // Logs
|
||||
])
|
||||
.split(frame.area());
|
||||
|
||||
Self::render_hosts_list(frame, state, layouts[0]);
|
||||
Self::render_logs(frame, state, layouts[1]);
|
||||
Self::render_footer_block(frame, layouts[2]);
|
||||
|
||||
Self::add_popup(frame, state);
|
||||
Self::exit_popup(frame, state);
|
||||
Self::delete_popup(frame, state);
|
||||
}
|
||||
|
||||
fn add_popup(frame: &mut Frame, state: &RatatuiApp) {
|
||||
if state.showing_add_popup {
|
||||
let area = RatatuiMonitoringMode::popup_area(frame.area(), 10, 40);
|
||||
|
||||
frame.render_widget(Clear, area);
|
||||
|
||||
frame.render_widget(
|
||||
Paragraph::new(format!("Host Address : {}", state.add_host_name))
|
||||
.block(Block::bordered().title("Label")),
|
||||
area,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn exit_popup(frame: &mut Frame, state: &RatatuiApp) {
|
||||
if state.trying_to_exit {
|
||||
let area = RatatuiMonitoringMode::popup_area(frame.area(), 5, 20);
|
||||
|
||||
frame.render_widget(Clear, area);
|
||||
frame.render_widget(
|
||||
Paragraph::new("Are you sure? (Y/N)").block(Block::bordered().title("Exit")),
|
||||
area,
|
||||
);
|
||||
}
|
||||
}
|
||||
|
||||
fn delete_popup(frame: &mut Frame, state: &RatatuiApp) {
|
||||
if state.trying_to_delete {
|
||||
let as_list = state.state.clone();
|
||||
let mut host_name = String::new();
|
||||
for (index, (label, _)) in as_list.iter().enumerate() {
|
||||
if index == state.selected_host {
|
||||
host_name = label.clone();
|
||||
}
|
||||
}
|
||||
let block = Paragraph::new(format!("Delete {}", host_name))
|
||||
.centered()
|
||||
.block(Block::bordered());
|
||||
|
||||
frame.render_widget(block, frame.area());
|
||||
}
|
||||
}
|
||||
|
||||
fn popup_area(area: Rect, percent_x: u16, percent_y: u16) -> Rect {
|
||||
let vertical = Layout::vertical([Constraint::Percentage(percent_x)]).flex(Flex::Center);
|
||||
let horizontal = Layout::horizontal([Constraint::Percentage(percent_y)]).flex(Flex::Center);
|
||||
let [area] = vertical.areas(area);
|
||||
let [area] = horizontal.areas(area);
|
||||
area
|
||||
}
|
||||
|
||||
fn handle_add_popup_inputs(app: &mut RatatuiApp, key: KeyCode) {
|
||||
match key {
|
||||
KeyCode::Esc => {
|
||||
app.showing_add_popup = false;
|
||||
}
|
||||
KeyCode::Backspace => {
|
||||
app.add_host_name.remove(app.add_host_name.len() - 1);
|
||||
}
|
||||
KeyCode::Enter => {
|
||||
app.state.insert(app.add_host_name.clone(), TargetState {
|
||||
name: app.add_host_name.clone(),
|
||||
..Default::default()
|
||||
});
|
||||
}
|
||||
KeyCode::Down => {
|
||||
dbg!("Move down to next field");
|
||||
}
|
||||
KeyCode::Up => {
|
||||
dbg!("Move up to previous field");
|
||||
}
|
||||
_ => {
|
||||
app.add_host_name = format!("{}{}", app.add_host_name, key);
|
||||
//dbg!(format!("ADD_HOST_NAME: {}", app.add_host_name.clone()));
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_exit_popup_inputs(app: &mut RatatuiApp, key: KeyCode) {
|
||||
match key {
|
||||
KeyCode::Char('y') | KeyCode::Char('Y') => {
|
||||
app.set_running(false);
|
||||
}
|
||||
KeyCode::Char('n') | KeyCode::Char('N') => {
|
||||
app.trying_to_exit = false;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_monitoring_screen_inputs(app: &mut RatatuiApp, key: KeyCode) {
|
||||
// Default monitoring Screen
|
||||
match key {
|
||||
KeyCode::Down => {
|
||||
if app.selected_host + 1 == app.state.len() {
|
||||
app.selected_host = 0;
|
||||
} else {
|
||||
app.selected_host += 1;
|
||||
}
|
||||
}
|
||||
KeyCode::Up => {
|
||||
if app.selected_host == 0 {
|
||||
app.selected_host = app.state.len() - 1;
|
||||
} else {
|
||||
app.selected_host -= 1;
|
||||
}
|
||||
}
|
||||
KeyCode::Esc | KeyCode::Char('q') | KeyCode::Char('Q') => {
|
||||
app.trying_to_exit = true;
|
||||
}
|
||||
KeyCode::Char('a') | KeyCode::Char('A') => {
|
||||
app.showing_add_popup = true;
|
||||
}
|
||||
KeyCode::Char('d') | KeyCode::Char('D') => {
|
||||
app.trying_to_delete = true;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
fn handle_delete_popup_inputs(app: &mut RatatuiApp, key: KeyCode) {
|
||||
match key {
|
||||
KeyCode::Char('y') | KeyCode::Char('Y') => {
|
||||
app.remove_selected_host();
|
||||
app.trying_to_delete = false;
|
||||
}
|
||||
KeyCode::Char('n') | KeyCode::Char('N') => {
|
||||
dbg!("Do not delete this item.");
|
||||
app.trying_to_delete = false;
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn handle_crossterm_events(app: &mut RatatuiApp) -> Result<()> {
|
||||
if event::poll(Duration::from_millis(100))? {
|
||||
match event::read()? {
|
||||
Event::Key(key) if key.kind == KeyEventKind::Press => {
|
||||
// adding mode
|
||||
if app.showing_add_popup {
|
||||
Self::handle_add_popup_inputs(app, key.code);
|
||||
} else if app.trying_to_exit {
|
||||
Self::handle_exit_popup_inputs(app, key.code);
|
||||
} else if app.trying_to_delete {
|
||||
Self::handle_delete_popup_inputs(app, key.code);
|
||||
} else {
|
||||
Self::handle_monitoring_screen_inputs(app, key.code);
|
||||
}
|
||||
}
|
||||
_ => {}
|
||||
}
|
||||
}
|
||||
Ok(())
|
||||
}
|
||||
}
|
||||
|
||||
pub fn make_hosts_list_state(selected: usize) -> TableState {
|
||||
let mut state = TableState::default();
|
||||
state.select(Some(selected));
|
||||
state
|
||||
}
|
||||
@ -1,15 +0,0 @@
|
||||
use ratatui::buffer::{Buffer, Cell};
|
||||
use ratatui::layout::Rect;
|
||||
use ratatui::text::Line;
|
||||
use ratatui::widgets::{Widget};
|
||||
|
||||
pub struct MultiTargetDisplay {
|
||||
|
||||
}
|
||||
|
||||
impl Widget for MultiTargetDisplay {
|
||||
fn render(self, area: Rect, buf: &mut Buffer)
|
||||
{
|
||||
buf.content.push(Cell::from("Widgets go here"));
|
||||
}
|
||||
}
|
||||
259
src/tui/ratatui_app.rs
Normal file
259
src/tui/ratatui_app.rs
Normal file
@ -0,0 +1,259 @@
|
||||
use crate::manager::Manager;
|
||||
use crate::ping_result::PingResult;
|
||||
use crate::target_state::TargetState;
|
||||
use crate::tui::mode_adding::RatatuiAddingMode;
|
||||
use crate::tui::mode_deleting::RatatuiDeletingMode;
|
||||
use crate::tui::mode_editing::RatatuiEditingMode;
|
||||
use crate::tui::mode_monitoring::RatatuiMonitoringMode;
|
||||
use crate::tui::ratatui_screens::RatatuiScreens;
|
||||
use chrono::{DateTime, Local};
|
||||
use color_eyre::Result;
|
||||
use log::debug;
|
||||
use ratatui::prelude::*;
|
||||
use ratatui::{DefaultTerminal, Frame};
|
||||
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::thread;
|
||||
use std::time::{Duration, SystemTime};
|
||||
|
||||
const LOG_ENTRIES_DEFAULT_COUNT: u32 = 10;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct RatatuiApp {
|
||||
running: bool,
|
||||
pub state: BTreeMap<String, TargetState>,
|
||||
current_screen: RatatuiScreens,
|
||||
log_entries: Vec<String>,
|
||||
filename: Option<String>,
|
||||
pub selected_host: usize,
|
||||
pub showing_add_popup: bool,
|
||||
pub trying_to_exit: bool,
|
||||
pub trying_to_delete: bool,
|
||||
pub add_host_cursor_position: usize,
|
||||
pub add_host_name: String,
|
||||
pub num_log_entries: u32
|
||||
}
|
||||
|
||||
/// Private Methods
|
||||
impl RatatuiApp {
|
||||
pub fn remove_selected_host(self: &mut RatatuiApp) {
|
||||
for (index, (name, data)) in self.state.clone().iter().enumerate() {
|
||||
if index == self.selected_host {
|
||||
self.state.remove(name).unwrap();
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
pub fn set_filename(mut self, new_filename: String) {
|
||||
self.filename = Some(new_filename)
|
||||
}
|
||||
|
||||
pub fn get_filename(self) -> String {
|
||||
self.filename.unwrap_or(String::new())
|
||||
}
|
||||
|
||||
pub fn add_new_host(mut self, new_target: TargetState) -> Result<()> {
|
||||
self.state.insert(new_target.name.clone(), new_target);
|
||||
Ok(())
|
||||
}
|
||||
|
||||
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);
|
||||
|
||||
terminal.draw(|frame| RatatuiMonitoringMode::render(frame, &mut self))?;
|
||||
RatatuiMonitoringMode::handle_crossterm_events(&mut self)?;
|
||||
}
|
||||
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 did_change = new_message.success != current_state.alive;
|
||||
|
||||
let last_alive_change = if did_change {
|
||||
SystemTime::now()
|
||||
} else {
|
||||
current_state.last_alive_change
|
||||
};
|
||||
|
||||
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,
|
||||
..TargetState::default()
|
||||
};
|
||||
local_state.insert(name.clone(), new_state.clone());
|
||||
let success_message = if new_state.alive {
|
||||
"Success"
|
||||
} else {
|
||||
"Failure"
|
||||
};
|
||||
|
||||
let current_time: DateTime<Local> = SystemTime::now().into();
|
||||
|
||||
if did_change {
|
||||
self.log_entries.push(format!(
|
||||
"{} {} for {}",
|
||||
current_time.format("%Y-%m-%d %H:%M:%S:").to_string(),
|
||||
success_message,
|
||||
new_state.name.clone()
|
||||
));
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
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) {
|
||||
RatatuiMonitoringMode::render(frame, self)
|
||||
}
|
||||
|
||||
fn quit(&mut self) {
|
||||
self.running = false;
|
||||
}
|
||||
|
||||
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
|
||||
}
|
||||
}
|
||||
|
||||
/// Public Methods
|
||||
impl RatatuiApp {
|
||||
fn load_hosts_from_file(file_to_load_from: PathBuf) -> BTreeMap<String, TargetState> {
|
||||
let mut working = BTreeMap::new();
|
||||
|
||||
let the_file = File::open(file_to_load_from.clone());
|
||||
let mut rdr = csv::Reader::from_reader(the_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(),
|
||||
..TargetState::default()
|
||||
},
|
||||
);
|
||||
}
|
||||
|
||||
working
|
||||
}
|
||||
|
||||
pub fn new(option: Option<PathBuf>) -> Self {
|
||||
let mut working = Self::default();
|
||||
let targets = if let Some(file) = option {
|
||||
if file.exists() {
|
||||
working.filename = Some(file.as_os_str().to_string_lossy().parse().unwrap());
|
||||
} else {
|
||||
// working.log_event("Passed file doesnt exist looking for hosts.txt".to_string());
|
||||
if PathBuf::from_str("hosts.txt").unwrap().exists() {
|
||||
// working.log_event("Found hosts.txt. using it as the default".to_string());
|
||||
working.filename = Some("hosts.txt".to_string());
|
||||
} else {
|
||||
// working.log_event("Didnt find hosts.txt".to_string());
|
||||
working.filename = None;
|
||||
}
|
||||
}
|
||||
|
||||
if let Some(file) = working.filename.clone() {
|
||||
RatatuiApp::load_hosts_from_file(PathBuf::from_str(file.as_str()).unwrap())
|
||||
} else {
|
||||
RatatuiApp::get_default_targets()
|
||||
}
|
||||
} else {
|
||||
// none was passed for our parameter.
|
||||
working.filename = Some("hosts.txt".to_string());
|
||||
if let Some(ref hosts_file) = working.filename {
|
||||
if PathBuf::from_str(hosts_file).unwrap().exists() {
|
||||
RatatuiApp::load_hosts_from_file(
|
||||
PathBuf::from_str(&*hosts_file.clone()).unwrap(),
|
||||
)
|
||||
} else {
|
||||
working.filename = None;
|
||||
RatatuiApp::get_default_targets()
|
||||
}
|
||||
} else {
|
||||
RatatuiApp::get_default_targets()
|
||||
}
|
||||
};
|
||||
working.state = targets.clone();
|
||||
working.num_log_entries = LOG_ENTRIES_DEFAULT_COUNT;
|
||||
working
|
||||
}
|
||||
|
||||
pub fn set_screen(&mut self, new_screen: RatatuiScreens) {
|
||||
self.current_screen = new_screen
|
||||
}
|
||||
|
||||
pub fn set_running(&mut self, new_state: bool) {
|
||||
self.running = new_state
|
||||
}
|
||||
|
||||
pub fn clear_log(&mut self) {
|
||||
self.log_entries.clear();
|
||||
}
|
||||
pub fn log_event(&mut self, to_log: String) {
|
||||
self.log_entries.push(to_log);
|
||||
}
|
||||
|
||||
pub fn get_log_entries(&self, how_many: u32) -> Vec<String> {
|
||||
self.log_entries
|
||||
.iter()
|
||||
.rev()
|
||||
.take(how_many as usize)
|
||||
.cloned()
|
||||
.collect()
|
||||
}
|
||||
}
|
||||
9
src/tui/ratatui_screens.rs
Normal file
9
src/tui/ratatui_screens.rs
Normal file
@ -0,0 +1,9 @@
|
||||
|
||||
#[derive(Default)]
|
||||
pub enum RatatuiScreens {
|
||||
#[default]
|
||||
Monitoring,
|
||||
Editing,
|
||||
Deleting,
|
||||
Adding
|
||||
}
|
||||
@ -1,29 +0,0 @@
|
||||
use crate::target_state::TargetState;
|
||||
use ratatui::prelude::Buffer;
|
||||
use ratatui::prelude::Rect;
|
||||
use ratatui::style::Style;
|
||||
use ratatui::widgets::Widget;
|
||||
|
||||
#[derive(Default)]
|
||||
pub struct TargetDisplay {
|
||||
target: TargetState,
|
||||
}
|
||||
|
||||
impl TargetDisplay {
|
||||
pub fn new(state: TargetState) -> Self {
|
||||
let mut working = TargetDisplay::default();
|
||||
working.target = state;
|
||||
working
|
||||
}
|
||||
}
|
||||
|
||||
impl Widget for TargetDisplay {
|
||||
fn render(self, area: Rect, buf: &mut Buffer) {
|
||||
let row = format!(
|
||||
"{} -> {} / {} / {}",
|
||||
self.target.name, self.target.target, self.target.alive, self.target.last_rtt
|
||||
);
|
||||
|
||||
buf.set_string(area.x, area.y, row, Style::default());
|
||||
}
|
||||
}
|
||||
11
src/tui/target_state_widget.rs
Normal file
11
src/tui/target_state_widget.rs
Normal file
@ -0,0 +1,11 @@
|
||||
use ratatui::buffer::Cell;
|
||||
use ratatui::prelude::*;
|
||||
|
||||
pub struct TargetStateWidget;
|
||||
|
||||
impl Widget for TargetStateWidget {
|
||||
fn render(self, area: Rect, buf: &mut Buffer)
|
||||
{
|
||||
|
||||
}
|
||||
}
|
||||
Loading…
x
Reference in New Issue
Block a user