niko/oxkerclone
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

chore: linting pedantic

Browse Source
This commit is contained in:
Jack Wills
2022-08-04 12:56:45 +00:00
parent ca3315a69f
commit 1263662bd9
9 changed files with 144 additions and 148 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app_data/container_state.rs
+2 -2
View File
@@ -352,7 +352,7 @@ impl ContainerItem {
/// Find the max value in the last 30 items in the cpu stats vec /// Find the max value in the last 30 items in the cpu stats vec
fn max_cpu_stats(&self) -> CpuStats { fn max_cpu_stats(&self) -> CpuStats {
match self.cpu_stats.iter().max() { match self.cpu_stats.iter().max() {
Some(value) => value.to_owned(), Some(value) => value.clone(),
None => CpuStats::new(0.0), None => CpuStats::new(0.0),
} }
} }
@@ -360,7 +360,7 @@ impl ContainerItem {
/// Find the max value in the last 30 items in the mem stats vec /// Find the max value in the last 30 items in the mem stats vec
fn max_mem_stats(&self) -> ByteStats { fn max_mem_stats(&self) -> ByteStats {
match self.mem_stats.iter().max() { match self.mem_stats.iter().max() {
Some(value) => value.to_owned(), Some(value) => value.clone(),
None => ByteStats::new(0), None => ByteStats::new(0),
} }
} }
src/app_data/mod.rs
+32 -33
View File
@@ -71,7 +71,7 @@ impl AppData {
self.containers self.containers
.items .items
.iter() .iter()
.position(|i| Some(i.id.to_owned()) == id), .position(|i| Some(i.id.clone()) == id),
); );
} }
/// Generate a default app_state /// Generate a default app_state
@@ -89,7 +89,7 @@ impl AppData {
/// Current time as unix timestamp /// Current time as unix timestamp
#[allow(clippy::expect_used)] #[allow(clippy::expect_used)]
fn get_systemtime(&self) -> u64 { fn get_systemtime() -> u64 {
SystemTime::now() SystemTime::now()
.duration_since(UNIX_EPOCH) .duration_since(UNIX_EPOCH)
.expect("In our known reality, this error should never occur") .expect("In our known reality, this error should never occur")
@@ -107,7 +107,7 @@ impl AppData {
.selected() .selected()
{ {
output = output =
Some(self.containers.items[index].docker_controls.items[control_index].clone()) Some(self.containers.items[index].docker_controls.items[control_index].clone());
} }
} }
output output
@@ -116,28 +116,28 @@ impl AppData {
/// Change selected choice of docker commands of selected container /// Change selected choice of docker commands of selected container
pub fn docker_command_next(&mut self) { pub fn docker_command_next(&mut self) {
if let Some(index) = self.containers.state.selected() { if let Some(index) = self.containers.state.selected() {
self.containers.items[index].docker_controls.next() self.containers.items[index].docker_controls.next();
} }
} }
/// Change selected choice of docker commands of selected container /// Change selected choice of docker commands of selected container
pub fn docker_command_previous(&mut self) { pub fn docker_command_previous(&mut self) {
if let Some(index) = self.containers.state.selected() { if let Some(index) = self.containers.state.selected() {
self.containers.items[index].docker_controls.previous() self.containers.items[index].docker_controls.previous();
} }
} }
/// Change selected choice of docker commands of selected container /// Change selected choice of docker commands of selected container
pub fn docker_command_start(&mut self) { pub fn docker_command_start(&mut self) {
if let Some(index) = self.containers.state.selected() { if let Some(index) = self.containers.state.selected() {
self.containers.items[index].docker_controls.start() self.containers.items[index].docker_controls.start();
} }
} }
/// Change selected choice of docker commands of selected container /// Change selected choice of docker commands of selected container
pub fn docker_command_end(&mut self) { pub fn docker_command_end(&mut self) {
if let Some(index) = self.containers.state.selected() { if let Some(index) = self.containers.state.selected() {
self.containers.items[index].docker_controls.end() self.containers.items[index].docker_controls.end();
} }
} }
@@ -168,9 +168,9 @@ impl AppData {
.iter() .iter()
.skip(index) .skip(index)
.take(1) .take(1)
.map(|i| i.id.to_owned()) .map(|i| i.id.clone())
.collect::<String>(); .collect::<String>();
output = Some(id) output = Some(id);
} }
output output
} }
@@ -226,7 +226,7 @@ impl AppData {
Header::Image => match so { Header::Image => match so {
SortedOrder::Asc => self.containers.items.sort_by(|a, b| a.image.cmp(&b.image)), SortedOrder::Asc => self.containers.items.sort_by(|a, b| a.image.cmp(&b.image)),
SortedOrder::Desc => { SortedOrder::Desc => {
self.containers.items.sort_by(|a, b| b.image.cmp(&a.image)) self.containers.items.sort_by(|a, b| b.image.cmp(&a.image));
} }
}, },
Header::Name => match so { Header::Name => match so {
@@ -269,28 +269,28 @@ impl AppData {
/// select next selected log line /// select next selected log line
pub fn log_next(&mut self) { pub fn log_next(&mut self) {
if let Some(index) = self.get_selected_log_index() { if let Some(index) = self.get_selected_log_index() {
self.containers.items[index].logs.next() self.containers.items[index].logs.next();
} }
} }
/// select previous selected log line /// select previous selected log line
pub fn log_previous(&mut self) { pub fn log_previous(&mut self) {
if let Some(index) = self.get_selected_log_index() { if let Some(index) = self.get_selected_log_index() {
self.containers.items[index].logs.previous() self.containers.items[index].logs.previous();
} }
} }
/// select last selected log line /// select last selected log line
pub fn log_end(&mut self) { pub fn log_end(&mut self) {
if let Some(index) = self.get_selected_log_index() { if let Some(index) = self.get_selected_log_index() {
self.containers.items[index].logs.end() self.containers.items[index].logs.end();
} }
} }
/// select first selected log line /// select first selected log line
pub fn log_start(&mut self) { pub fn log_start(&mut self) {
if let Some(index) = self.get_selected_log_index() { if let Some(index) = self.get_selected_log_index() {
self.containers.items[index].logs.start() self.containers.items[index].logs.start();
} }
} }
@@ -316,7 +316,7 @@ impl AppData {
let mut output = Columns::new(); let mut output = Columns::new();
let count = |x: &String| x.chars().count(); let count = |x: &String| x.chars().count();
for container in self.containers.items.iter() { for container in &self.containers.items {
let cpu_count = count( let cpu_count = count(
&container &container
.cpu_stats .cpu_stats
@@ -370,7 +370,7 @@ impl AppData {
self.containers self.containers
.items .items
.iter() .iter()
.map(|i| i.id.to_owned()) .map(|i| i.id.clone())
.collect::<Vec<_>>() .collect::<Vec<_>>()
} }
@@ -382,14 +382,14 @@ impl AppData {
/// Update container mem, cpu, & network stats, in single function so only need to call .lock() once /// Update container mem, cpu, & network stats, in single function so only need to call .lock() once
pub fn update_stats( pub fn update_stats(
&mut self, &mut self,
id: String, id: &str,
cpu_stat: Option<f64>, cpu_stat: Option<f64>,
mem_stat: Option<u64>, mem_stat: Option<u64>,
mem_limit: u64, mem_limit: u64,
rx: u64, rx: u64,
tx: u64, tx: u64,
) { ) {
if let Some(container) = self.get_container_by_id(&id) { if let Some(container) = self.get_container_by_id(id) {
if container.cpu_stats.len() >= 60 { if container.cpu_stats.len() >= 60 {
container.cpu_stats.pop_front(); container.cpu_stats.pop_front();
} }
@@ -444,7 +444,7 @@ impl AppData {
.unwrap_or(&vec!["".to_owned()]) .unwrap_or(&vec!["".to_owned()])
.get(0) .get(0)
.unwrap_or(&String::from("")) .unwrap_or(&String::from(""))
.to_owned(); .clone();
if let Some(c) = name.chars().next() { if let Some(c) = name.chars().next() {
if c == '/' { if c == '/' {
name.remove(0); name.remove(0);
@@ -461,10 +461,10 @@ impl AppData {
let image = i.image.as_ref().unwrap_or(&"".to_owned()).trim().to_owned(); let image = i.image.as_ref().unwrap_or(&"".to_owned()).trim().to_owned();
if let Some(current_container) = self.get_container_by_id(id) { if let Some(current_container) = self.get_container_by_id(id) {
if current_container.name != name { if current_container.name != name {
current_container.name = name current_container.name = name;
}; };
if current_container.status != status { if current_container.status != status {
current_container.status = status current_container.status = status;
}; };
if current_container.state != state { if current_container.state != state {
current_container.docker_controls.items = DockerControls::gen_vec(&state); current_container.docker_controls.items = DockerControls::gen_vec(&state);
@@ -472,18 +472,17 @@ impl AppData {
// Update the list state, needs to be None if the gen_vec returns an empty vec // Update the list state, needs to be None if the gen_vec returns an empty vec
match state { match state {
State::Removing | State::Restarting | State::Unknown => { State::Removing | State::Restarting | State::Unknown => {
current_container.docker_controls.state.select(None) current_container.docker_controls.state.select(None);
} }
_ => current_container.docker_controls.start(), _ => current_container.docker_controls.start(),
}; };
current_container.state = state; current_container.state = state;
}; };
if current_container.image != image { if current_container.image != image {
current_container.image = image current_container.image = image;
}; };
} else { } else {
let mut container = let mut container = ContainerItem::new(id.clone(), status, image, state, name);
ContainerItem::new(id.to_owned(), status, image, state, name);
container.logs.end(); container.logs.end();
self.containers.items.push(container); self.containers.items.push(container);
} }
@@ -492,25 +491,25 @@ impl AppData {
} }
/// update logs of a given container, based on id /// update logs of a given container, based on id
pub fn update_log_by_id(&mut self, output: Vec<String>, id: String) { pub fn update_log_by_id(&mut self, output: &[String], id: &str) {
let tz = self.get_systemtime(); let tz = Self::get_systemtime();
let color = self.args.color; let color = self.args.color;
let raw = self.args.raw; let raw = self.args.raw;
if let Some(container) = self.get_container_by_id(&id) { if let Some(container) = self.get_container_by_id(id) {
container.last_updated = tz; container.last_updated = tz;
let current_len = container.logs.items.len(); let current_len = container.logs.items.len();
output.iter().for_each(|i| { for i in output.iter() {
let lines = if color { let lines = if color {
log_sanitizer::colorize_logs(i.to_owned()) log_sanitizer::colorize_logs(i)
} else if raw { } else if raw {
log_sanitizer::raw(i.to_owned()) log_sanitizer::raw(i.clone())
} else { } else {
log_sanitizer::remove_ansi(i.to_owned()) log_sanitizer::remove_ansi(i)
}; };
container.logs.items.push(ListItem::new(lines)); container.logs.items.push(ListItem::new(lines));
}); }
if container.logs.state.selected().is_none() if container.logs.state.selected().is_none()
|| container.logs.state.selected().unwrap_or_default() + 1 == current_len || container.logs.state.selected().unwrap_or_default() + 1 == current_len
src/docker_data/mod.rs
+29 -31
View File
@@ -103,7 +103,7 @@ impl DockerData {
let mem_limit = stats.memory_stats.limit.unwrap_or(0); let mem_limit = stats.memory_stats.limit.unwrap_or(0);
let some_key = if let Some(networks) = &stats.networks { let some_key = if let Some(networks) = &stats.networks {
networks.keys().next().map(|x| x.to_owned()) networks.keys().next().cloned()
} else { } else {
None None
}; };
@@ -122,7 +122,7 @@ impl DockerData {
if is_running { if is_running {
app_data.lock().update_stats( app_data.lock().update_stats(
id.clone(), &id,
Some(cpu_stats), Some(cpu_stats),
Some(mem_stat), Some(mem_stat),
mem_limit, mem_limit,
@@ -132,10 +132,9 @@ impl DockerData {
} else { } else {
app_data app_data
.lock() .lock()
.update_stats(id.clone(), None, None, mem_limit, rx, tx); .update_stats(&id, None, None, mem_limit, rx, tx);
} }
let key = SpawnId::Stats(id.to_owned()); spawns.lock().remove(&SpawnId::Stats(id.clone()));
spawns.lock().remove(&key);
} }
} }
@@ -146,13 +145,13 @@ impl DockerData {
let app_data = Arc::clone(&self.app_data); let app_data = Arc::clone(&self.app_data);
let spawns = Arc::clone(&self.spawns); let spawns = Arc::clone(&self.spawns);
let is_running = *is_running; let is_running = *is_running;
let id = id.to_owned(); let id = id.clone();
let key = SpawnId::Stats(id.to_owned()); let key = SpawnId::Stats(id.clone());
let spawn_contains_id = spawns.lock().contains_key(&key); let spawn_contains_id = spawns.lock().contains_key(&key);
let s = tokio::spawn(Self::update_container_stat( let s = tokio::spawn(Self::update_container_stat(
docker, docker,
id.to_owned(), id.clone(),
app_data, app_data,
is_running, is_running,
spawns, spawns,
@@ -180,7 +179,7 @@ impl DockerData {
containers containers
.iter() .iter()
.filter(|i| i.id.is_some()) .filter(|i| i.id.is_some())
.for_each(|c| output.push(c.to_owned())); .for_each(|c| output.push(c.clone()));
self.app_data.lock().update_containers(&output); self.app_data.lock().update_containers(&output);
@@ -193,7 +192,7 @@ impl DockerData {
i.id.as_ref().map(|id| { i.id.as_ref().map(|id| {
( (
i.state.as_ref().unwrap_or(&String::new()) == "running", i.state.as_ref().unwrap_or(&String::new()) == "running",
id.to_owned(), id.clone(),
) )
}) })
}) })
@@ -230,9 +229,8 @@ impl DockerData {
} }
} }
} }
let key = SpawnId::Log(id.to_owned()); spawns.lock().remove(&SpawnId::Log(id.clone()));
spawns.lock().remove(&key); app_data.lock().update_log_by_id(&output, &id);
app_data.lock().update_log_by_id(output, id.to_owned());
} }
/// Update all logs, spawn each container into own tokio::spawn thread /// Update all logs, spawn each container into own tokio::spawn thread
@@ -240,10 +238,10 @@ impl DockerData {
for (_, id) in all_ids.iter() { for (_, id) in all_ids.iter() {
let docker = Arc::clone(&self.docker); let docker = Arc::clone(&self.docker);
let timestamps = self.timestamps; let timestamps = self.timestamps;
let id = id.to_owned(); let id = id.clone();
let app_data = Arc::clone(&self.app_data); let app_data = Arc::clone(&self.app_data);
let spawns = Arc::clone(&self.spawns); let spawns = Arc::clone(&self.spawns);
let key = SpawnId::Log(id.to_owned()); let key = SpawnId::Log(id.clone());
let s = tokio::spawn(Self::update_log( let s = tokio::spawn(Self::update_log(
docker, id, timestamps, 0, app_data, spawns, docker, id, timestamps, 0, app_data, spawns,
)); ));
@@ -256,9 +254,9 @@ impl DockerData {
let all_ids = self.update_all_containers().await; let all_ids = self.update_all_containers().await;
let optional_index = self.app_data.lock().get_selected_log_index(); let optional_index = self.app_data.lock().get_selected_log_index();
if let Some(index) = optional_index { if let Some(index) = optional_index {
let id = self.app_data.lock().containers.items[index].id.to_owned(); let id = self.app_data.lock().containers.items[index].id.clone();
let key = SpawnId::Log(id.to_owned()); let key = SpawnId::Log(id.clone());
let running = self.spawns.lock().contains_key(&key); let running = self.spawns.lock().contains_key(&key);
if !running { if !running {
@@ -290,7 +288,7 @@ impl DockerData {
} }
/// Stop the loading_spin function, and reset gui loading status /// Stop the loading_spin function, and reset gui loading status
fn stop_loading_spin(&mut self, handle: JoinHandle<()>) { fn stop_loading_spin(&mut self, handle: &JoinHandle<()>) {
handle.abort(); handle.abort();
self.gui_state.lock().reset_loading(); self.gui_state.lock().reset_loading();
} }
@@ -315,7 +313,7 @@ impl DockerData {
self.initialised = self.app_data.lock().initialised(&all_ids); self.initialised = self.app_data.lock().initialised(&all_ids);
} }
self.app_data.lock().init = true; self.app_data.lock().init = true;
self.stop_loading_spin(loading_spin); self.stop_loading_spin(&loading_spin);
} }
/// Handle incoming messages, container controls & all container information update /// Handle incoming messages, container controls & all container information update
@@ -329,9 +327,9 @@ impl DockerData {
docker.pause_container(&id).await.unwrap_or_else(|_| { docker.pause_container(&id).await.unwrap_or_else(|_| {
app_data app_data
.lock() .lock()
.set_error(AppError::DockerCommand(DockerControls::Pause)) .set_error(AppError::DockerCommand(DockerControls::Pause));
}); });
self.stop_loading_spin(loading_spin); self.stop_loading_spin(&loading_spin);
} }
DockerMessage::Restart(id) => { DockerMessage::Restart(id) => {
let loading_spin = self.loading_spin().await; let loading_spin = self.loading_spin().await;
@@ -341,9 +339,9 @@ impl DockerData {
.unwrap_or_else(|_| { .unwrap_or_else(|_| {
app_data app_data
.lock() .lock()
.set_error(AppError::DockerCommand(DockerControls::Restart)) .set_error(AppError::DockerCommand(DockerControls::Restart));
}); });
self.stop_loading_spin(loading_spin); self.stop_loading_spin(&loading_spin);
} }
DockerMessage::Start(id) => { DockerMessage::Start(id) => {
let loading_spin = self.loading_spin().await; let loading_spin = self.loading_spin().await;
@@ -353,28 +351,28 @@ impl DockerData {
.unwrap_or_else(|_| { .unwrap_or_else(|_| {
app_data app_data
.lock() .lock()
.set_error(AppError::DockerCommand(DockerControls::Start)) .set_error(AppError::DockerCommand(DockerControls::Start));
}); });
self.stop_loading_spin(loading_spin); self.stop_loading_spin(&loading_spin);
} }
DockerMessage::Stop(id) => { DockerMessage::Stop(id) => {
let loading_spin = self.loading_spin().await; let loading_spin = self.loading_spin().await;
docker.stop_container(&id, None).await.unwrap_or_else(|_| { docker.stop_container(&id, None).await.unwrap_or_else(|_| {
app_data app_data
.lock() .lock()
.set_error(AppError::DockerCommand(DockerControls::Stop)) .set_error(AppError::DockerCommand(DockerControls::Stop));
}); });
self.stop_loading_spin(loading_spin); self.stop_loading_spin(&loading_spin);
} }
DockerMessage::Unpause(id) => { DockerMessage::Unpause(id) => {
let loading_spin = self.loading_spin().await; let loading_spin = self.loading_spin().await;
docker.unpause_container(&id).await.unwrap_or_else(|_| { docker.unpause_container(&id).await.unwrap_or_else(|_| {
app_data app_data
.lock() .lock()
.set_error(AppError::DockerCommand(DockerControls::Unpause)) .set_error(AppError::DockerCommand(DockerControls::Unpause));
}); });
self.stop_loading_spin(loading_spin); self.stop_loading_spin(&loading_spin);
self.update_everything().await self.update_everything().await;
} }
DockerMessage::Update => self.update_everything().await, DockerMessage::Update => self.update_everything().await,
DockerMessage::Quit => { DockerMessage::Quit => {
@@ -382,7 +380,7 @@ impl DockerData {
.lock() .lock()
.values() .values()
.into_iter() .into_iter()
.for_each(|i| i.abort()); .for_each(tokio::task::JoinHandle::abort);
self.is_running.store(false, Ordering::SeqCst); self.is_running.store(false, Ordering::SeqCst);
} }
} }
src/input_handler/mod.rs
+6 -6
View File
@@ -110,7 +110,7 @@ impl InputHandler {
// Show the info box - with "mouse capture enabled / disabled", for 4000 ms // Show the info box - with "mouse capture enabled / disabled", for 4000 ms
self.info_sleep = Some(tokio::spawn(async move { self.info_sleep = Some(tokio::spawn(async move {
tokio::time::sleep(std::time::Duration::from_millis(4000)).await; tokio::time::sleep(std::time::Duration::from_millis(4000)).await;
gui_state.lock().reset_info_box() gui_state.lock().reset_info_box();
})); }));
self.mouse_capture = !self.mouse_capture; self.mouse_capture = !self.mouse_capture;
@@ -118,14 +118,14 @@ impl InputHandler {
/// Sort containers based on a given header, switch asc to desc if already sorted, else always desc /// Sort containers based on a given header, switch asc to desc if already sorted, else always desc
fn sort(&self, header: Header) { fn sort(&self, header: Header) {
let mut output = Some((header.to_owned(), SortedOrder::Desc)); let mut output = Some((header.clone(), SortedOrder::Desc));
let mut locked_data = self.app_data.lock(); let mut locked_data = self.app_data.lock();
if let Some((h, order)) = locked_data.get_sorted().as_ref() { if let Some((h, order)) = locked_data.get_sorted().as_ref() {
if &SortedOrder::Desc == order && h == &header { if &SortedOrder::Desc == order && h == &header {
output = Some((header, SortedOrder::Asc)) output = Some((header, SortedOrder::Asc));
} }
} }
locked_data.set_sorted(output) locked_data.set_sorted(output);
} }
/// Send a quit message to docker, to abort all spawns, if error, quit here instead /// Send a quit message to docker, to abort all spawns, if error, quit here instead
@@ -219,13 +219,13 @@ impl InputHandler {
KeyCode::Up | KeyCode::Char('k') => self.previous(), KeyCode::Up | KeyCode::Char('k') => self.previous(),
KeyCode::PageUp => { KeyCode::PageUp => {
for _ in 0..=6 { for _ in 0..=6 {
self.previous() self.previous();
} }
} }
KeyCode::Down | KeyCode::Char('j') => self.next(), KeyCode::Down | KeyCode::Char('j') => self.next(),
KeyCode::PageDown => { KeyCode::PageDown => {
for _ in 0..=6 { for _ in 0..=6 {
self.next() self.next();
} }
} }
KeyCode::Enter => { KeyCode::Enter => {
src/main.rs
+10 -10
View File
@@ -1,9 +1,9 @@
#![forbid(unsafe_code)] #![forbid(unsafe_code)]
#![warn(clippy::unused_async, clippy::unwrap_used, clippy::expect_used)] #![warn(clippy::unused_async, clippy::unwrap_used, clippy::expect_used)]
// Wanring - These are indeed pedantic // Wanring - These are indeed pedantic
// #![warn(clippy::pedantic)] #![warn(clippy::pedantic)]
// #![warn(clippy::nursery)] // #![warn(clippy::nursery)]
// #![allow(clippy::module_name_repetitions, clippy::doc_markdown)] #![allow(clippy::module_name_repetitions, clippy::doc_markdown)]
// Only allow when debugging // Only allow when debugging
// #![allow(unused)] // #![allow(unused)]
@@ -85,13 +85,8 @@ async fn main() {
)); ));
// Debug mode for testing, mostly pointless, doesn't take terminal nor draw gui // Debug mode for testing, mostly pointless, doesn't take terminal nor draw gui
if !args.gui { if args.gui {
loop { let update_duration = std::time::Duration::from_millis(u64::from(args.docker_interval));
info!("in debug mode");
tokio::time::sleep(std::time::Duration::from_millis(5000)).await;
}
} else {
let update_duration = std::time::Duration::from_millis(args.docker_interval as u64);
create_ui( create_ui(
app_data, app_data,
input_sx, input_sx,
@@ -101,6 +96,11 @@ async fn main() {
update_duration, update_duration,
) )
.await .await
.unwrap_or(()) .unwrap_or(());
} else {
loop {
info!("in debug mode");
tokio::time::sleep(std::time::Duration::from_millis(5000)).await;
}
} }
} }
src/ui/color_match.rs
+7 -9
View File
@@ -7,9 +7,9 @@ pub mod log_sanitizer {
}; };
/// Attempt to colorize the given string to tui-rs standars /// Attempt to colorize the given string to tui-rs standars
pub fn colorize_logs(input: String) -> Vec<Spans<'static>> { pub fn colorize_logs(input: &str) -> Vec<Spans<'static>> {
vec![Spans::from( vec![Spans::from(
categorise_text(&input) categorise_text(input)
.into_iter() .into_iter()
.map(|i| { .map(|i| {
let fg_color = color_ansi_to_tui(i.fg.unwrap_or(CansiColor::White)); let fg_color = color_ansi_to_tui(i.fg.unwrap_or(CansiColor::White));
@@ -40,10 +40,10 @@ pub mod log_sanitizer {
} }
/// Remove all ansi formatting from a given string and create tui-rs spans /// Remove all ansi formatting from a given string and create tui-rs spans
pub fn remove_ansi(input: String) -> Vec<Spans<'static>> { pub fn remove_ansi(input: &str) -> Vec<Spans<'static>> {
let mut output = String::from(""); let mut output = String::from("");
for i in categorise_text(&input) { for i in categorise_text(input) {
output.push_str(i.text) output.push_str(i.text);
} }
raw(output) raw(output)
} }
@@ -56,22 +56,20 @@ pub mod log_sanitizer {
/// Change from ansi to tui colors /// Change from ansi to tui colors
fn color_ansi_to_tui(color: CansiColor) -> Color { fn color_ansi_to_tui(color: CansiColor) -> Color {
match color { match color {
CansiColor::Black => Color::Black, CansiColor::Black | CansiColor::BrightBlack => Color::Black,
CansiColor::Red => Color::Red, CansiColor::Red => Color::Red,
CansiColor::Green => Color::Green, CansiColor::Green => Color::Green,
CansiColor::Yellow => Color::Yellow, CansiColor::Yellow => Color::Yellow,
CansiColor::Blue => Color::Blue, CansiColor::Blue => Color::Blue,
CansiColor::Magenta => Color::Magenta, CansiColor::Magenta => Color::Magenta,
CansiColor::Cyan => Color::Cyan, CansiColor::Cyan => Color::Cyan,
CansiColor::White => Color::White, CansiColor::White | CansiColor::BrightWhite => Color::White,
CansiColor::BrightBlack => Color::Black,
CansiColor::BrightRed => Color::LightRed, CansiColor::BrightRed => Color::LightRed,
CansiColor::BrightGreen => Color::LightGreen, CansiColor::BrightGreen => Color::LightGreen,
CansiColor::BrightYellow => Color::LightYellow, CansiColor::BrightYellow => Color::LightYellow,
CansiColor::BrightBlue => Color::LightBlue, CansiColor::BrightBlue => Color::LightBlue,
CansiColor::BrightMagenta => Color::LightMagenta, CansiColor::BrightMagenta => Color::LightMagenta,
CansiColor::BrightCyan => Color::LightCyan, CansiColor::BrightCyan => Color::LightCyan,
CansiColor::BrightWhite => Color::White,
} }
} }
} }
src/ui/draw_blocks.rs
+40 -38
View File
@@ -64,7 +64,7 @@ fn generate_block<'a>(
SelectablePanel::Logs => { SelectablePanel::Logs => {
format!(" {} {} ", panel.title(), app_data.lock().get_log_title()) format!(" {} {} ", panel.title(), app_data.lock().get_log_title())
} }
_ => String::from(""), SelectablePanel::Commands => String::from(""),
}; };
block = block.title(title); block = block.title(title);
if current_selected_panel == panel { if current_selected_panel == panel {
@@ -74,7 +74,7 @@ fn generate_block<'a>(
} }
/// Draw the command panel /// Draw the command panel
pub fn draw_commands<B: Backend>( pub fn commands<B: Backend>(
app_data: &Arc<Mutex<AppData>>, app_data: &Arc<Mutex<AppData>>,
area: Rect, area: Rect,
f: &mut Frame<'_, B>, f: &mut Frame<'_, B>,
@@ -111,12 +111,12 @@ pub fn draw_commands<B: Backend>(
let paragraph = Paragraph::new(debug_text) let paragraph = Paragraph::new(debug_text)
.block(block) .block(block)
.alignment(Alignment::Center); .alignment(Alignment::Center);
f.render_widget(paragraph, area) f.render_widget(paragraph, area);
} }
} }
/// Draw the containers panel /// Draw the containers panel
pub fn draw_containers<B: Backend>( pub fn containers<B: Backend>(
app_data: &Arc<Mutex<AppData>>, app_data: &Arc<Mutex<AppData>>,
area: Rect, area: Rect,
f: &mut Frame<'_, B>, f: &mut Frame<'_, B>,
@@ -196,7 +196,7 @@ pub fn draw_containers<B: Backend>(
let paragraph = Paragraph::new(debug_text) let paragraph = Paragraph::new(debug_text)
.block(block) .block(block)
.alignment(Alignment::Center); .alignment(Alignment::Center);
f.render_widget(paragraph, area) f.render_widget(paragraph, area);
} else { } else {
let items = List::new(items) let items = List::new(items)
.block(block) .block(block)
@@ -208,13 +208,13 @@ pub fn draw_containers<B: Backend>(
} }
/// Draw the logs panel /// Draw the logs panel
pub fn draw_logs<B: Backend>( pub fn logs<B: Backend>(
app_data: &Arc<Mutex<AppData>>, app_data: &Arc<Mutex<AppData>>,
area: Rect, area: Rect,
f: &mut Frame<'_, B>, f: &mut Frame<'_, B>,
gui_state: &Arc<Mutex<GuiState>>, gui_state: &Arc<Mutex<GuiState>>,
index: Option<usize>, index: Option<usize>,
loading_icon: String, loading_icon: &str,
) { ) {
let block = generate_block(app_data, area, gui_state, SelectablePanel::Logs); let block = generate_block(app_data, area, gui_state, SelectablePanel::Logs);
@@ -225,14 +225,14 @@ pub fn draw_logs<B: Backend>(
.style(Style::default()) .style(Style::default())
.block(block) .block(block)
.alignment(Alignment::Center); .alignment(Alignment::Center);
f.render_widget(paragraph, area) f.render_widget(paragraph, area);
} else if let Some(index) = index { } else if let Some(index) = index {
let items = app_data.lock().containers.items[index] let items = app_data.lock().containers.items[index]
.logs .logs
.items .items
.iter() .iter()
.enumerate() .enumerate()
.map(|i| i.1.to_owned()) .map(|i| i.1.clone())
.collect::<Vec<_>>(); .collect::<Vec<_>>();
let items = List::new(items) let items = List::new(items)
@@ -249,12 +249,12 @@ pub fn draw_logs<B: Backend>(
let paragraph = Paragraph::new(debug_text) let paragraph = Paragraph::new(debug_text)
.block(block) .block(block)
.alignment(Alignment::Center); .alignment(Alignment::Center);
f.render_widget(paragraph, area) f.render_widget(paragraph, area);
} }
} }
/// Draw the cpu + mem charts /// Draw the cpu + mem charts
pub fn draw_chart<B: Backend>( pub fn chart<B: Backend>(
f: &mut Frame<'_, B>, f: &mut Frame<'_, B>,
area: Rect, area: Rect,
app_data: &Arc<Mutex<AppData>>, app_data: &Arc<Mutex<AppData>>,
@@ -279,19 +279,21 @@ pub fn draw_chart<B: Backend>(
.style(Style::default().fg(Color::Cyan)) .style(Style::default().fg(Color::Cyan))
.graph_type(GraphType::Line) .graph_type(GraphType::Line)
.data(&mem.0)]; .data(&mem.0)];
let cpu_stats = CpuStats::new(cpu.0.last().unwrap_or(&(0.00, 0.00)).1);
let mem_stats = ByteStats::new(mem.0.last().unwrap_or(&(0.0, 0.0)).1 as u64);
let cpu_chart = make_chart( let cpu_chart = make_chart(
cpu.2, &cpu.2,
String::from("cpu"), "cpu",
cpu_dataset, cpu_dataset,
CpuStats::new(cpu.0.last().unwrap_or(&(0.00, 0.00)).1), &cpu_stats,
cpu.1, &cpu.1,
); );
let mem_chart = make_chart( let mem_chart = make_chart(
mem.2, &mem.2,
String::from("memory"), "memory",
mem_dataset, mem_dataset,
ByteStats::new(mem.0.last().unwrap_or(&(0.0, 0.0)).1 as u64), &mem_stats,
mem.1, &mem.1,
); );
f.render_widget(cpu_chart, area[0]); f.render_widget(cpu_chart, area[0]);
@@ -301,13 +303,13 @@ pub fn draw_chart<B: Backend>(
} }
/// Create charts /// Create charts
fn make_chart<T: Stats + Display>( fn make_chart<'a, T: Stats + Display>(
state: State, state: &State,
name: String, name: &'a str,
dataset: Vec<Dataset>, dataset: Vec<Dataset<'a>>,
current: T, current: &'a T,
max: T, max: &'a T,
) -> Chart { ) -> Chart<'a> {
let title_color = match state { let title_color = match state {
State::Running => Color::Green, State::Running => Color::Green,
_ => state.get_color(), _ => state.get_color(),
@@ -351,13 +353,13 @@ fn make_chart<T: Stats + Display>(
} }
/// Draw heading bar at top of program, always visible /// Draw heading bar at top of program, always visible
pub fn draw_heading_bar<B: Backend>( pub fn heading_bar<B: Backend>(
area: Rect, area: Rect,
columns: &Columns, columns: &Columns,
f: &mut Frame<'_, B>, f: &mut Frame<'_, B>,
has_containers: bool, has_containers: bool,
loading_icon: String, loading_icon: &str,
sorted_by: Option<(Header, SortedOrder)>, sorted_by: &Option<(Header, SortedOrder)>,
gui_state: &Arc<Mutex<GuiState>>, gui_state: &Arc<Mutex<GuiState>>,
) { ) {
let block = || Block::default().style(Style::default().bg(Color::Magenta).fg(Color::Black)); let block = || Block::default().style(Style::default().bg(Color::Magenta).fg(Color::Black));
@@ -377,7 +379,7 @@ pub fn draw_heading_bar<B: Backend>(
SortedOrder::Desc => suffix = " ⌄", SortedOrder::Desc => suffix = " ⌄",
} }
suffix_margin = 2; suffix_margin = 2;
color = Color::White color = Color::White;
}; };
}; };
( (
@@ -441,7 +443,7 @@ pub fn draw_heading_bar<B: Backend>(
let header_block = gen_header(&i.0, i.1); let header_block = gen_header(&i.0, i.1);
( (
header_block.0, header_block.0,
i.0.to_owned(), i.0.clone(),
Constraint::Max(header_block.1), Constraint::Max(header_block.1),
) )
}) })
@@ -500,7 +502,7 @@ fn max_line_width(text: &str) -> usize {
} }
/// Draw the help box in the centre of the screen /// Draw the help box in the centre of the screen
pub fn draw_help_box<B: Backend>(f: &mut Frame<'_, B>) { pub fn help_box<B: Backend>(f: &mut Frame<'_, B>) {
let title = format!(" {} ", VERSION); let title = format!(" {} ", VERSION);
let description_text = format!("\n{}", DESCRIPTION); let description_text = format!("\n{}", DESCRIPTION);
@@ -550,7 +552,7 @@ pub fn draw_help_box<B: Backend>(f: &mut Frame<'_, B>) {
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded)
.border_style(Style::default().fg(Color::Black)); .border_style(Style::default().fg(Color::Black));
let area = draw_popup( let area = popup(
lines as u16, lines as u16,
max_line_width as u16, max_line_width as u16,
f.size(), f.size(),
@@ -578,7 +580,7 @@ pub fn draw_help_box<B: Backend>(f: &mut Frame<'_, B>) {
} }
/// Draw an error popup over whole screen /// Draw an error popup over whole screen
pub fn draw_error<B: Backend>(f: &mut Frame<'_, B>, error: AppError, seconds: Option<u8>) { pub fn error<B: Backend>(f: &mut Frame<'_, B>, error: &AppError, seconds: Option<u8>) {
let block = Block::default() let block = Block::default()
.title(" Error ") .title(" Error ")
.border_type(BorderType::Rounded) .border_type(BorderType::Rounded)
@@ -614,7 +616,7 @@ pub fn draw_error<B: Backend>(f: &mut Frame<'_, B>, error: AppError, seconds: Op
.block(block) .block(block)
.alignment(Alignment::Center); .alignment(Alignment::Center);
let area = draw_popup( let area = popup(
lines as u16, lines as u16,
max_line_width as u16, max_line_width as u16,
f.size(), f.size(),
@@ -625,7 +627,7 @@ pub fn draw_error<B: Backend>(f: &mut Frame<'_, B>, error: AppError, seconds: Op
} }
/// Draw info box in one of the 9 BoxLocations /// Draw info box in one of the 9 BoxLocations
pub fn draw_info<B: Backend>(f: &mut Frame<'_, B>, text: String) { pub fn info<B: Backend>(f: &mut Frame<'_, B>, text: String) {
let block = Block::default() let block = Block::default()
.title("") .title("")
.title_alignment(Alignment::Center) .title_alignment(Alignment::Center)
@@ -643,7 +645,7 @@ pub fn draw_info<B: Backend>(f: &mut Frame<'_, B>, text: String) {
.block(block) .block(block)
.alignment(Alignment::Center); .alignment(Alignment::Center);
let area = draw_popup( let area = popup(
lines as u16, lines as u16,
max_line_width as u16, max_line_width as u16,
f.size(), f.size(),
@@ -654,7 +656,7 @@ pub fn draw_info<B: Backend>(f: &mut Frame<'_, B>, text: String) {
} }
/// draw a box in the one of the BoxLocations, based on max line width + number of lines /// draw a box in the one of the BoxLocations, based on max line width + number of lines
fn draw_popup(text_lines: u16, text_width: u16, r: Rect, box_location: BoxLocation) -> Rect { fn popup(text_lines: u16, text_width: u16, r: Rect, box_location: BoxLocation) -> Rect {
// Make sure blank_space can't be an negative, as will crash // Make sure blank_space can't be an negative, as will crash
let blank_vertical = if r.height > text_lines { let blank_vertical = if r.height > text_lines {
(r.height - text_lines) / 2 (r.height - text_lines) / 2
src/ui/gui_state.rs
+5 -5
View File
@@ -30,7 +30,7 @@ pub enum BoxLocation {
} }
impl BoxLocation { impl BoxLocation {
pub fn get_indexes(&self) -> (usize, usize) { pub fn get_indexes(self) -> (usize, usize) {
match self { match self {
Self::TopLeft => (0, 0), Self::TopLeft => (0, 0),
Self::TopCentre => (0, 1), Self::TopCentre => (0, 1),
@@ -46,7 +46,7 @@ impl BoxLocation {
// Should combine and just return a tuple? // Should combine and just return a tuple?
pub fn get_horizontal_constraints( pub fn get_horizontal_constraints(
&self, self,
blank_vertical: u16, blank_vertical: u16,
text_width: u16, text_width: u16,
) -> [Constraint; 3] { ) -> [Constraint; 3] {
@@ -69,7 +69,7 @@ impl BoxLocation {
} }
} }
pub fn get_vertical_constraints( pub fn get_vertical_constraints(
&self, self,
blank_vertical: u16, blank_vertical: u16,
number_lines: u16, number_lines: u16,
) -> [Constraint; 3] { ) -> [Constraint; 3] {
@@ -147,7 +147,7 @@ impl SelectablePanel {
match self { match self {
Self::Containers => "Containers", Self::Containers => "Containers",
Self::Logs => "Logs", Self::Logs => "Logs",
_ => "", Self::Commands => "",
} }
} }
pub fn next(self) -> Self { pub fn next(self) -> Self {
@@ -221,7 +221,7 @@ impl GuiState {
.filter(|i| i.1.intersects(rect)) .filter(|i| i.1.intersects(rect))
.collect::<Vec<_>>() .collect::<Vec<_>>()
.get(0) .get(0)
.map(|data| data.0.to_owned()) .map(|data| data.0.clone())
} }
/// Insert, or updatem header area panel into heading_map /// Insert, or updatem header area panel into heading_map
src/ui/mod.rs
+13 -14
View File
@@ -30,7 +30,6 @@ use crate::{
app_data::AppData, app_error::AppError, docker_data::DockerMessage, app_data::AppData, app_error::AppError, docker_data::DockerMessage,
input_handler::InputMessages, input_handler::InputMessages,
}; };
use draw_blocks::*;
/// Take control of the terminal in order to draw gui /// Take control of the terminal in order to draw gui
pub async fn create_ui( pub async fn create_ui(
@@ -95,7 +94,7 @@ async fn run_app<B: Backend>(
break; break;
} }
if terminal if terminal
.draw(|f| draw_error(f, AppError::DockerConnect, Some(seconds))) .draw(|f| draw_blocks::error(f, &AppError::DockerConnect, Some(seconds)))
.is_err() .is_err()
{ {
return Err(AppError::Terminal); return Err(AppError::Terminal);
@@ -152,7 +151,7 @@ fn ui<B: Backend>(
if height < 12 { if height < 12 {
height += 4; height += 4;
} else { } else {
height = 12 height = 12;
} }
let column_widths = app_data.lock().get_width(); let column_widths = app_data.lock().get_width();
@@ -199,47 +198,47 @@ fn ui<B: Backend>(
.constraints(lower_split.as_ref()) .constraints(lower_split.as_ref())
.split(upper_main[1]); .split(upper_main[1]);
draw_containers(app_data, top_panel[0], f, gui_state, &column_widths); draw_blocks::containers(app_data, top_panel[0], f, gui_state, &column_widths);
if has_containers { if has_containers {
draw_commands(app_data, top_panel[1], f, gui_state, log_index); draw_blocks::commands(app_data, top_panel[1], f, gui_state, log_index);
} }
draw_logs( draw_blocks::logs(
app_data, app_data,
lower_main[0], lower_main[0],
f, f,
gui_state, gui_state,
log_index, log_index,
loading_icon.to_owned(), &loading_icon,
); );
draw_heading_bar( draw_blocks::heading_bar(
whole_layout[0], whole_layout[0],
&column_widths, &column_widths,
f, f,
has_containers, has_containers,
loading_icon, &loading_icon,
sorted_by, &sorted_by,
gui_state, gui_state,
); );
// only draw charts if there are containers // only draw charts if there are containers
if has_containers { if has_containers {
draw_chart(f, lower_main[1], app_data, log_index); draw_blocks::chart(f, lower_main[1], app_data, log_index);
} }
if let Some(info) = info_text { if let Some(info) = info_text {
draw_info(f, info); draw_blocks::info(f, info);
} }
// Check if error, and show popup if so // Check if error, and show popup if so
if show_help { if show_help {
draw_help_box(f); draw_blocks::help_box(f);
} }
if let Some(error) = has_error { if let Some(error) = has_error {
app_data.lock().show_error = true; app_data.lock().show_error = true;
draw_error(f, error, None); draw_blocks::error(f, &error, None);
} }
} }