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

refactor: reaplace unwrap_or(()) with .ok()

Browse Source
This commit is contained in:
Jack Wills
2023-03-09 15:18:00 +00:00
parent 5582c45403
commit 8ba37a165b
4 changed files with 20 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/docker_data/mod.rs
+2 -2
View File
@@ -109,8 +109,8 @@ impl DockerData {
.take(1); .take(1);
while let Some(Ok(stats)) = stream.next().await { while let Some(Ok(stats)) = stream.next().await {
let mem_stat = stats.memory_stats.usage.unwrap_or(0); let mem_stat = stats.memory_stats.usage.unwrap_or_default();
let mem_limit = stats.memory_stats.limit.unwrap_or(0); let mem_limit = stats.memory_stats.limit.unwrap_or_default();
let op_key = stats let op_key = stats
.networks .networks
src/input_handler/mod.rs
+12 -18
View File
@@ -251,32 +251,26 @@ impl InputHandler {
}; };
if let Some(id) = option_id { if let Some(id) = option_id {
match command { match command {
DockerControls::Pause => self DockerControls::Pause => {
.docker_sender self.docker_sender.send(DockerMessage::Pause(id)).await.ok()
.send(DockerMessage::Pause(id)) }
.await
.unwrap_or(()),
DockerControls::Unpause => self DockerControls::Unpause => self
.docker_sender .docker_sender
.send(DockerMessage::Unpause(id)) .send(DockerMessage::Unpause(id))
.await .await
.unwrap_or(()), .ok(),
DockerControls::Start => self DockerControls::Start => {
.docker_sender self.docker_sender.send(DockerMessage::Start(id)).await.ok()
.send(DockerMessage::Start(id)) }
.await DockerControls::Stop => {
.unwrap_or(()), self.docker_sender.send(DockerMessage::Stop(id)).await.ok()
DockerControls::Stop => self }
.docker_sender
.send(DockerMessage::Stop(id))
.await
.unwrap_or(()),
DockerControls::Restart => self DockerControls::Restart => self
.docker_sender .docker_sender
.send(DockerMessage::Restart(id)) .send(DockerMessage::Restart(id))
.await .await
.unwrap_or(()), .ok(),
} };
} }
} }
} }
src/main.rs
+2 -5
View File
@@ -55,10 +55,7 @@ fn setup_tracing() {
/// An ENV is set in the ./containerised/Dockerfile, if this is ENV found, then sleep for 250ms, else the container, for as yet unknown reasons, will close immediately /// An ENV is set in the ./containerised/Dockerfile, if this is ENV found, then sleep for 250ms, else the container, for as yet unknown reasons, will close immediately
/// returns a bool, so that the `update_all_containers()` won't bother to check the entry point unless running via a container /// returns a bool, so that the `update_all_containers()` won't bother to check the entry point unless running via a container
fn check_if_containerised() -> bool { fn check_if_containerised() -> bool {
if std::env::vars() if std::env::vars().any(|x| x == (ENV_KEY.into(), ENV_VALUE.into())) {
.into_iter()
.any(|x| x == (ENV_KEY.into(), ENV_VALUE.into()))
{
std::thread::sleep(std::time::Duration::from_millis(250)); std::thread::sleep(std::time::Duration::from_millis(250));
true true
} else { } else {
@@ -141,7 +138,7 @@ async fn main() {
while is_running.load(Ordering::SeqCst) { while is_running.load(Ordering::SeqCst) {
// Debug mode for testing, mostly pointless, doesn't take terminal // Debug mode for testing, mostly pointless, doesn't take terminal
loop { loop {
docker_sx.send(DockerMessage::Update).await.unwrap_or(()); docker_sx.send(DockerMessage::Update).await.ok();
tokio::time::sleep(std::time::Duration::from_millis(u64::from( tokio::time::sleep(std::time::Duration::from_millis(u64::from(
args.docker_interval, args.docker_interval,
))) )))
src/ui/mod.rs
+4 -10
View File
@@ -158,31 +158,25 @@ impl Ui {
self.sender self.sender
.send(InputMessages::ButtonPress((key.code, key.modifiers))) .send(InputMessages::ButtonPress((key.code, key.modifiers)))
.await .await
.unwrap_or(()); .ok();
} else if let Event::Mouse(m) = event { } else if let Event::Mouse(m) = event {
match m.kind { match m.kind {
event::MouseEventKind::Down(_) event::MouseEventKind::Down(_)
| event::MouseEventKind::ScrollDown | event::MouseEventKind::ScrollDown
| event::MouseEventKind::ScrollUp => { | event::MouseEventKind::ScrollUp => {
self.sender self.sender.send(InputMessages::MouseEvent(m)).await.ok();
.send(InputMessages::MouseEvent(m))
.await
.unwrap_or(());
} }
_ => (), _ => (),
} }
} else if let Event::Resize(_, _) = event { } else if let Event::Resize(_, _) = event {
self.gui_state.lock().clear_area_map(); self.gui_state.lock().clear_area_map();
self.terminal.autoresize().unwrap_or(()); self.terminal.autoresize().ok();
} }
} }
} }
if self.now.elapsed() >= update_duration { if self.now.elapsed() >= update_duration {
self.docker_sx self.docker_sx.send(DockerMessage::Update).await.ok();
.send(DockerMessage::Update)
.await
.unwrap_or(());
self.now = Instant::now(); self.now = Instant::now();
} }
} }