Merge branch 'kianmeng-fix-typos' into dev

.github/workflows/create_release_and_build.yml

@@ -40,28 +40,28 @@ jobs:
       # Build for linux x86_64
       - name: build release linux_x86_64
         run: cargo build --release
-      # Compress ouput into tar
+      # Compress output into tar
       - name: compress oxker_linux_x86_64 binary
         run: tar -C target/release -czf ./oxker_linux_x86_64.tar.gz oxker
 
       # Build for linux aarch64, aka 64 bit pi 4
       - name: build aarch64-unknown-linux-musl
         run: cross build --target aarch64-unknown-linux-musl --release
-      # Compress ouput into tar
+      # Compress output into tar
       - name: compress aarch64 binary
         run: tar -C target/aarch64-unknown-linux-musl/release -czf ./oxker_linux_aarch64.tar.gz oxker
 
       # Build for linux armv6, aka 32 bit pi zero w
       - name: build arm-unknown-linux-musleabihf
         run: cross build --target arm-unknown-linux-musleabihf --release
-      # Compress ouput into tar
+      # Compress output into tar
       - name: compress armv6 binary
         run: tar -C target/arm-unknown-linux-musleabihf/release -czf ./oxker_linux_armv6.tar.gz oxker
 
       # Build for windows
       - name: build release windows_x86_64
         run: cross build --target x86_64-pc-windows-gnu --release
-      # Compress ouput into zip
+      # Compress output into zip
       - name: compress windows_x86_64 binary
         run: zip -j ./oxker_windows_x86_64.zip target/x86_64-pc-windows-gnu/release/oxker.exe
 

CHANGELOG.md

@@ -259,7 +259,7 @@
 ### 2022-04-29
 
 ### Features
-+ allow toggling of mouse caputre, to select & copy text with mouse, closes [#2](https://github.com/mrjackwills/oxker/issues/2), [aec184ea](https://github.com/mrjackwills/oxker/commit/aec184ea22b289e91942a4c3e6a415685884bc47),
++ allow toggling of mouse capture, to select & copy text with mouse, closes [#2](https://github.com/mrjackwills/oxker/issues/2), [aec184ea](https://github.com/mrjackwills/oxker/commit/aec184ea22b289e91942a4c3e6a415685884bc47),
 + show id column, [b10f9274](https://github.com/mrjackwills/oxker/commit/b10f927481c9e38a48c1d4b94e744ec48e8b6ba6),
 + draw_popup, using enum to draw in one of 9 areas, closes [#6](https://github.com/mrjackwills/oxker/issues/6), [1017850a](https://github.com/mrjackwills/oxker/commit/1017850a6cc91328abc1127bdb117495f5e909d8),
 + use a message rx/sx for all docker commands, remove update loop, wait for update message from gui instead, [9b70fdfa](https://github.com/mrjackwills/oxker/commit/9b70fdfad7b38361ebee301bdc2545d3f0dfcf9e),

src/app_data/container_state.rs

@@ -377,8 +377,8 @@ impl fmt::Display for LogsTz {
 }
 
 /// Store the logs alongside a HashSet, each log *should* generate a unique timestamp,
-/// so if we store the timestamp seperately in a HashSet, we can then check if we should insert a log line into the
-/// stateful list dependant on whethere the timestamp is in the HashSet or not
+/// so if we store the timestamp separately in a HashSet, we can then check if we should insert a log line into the
+/// stateful list dependent on whethere the timestamp is in the HashSet or not
 #[derive(Debug, Clone)]
 pub struct Logs {
     logs: StatefulList<ListItem<'static>>,

src/app_data/mod.rs

@@ -376,7 +376,7 @@ impl AppData {
             .map(|i| i.logs.state())
     }
 
-    /// Error realted methods
+    /// Error related methods
 
     /// return single app_state error
     pub const fn get_error(&self) -> Option<AppError> {

src/docker_data/mod.rs

@@ -62,7 +62,7 @@ pub struct DockerData {
 }
 
 impl DockerData {
-    /// Use docker stats to caluclate current cpu usage
+    /// Use docker stats to calculate current cpu usage
     #[allow(clippy::cast_precision_loss)]
     fn calculate_usage(stats: &Stats) -> f64 {
         let mut cpu_percentage = 0.0;

src/ui/draw_blocks.rs

@@ -328,7 +328,7 @@ fn make_chart<'a, T: Stats + Display>(
 }
 
 /// Draw heading bar at top of program, always visible
-/// TODO Should seperate into loading icon/headers/help functions
+/// TODO Should separate into loading icon/headers/help functions
 #[allow(clippy::too_many_lines)]
 pub fn heading_bar<B: Backend>(
     area: Rect,
@@ -510,7 +510,7 @@ pub fn help_box<B: Backend>(f: &mut Frame<'_, B>) {
     );
     help_text.push_str("\n  ( q ) to quit at any time");
     help_text.push_str("\n  mouse scrolling & clicking also available");
-    help_text.push_str("\n\n  currenty an early work in progress, all and any input appreciated");
+    help_text.push_str("\n\n  currently an early work in progress, all and any input appreciated");
     help_text.push_str(format!("\n  {}", REPO.trim()).as_str());
 
     // Find the maximum line widths & height
@@ -527,7 +527,7 @@ pub fn help_box<B: Backend>(f: &mut Frame<'_, B>) {
         .block(Block::default())
         .alignment(Alignment::Center);
 
-    let description_paragrpah = Paragraph::new(description_text.as_str())
+    let description_paragraph = Paragraph::new(description_text.as_str())
         .style(Style::default().bg(Color::Magenta).fg(Color::Black))
         .block(Block::default())
         .alignment(Alignment::Center);
@@ -566,7 +566,7 @@ pub fn help_box<B: Backend>(f: &mut Frame<'_, B>) {
     // Order is important here
     f.render_widget(Clear, area);
     f.render_widget(name_paragraph, split_popup[0]);
-    f.render_widget(description_paragrpah, split_popup[1]);
+    f.render_widget(description_paragraph, split_popup[1]);
     f.render_widget(help_paragraph, split_popup[2]);
     f.render_widget(block, area);
 }

src/ui/gui_state.rs

@@ -273,7 +273,7 @@ impl GuiState {
         self.is_loading.insert(uuid);
     }
 
-    /// If is_loading has any entries, return the current loading_icon, else an emtpy string
+    /// If is_loading has any entries, return the current loading_icon, else an empty string
     pub fn get_loading(&mut self) -> String {
         if self.is_loading.is_empty() {
             String::from(" ")