From 26eecbc94bee75d1c353428010bf1bc099cf6861 Mon Sep 17 00:00:00 2001
From: th33xitus <th33xitus@googlemail.com>
Date: Sun, 31 Jan 2021 15:59:50 +0100
Subject: [PATCH] fix: refactor main menu, add dwc and octoprint commands

---
 scripts/ui/general_ui.sh |  6 ++----
 scripts/ui/main_menu.sh  | 36 ++++++++++++++++++------------------
 2 files changed, 20 insertions(+), 22 deletions(-)

diff --git a/scripts/ui/general_ui.sh b/scripts/ui/general_ui.sh
index 0735131..e871c9a 100755
--- a/scripts/ui/general_ui.sh
+++ b/scripts/ui/general_ui.sh
@@ -45,8 +45,7 @@ kiauh_update_msg(){
 ### TODO: rework other menus to make use of the following functions too and make them more readable
 
 do_action(){
-  clear
-  print_header
+  clear && print_header
   ### $1 is the action the user wants to fire
   $1
   print_msg && clear_msg
@@ -55,8 +54,7 @@ do_action(){
 }
 
 deny_action(){
-  clear
-  print_header
+  clear && print_header
   print_unkown_cmd
   print_msg && clear_msg
   $1
diff --git a/scripts/ui/main_menu.sh b/scripts/ui/main_menu.sh
index f10bf3c..bf28ea8 100755
--- a/scripts/ui/main_menu.sh
+++ b/scripts/ui/main_menu.sh
@@ -44,29 +44,29 @@ main_menu(){
     read -p "${cyan}Perform action:${default} " action; echo
     case "$action" in
       "start klipper")
-        clear && print_header
-        klipper_service "start"
-        main_ui;;
+        do_action "klipper_service start" "main_ui";;
       "stop klipper")
-        clear && print_header
-        klipper_service "stop"
-        main_ui;;
+        do_action "klipper_service stop" "main_ui";;
       "restart klipper")
-        clear && print_header
-        klipper_service "restart"
-        main_ui;;
+        do_action "klipper_service restart" "main_ui";;
       "start moonraker")
-        clear && print_header
-        moonraker_service "start"
-        main_ui;;
+        do_action "moonraker_service start" "main_ui";;
       "stop moonraker")
-        clear && print_header
-        moonraker_service "stop"
-        main_ui;;
+        do_action "moonraker_service stop" "main_ui";;
       "restart moonraker")
-        clear && print_header
-        moonraker_service "restart"
-        main_ui;;
+        do_action "moonraker_service restart" "main_ui";;
+      "start dwc")
+        do_action "dwc_service start" "main_ui";;
+      "stop dwc")
+        do_action "dwc_service stop" "main_ui";;
+      "restart dwc")
+        do_action "dwc_service restart" "main_ui";;
+      "start octoprint")
+        do_action "octoprint_service start" "main_ui";;
+      "stop octoprint")
+        do_action "octoprint_service stop" "main_ui";;
+      "restart octoprint")
+        do_action "octoprint_service restart" "main_ui";;
       update)
         do_action "update_kiauh" "main_ui";;
       0)