h3n3/kiauh
1
0
Fork 0
Code Issues 46 Pull Requests 10 Packages Projects Releases Wiki Activity

refactor(ui): beginning of UI improvements

Browse Source 
Signed-off-by: Dominik Willner th33xitus@gmail.com
This commit is contained in:
th33xitus
2022-03-19 23:30:07 +01:00
parent c8629edcea
commit cd902cfcd7
5 changed files with 48 additions and 48 deletions
Download Patch File Download Diff File Expand all files Collapse all files

33
scripts/klipper.sh
View File

@@ -364,36 +364,33 @@ function get_klipper_status(){
} }
function get_local_klipper_commit(){ function get_local_klipper_commit(){
if [ -d "${KLIPPER_DIR}" ] && [ -d "${KLIPPER_DIR}"/.git ]; then [ ! -d "${KLIPPER_DIR}" ] || [ ! -d "${KLIPPER_DIR}"/.git ] && return
cd "${KLIPPER_DIR}" cd "${KLIPPER_DIR}"
commit="$(git describe HEAD --always --tags | cut -d "-" -f 1,2)" commit="$(git describe HEAD --always --tags | cut -d "-" -f 1,2)"
else
commit="${NONE}"
fi
echo "${commit}" echo "${commit}"
} }
function get_remote_klipper_commit(){ function get_remote_klipper_commit(){
if [ -d "${KLIPPER_DIR}" ] && [ -d "${KLIPPER_DIR}"/.git ]; then [ ! -d "${KLIPPER_DIR}" ] || [ ! -d "${KLIPPER_DIR}"/.git ] && return
cd "${KLIPPER_DIR}" cd "${KLIPPER_DIR}" && git fetch origin -q
git fetch origin -q commit=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
commit=$(git describe origin/master --always --tags | cut -d "-" -f 1,2)
else
commit="${NONE}"
fi
echo "${commit}" echo "${commit}"
} }
function compare_klipper_versions(){ function compare_klipper_versions(){
unset KLIPPER_UPDATE_AVAIL unset KLIPPER_UPDATE_AVAIL
if [ "$(get_local_klipper_commit)" != "$(get_remote_klipper_commit)" ]; then local versions local_ver remote_ver
LOCAL_COMMIT="${yellow}$(printf "%-12s" "$(get_local_klipper_commit)")${default}" local_ver="$(get_local_klipper_commit)"
REMOTE_COMMIT="${green}$(printf "%-12s" "$(get_remote_klipper_commit)")${default}" remote_ver="$(get_remote_klipper_commit)"
if [ "${local_ver}" != "${remote_ver}" ]; then
versions="${yellow}$(printf " %-14s" "${local_ver}")${white}"
versions+="|${green}$(printf " %-13s" "${remote_ver}")${white}"
# add klipper to the update all array for the update all function in the updater # add klipper to the update all array for the update all function in the updater
KLIPPER_UPDATE_AVAIL="true" && update_arr+=(update_klipper) KLIPPER_UPDATE_AVAIL="true" && update_arr+=(update_klipper)
else else
LOCAL_COMMIT="${green}$(printf "%-12s" "$(get_remote_klipper_commit)")${default}" versions="${green}$(printf " %-14s" "${local_ver}")${white}"
REMOTE_COMMIT="${green}$(printf "%-12s" "$(get_remote_klipper_commit)")${default}" versions+="|${green}$(printf " %-13s" "${remote_ver}")${white}"
KLIPPER_UPDATE_AVAIL="false" KLIPPER_UPDATE_AVAIL="false"
fi fi
echo "${versions}"
} }

16
scripts/moonraker.sh
View File

@@ -493,14 +493,18 @@ function get_remote_moonraker_commit(){
function compare_moonraker_versions(){ function compare_moonraker_versions(){
unset MOONRAKER_UPDATE_AVAIL unset MOONRAKER_UPDATE_AVAIL
if [ "$(get_local_moonraker_commit)" != "$(get_remote_moonraker_commit)" ]; then local versions local_ver remote_ver
LOCAL_COMMIT="${yellow}$(printf "%-12s" "$(get_local_moonraker_commit)")${white}" local_ver="$(get_local_moonraker_commit)"
REMOTE_COMMIT="${green}$(printf "%-12s" "$(get_remotemoonrakerr_commit)")${white}" remote_ver="$(get_remote_moonraker_commit)"
if [ "${local_ver}" != "${remote_ver}" ]; then
versions="${yellow}$(printf " %-14s" "${local_ver}")${white}"
versions+="|${green}$(printf " %-13s" "${remote_ver}")${white}"
# add klipper to the update all array for the update all function in the updater # add klipper to the update all array for the update all function in the updater
MOONRAKER_UPDATE_AVAIL="true" && update_arr+=(update_moonraker) MOONRAKER_UPDATE_AVAIL="true" && update_arr+=(update_moonraker)
else else
LOCAL_COMMIT="${green}$(printf "%-12s" "$(get_remote_moonraker_commit)")${white}" versions="${green}$(printf " %-14s" "${local_ver}")${white}"
REMOTE_COMMIT="${green}$(printf "%-12s" "$(get_remote_moonraker_commit)")${white}" versions+="|${green}$(printf " %-13s" "${remote_ver}")${white}"
KLIPPER_UPDATE_AVAIL="false" MOONRAKER_UPDATE_AVAIL="false"
fi fi
echo "${versions}"
} }

18
scripts/status.sh
View File

@@ -435,13 +435,13 @@ NONE="${red}$(printf "%-12s" "--------")${default}"
ui_print_versions(){ ui_print_versions(){
unset update_arr unset update_arr
check_system_updates check_system_updates
compare_klipper_versions # compare_klipper_versions
compare_dwc2fk_versions # compare_dwc2fk_versions
compare_dwc2_versions # compare_dwc2_versions
compare_moonraker_versions # compare_moonraker_versions
compare_mainsail_versions # compare_mainsail_versions
compare_fluidd_versions # compare_fluidd_versions
compare_klipperscreen_versions # compare_klipperscreen_versions
compare_MoonrakerTelegramBot_versions # compare_MoonrakerTelegramBot_versions
compare_pgc_versions # compare_pgc_versions
} }

19
scripts/ui/install_menu.sh
View File

@@ -6,17 +6,16 @@ install_ui(){
echo -e "| all necessary dependencies for the various | " echo -e "| all necessary dependencies for the various | "
echo -e "| functions on a completely fresh system. | " echo -e "| functions on a completely fresh system. | "
hr hr
echo -e "| Firmware: | Touchscreen GUI: | " echo -e "| Firmware & API: | Other: | "
echo -e "| 1) [Klipper] | 5) [KlipperScreen] | " echo -e "| 1) [Klipper] | 6) [Duet Web Control] | "
echo -e "| | | " echo -e "| 2) [Moonraker] | 7) [OctoPrint] | "
echo -e "| Klipper API: | Other: | " echo -e "| | 8) [PrettyGCode] | "
echo -e "| 2) [Moonraker] | 6) [Duet Web Control] | " echo -e "| Klipper Webinterface: | 9) [Telegram Bot] | "
echo -e "| | 7) [OctoPrint] | " echo -e "| 3) [Mainsail] | | "
echo -e "| Klipper Webinterface: | 8) [PrettyGCode] | " echo -e "| 4) [Fluidd] | Webcam: | "
echo -e "| 3) [Mainsail] | 9) [Telegram Bot] | "
echo -e "| 4) [Fluidd] | | "
echo -e "| | Webcam: | "
echo -e "| | 10) [MJPG-Streamer] | " echo -e "| | 10) [MJPG-Streamer] | "
echo -e "| Touchscreen GUI: | | "
echo -e "| 5) [KlipperScreen] | | "
back_footer back_footer
} }

10
scripts/ui/update_menu.sh
View File

@@ -6,12 +6,12 @@ update_ui(){
echo -e "| 0) $BB4U_STATUS| " echo -e "| 0) $BB4U_STATUS| "
hr hr
echo -e "| a) [Update all] | | | " echo -e "| a) [Update all] | | | "
echo -e "| | Local Vers: | Remote Vers: | " echo -e "| | Installed: | Latest: | "
echo -e "| Klipper/Klipper API: |---------------|--------------| " echo -e "| Klipper & API : |---------------|--------------| "
echo -e "| 1) [Klipper] | $LOCAL_COMMIT | $REMOTE_COMMIT | " echo -e "| 1) [Klipper] |$(compare_klipper_versions)| "
echo -e "| 2) [Moonraker] | $LOCAL_MOONRAKER_COMMIT | $REMOTE_MOONRAKER_COMMIT | " echo -e "| 2) [Moonraker] |$(compare_moonraker_versions)| "
echo -e "| | | | " echo -e "| | | | "
echo -e "| Klipper Webinterface: |---------------|--------------| " echo -e "| Webinterface: |---------------|--------------| "
echo -e "| 3) [Mainsail] | $MAINSAIL_LOCAL_VER | $MAINSAIL_REMOTE_VER | " echo -e "| 3) [Mainsail] | $MAINSAIL_LOCAL_VER | $MAINSAIL_REMOTE_VER | "
echo -e "| 4) [Fluidd] | $FLUIDD_LOCAL_VER | $FLUIDD_REMOTE_VER | " echo -e "| 4) [Fluidd] | $FLUIDD_LOCAL_VER | $FLUIDD_REMOTE_VER | "
echo -e "| | | | " echo -e "| | | | "