refactor

CHANGELOG.md

@@ -9,15 +9,15 @@
 ### 2022-04-29
 
 ### Features
-+ allow toggling of mouse caputre, to select & copy text with mouse, closes #2,  [aec184ea22b289e91942a4c3e6a415685884bc47](https://github.com/mrjackwills/oxker/commit/aec184ea22b289e91942a4c3e6a415685884bc47),
++ allow toggling of mouse caputre, to select & copy text with mouse, closes #2,  [aec184ea](https://github.com/mrjackwills/oxker/commit/aec184ea22b289e91942a4c3e6a415685884bc47),
-+ show id column, [b10f927481c9e38a48c1d4b94e744ec48e8b6ba6](https://github.com/mrjackwills/oxker/commit/b10f927481c9e38a48c1d4b94e744ec48e8b6ba6),
++ show id column, [b10f9274](https://github.com/mrjackwills/oxker/commit/b10f927481c9e38a48c1d4b94e744ec48e8b6ba6),
-+ draw_popup, using enum to draw in one of 9 areas, closes #6, [1017850a6cc91328abc1127bdb117495f5e909d8](https://github.com/mrjackwills/oxker/commit/1017850a6cc91328abc1127bdb117495f5e909d8),
++ draw_popup, using enum to draw in one of 9 areas, closes #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, [9b70fdfad7b38361ebee301bdc2545d3f0dfcf9e](https://github.com/mrjackwills/oxker/commit/9b70fdfad7b38361ebee301bdc2545d3f0dfcf9e),
++ 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),
 
 ### Fixes
-+ readme.md typo, [589501f9a4a0bfabdb0654e68cc0c752c529d97a](https://github.com/mrjackwills/oxker/commit/589501f9a4a0bfabdb0654e68cc0c752c529d97a),
++ readme.md typo, [589501f9](https://github.com/mrjackwills/oxker/commit/589501f9a4a0bfabdb0654e68cc0c752c529d97a),
-+ column heading mem > memory, [5e8e6b590b06f01a542fdd10bae8f14d303ab08a](https://github.com/mrjackwills/oxker/commit/5e8e6b590b06f01a542fdd10bae8f14d303ab08a),
++ column heading mem > memory, [5e8e6b59](https://github.com/mrjackwills/oxker/commit/5e8e6b590b06f01a542fdd10bae8f14d303ab08a),
-+ cargo fmt added to create_release.sh, [bb29c0ebfafd6a9a036eb317a240954d1405966e](https://github.com/mrjackwills/oxker/commit/bb29c0ebfafd6a9a036eb317a240954d1405966e),
++ cargo fmt added to create_release.sh, [bb29c0eb](https://github.com/mrjackwills/oxker/commit/bb29c0ebfafd6a9a036eb317a240954d1405966e),
 
 # <a href='https://github.com/mrjackwills/oxker/releases/tag/v0.0.1'>v0.0.1</a>
 ### 2022-04-25

create_release.sh

@@ -107,7 +107,10 @@ update_release_body_and_changelog () {
 	echo -e "# <a href='${GIT_REPO_URL}/releases/tag/${NEW_TAG_VERSION}'>${NEW_TAG_VERSION}</a>\n${DATE_SUBHEADING}${CHANGELOG_ADDITION}$(cat CHANGELOG.md)" > CHANGELOG.md
 
 	# Update changelog to add links to commits [hex x40]
-	sed -i -E "s=(\s)\[([0-9a-f]{40})\](\n|\s|\,|\r)= [\2](${GIT_REPO_URL}/commit/\2),=g" ./CHANGELOG.md
+	# sed -i -E "s=(\s)\[([0-9a-f]{40})\](\n|\s|\,|\r)= [\2](${GIT_REPO_URL}/commit/\2),=g" ./CHANGELOG.md
+
+
+	sed -i -E "s=(\s)\[([0-9a-f]{8})([0-9a-f]{32})\]= [\2](${GIT_REPO_URL}/commit/\2\3),=g" ./CHANGELOG.md
 
 	# Update changelog to add links to closed issues
 	sed -i -r -E "s=closes \[#([0-9]+)\],=[#\1](${GIT_REPO_URL}/issues/\1),=g" ./CHANGELOG.md

src/ui/draw_blocks.rs

@@ -32,6 +32,7 @@ a8"     "8a   `Y8, ,8P'   88 ,a8"    a8P_____88  88P'   "Y8
 "8a,   ,a8"   ,d8" "8b,   88`"Yba,   "8b,   ,aa  88
  `"YbbdP"'   8P'     `Y8  88   `Y8a   `"Ybbd8"'  88        "#;
 
+
 const NAME: &str = env!("CARGO_PKG_NAME");
 const VERSION: &str = env!("CARGO_PKG_VERSION");
 const REPO: &str = env!("CARGO_PKG_REPOSITORY");
@@ -122,12 +123,7 @@ pub fn draw_containers<B: Backend>(
     gui_state: &Arc<Mutex<GuiState>>,
     widths: &Columns,
 ) {
-    let block = generate_block(
+    let block = generate_block(app_data, area, gui_state, SelectablePanel::Containers);
-        app_data,
-        area,
-        gui_state,
-        SelectablePanel::Containers,
-    );
 
     let items = app_data
         .lock()
@@ -221,12 +217,7 @@ pub fn draw_logs<B: Backend>(
     index: Option<usize>,
     loading_icon: String,
 ) {
-    let block = generate_block(
+    let block = generate_block(app_data, area, gui_state, SelectablePanel::Logs);
-        app_data,
-        area,
-        gui_state,
-        SelectablePanel::Logs,
-    );
 
     let init = app_data.lock().init;
     if !init {

src/ui/mod.rs

@@ -191,22 +191,10 @@ fn ui<B: Backend>(
         .constraints(lower_split.as_ref())
         .split(upper_main[1]);
 
-    draw_containers(
+    draw_containers(app_data, top_panel[0], f, gui_state, &column_widths);
-        app_data,
-        top_panel[0],
-        f,
-        gui_state,
-        &column_widths,
-    );
 
     if has_containers {
-        draw_commands(
+        draw_commands(app_data, top_panel[1], f, gui_state, log_index);
-            app_data,
-            top_panel[1],
-            f,
-            gui_state,
-            log_index,
-        );
     }
 
     draw_logs(