Skip to content

Commit

Permalink
chore: linting pedantic
Browse files Browse the repository at this point in the history
  • Loading branch information
@mrjackwills
mrjackwills committed Aug 4, 2022
1 parent ca3315a commit 1263662
Show file tree
Hide file tree
Showing 9 changed files with 144 additions and 148 deletions.
4 changes: 2 additions & 2 deletions src/app_data/container_state.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -352,15 +352,15 @@ impl ContainerItem {
/// Find the max value in the last 30 items in the cpu stats vec
fn max_cpu_stats(&self) -> CpuStats {
match self.cpu_stats.iter().max() {
Some(value) => value.to_owned(),
Some(value) => value.clone(),
None => CpuStats::new(0.0),
}
}

/// Find the max value in the last 30 items in the mem stats vec
fn max_mem_stats(&self) -> ByteStats {
match self.mem_stats.iter().max() {
Some(value) => value.to_owned(),
Some(value) => value.clone(),
None => ByteStats::new(0),
}
}
Expand Down
65 changes: 32 additions & 33 deletions src/app_data/mod.rs
View file
Original file line number Diff line number Diff line change
Expand Up @@ -71,7 +71,7 @@ impl AppData {
self.containers
.items
.iter()
.position(|i| Some(i.id.to_owned()) == id),
.position(|i| Some(i.id.clone()) == id),
);
}
/// Generate a default app_state
Expand All @@ -89,7 +89,7 @@ impl AppData {

/// Current time as unix timestamp
#[allow(clippy::expect_used)]
fn get_systemtime(&self) -> u64 {
fn get_systemtime() -> u64 {
SystemTime::now()
.duration_since(UNIX_EPOCH)
.expect("In our known reality, this error should never occur")
Expand All @@ -107,7 +107,7 @@ impl AppData {
.selected()
{
output =
Some(self.containers.items[index].docker_controls.items[control_index].clone())
Some(self.containers.items[index].docker_controls.items[control_index].clone());
}
}
output
Expand All @@ -116,28 +116,28 @@ impl AppData {
/// Change selected choice of docker commands of selected container
pub fn docker_command_next(&mut self) {
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
pub fn docker_command_previous(&mut self) {
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
pub fn docker_command_start(&mut self) {
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
pub fn docker_command_end(&mut self) {
if let Some(index) = self.containers.state.selected() {
self.containers.items[index].docker_controls.end()
self.containers.items[index].docker_controls.end();
}
}

Expand Down Expand Up @@ -168,9 +168,9 @@ impl AppData {
.iter()
.skip(index)
.take(1)
.map(|i| i.id.to_owned())
.map(|i| i.id.clone())
.collect::<String>();
output = Some(id)
output = Some(id);
}
output
}
Expand Down Expand Up @@ -226,7 +226,7 @@ impl AppData {
Header::Image => match so {
SortedOrder::Asc => self.containers.items.sort_by(|a, b| a.image.cmp(&b.image)),
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 {
Expand Down Expand Up @@ -269,28 +269,28 @@ impl AppData {
/// select next selected log line
pub fn log_next(&mut self) {
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
pub fn log_previous(&mut self) {
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
pub fn log_end(&mut self) {
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
pub fn log_start(&mut self) {
if let Some(index) = self.get_selected_log_index() {
self.containers.items[index].logs.start()
self.containers.items[index].logs.start();
}
}

Expand All @@ -316,7 +316,7 @@ impl AppData {
let mut output = Columns::new();
let count = |x: &String| x.chars().count();

for container in self.containers.items.iter() {
for container in &self.containers.items {
let cpu_count = count(
&container
.cpu_stats
Expand Down Expand Up @@ -370,7 +370,7 @@ impl AppData {
self.containers
.items
.iter()
.map(|i| i.id.to_owned())
.map(|i| i.id.clone())
.collect::<Vec<_>>()
}

Expand All @@ -382,14 +382,14 @@ impl AppData {
/// Update container mem, cpu, & network stats, in single function so only need to call .lock() once
pub fn update_stats(
&mut self,
id: String,
id: &str,
cpu_stat: Option<f64>,
mem_stat: Option<u64>,
mem_limit: u64,
rx: 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 {
container.cpu_stats.pop_front();
}
Expand Down Expand Up @@ -444,7 +444,7 @@ impl AppData {
.unwrap_or(&vec!["".to_owned()])
.get(0)
.unwrap_or(&String::from(""))
.to_owned();
.clone();
if let Some(c) = name.chars().next() {
if c == '/' {
name.remove(0);
Expand All @@ -461,29 +461,28 @@ impl AppData {
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 current_container.name != name {
current_container.name = name
current_container.name = name;
};
if current_container.status != status {
current_container.status = status
current_container.status = status;
};
if current_container.state != state {
current_container.docker_controls.items = DockerControls::gen_vec(&state);

// Update the list state, needs to be None if the gen_vec returns an empty vec
match state {
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.state = state;
};
if current_container.image != image {
current_container.image = image
current_container.image = image;
};
} else {
let mut container =
ContainerItem::new(id.to_owned(), status, image, state, name);
let mut container = ContainerItem::new(id.clone(), status, image, state, name);
container.logs.end();
self.containers.items.push(container);
}
Expand All @@ -492,25 +491,25 @@ impl AppData {
}

/// update logs of a given container, based on id
pub fn update_log_by_id(&mut self, output: Vec<String>, id: String) {
let tz = self.get_systemtime();
pub fn update_log_by_id(&mut self, output: &[String], id: &str) {
let tz = Self::get_systemtime();
let color = self.args.color;
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;
let current_len = container.logs.items.len();

output.iter().for_each(|i| {
for i in output.iter() {
let lines = if color {
log_sanitizer::colorize_logs(i.to_owned())
log_sanitizer::colorize_logs(i)
} else if raw {
log_sanitizer::raw(i.to_owned())
log_sanitizer::raw(i.clone())
} else {
log_sanitizer::remove_ansi(i.to_owned())
log_sanitizer::remove_ansi(i)
};
container.logs.items.push(ListItem::new(lines));
});
}

if container.logs.state.selected().is_none()
|| container.logs.state.selected().unwrap_or_default() + 1 == current_len
Expand Down
Loading

0 comments on commit 1263662

Please sign in to comment.