From c6a64a01db338d686ee9c26d09672480d7d469cb Mon Sep 17 00:00:00 2001
From: Peter Cai <peter@typeblog.net>
Date: Sat, 13 Jul 2024 21:57:32 -0400
Subject: [PATCH] Improve print check

---
 bambu.sh | 22 ++++++++++++++++------
 1 file changed, 16 insertions(+), 6 deletions(-)

diff --git a/bambu.sh b/bambu.sh
index d05e2c9..dcf826d 100755
--- a/bambu.sh
+++ b/bambu.sh
@@ -287,12 +287,7 @@ function bambu_print() {
             mqtt_command '{"print": { "sequence_id": 1, "command": "resume", "param": ""}}'
             ;;
         check)
-            local err="$(FROM_INTERNAL=true bambu_status | jq -r '.print.print_error')"
-            if [ -z "$err" ] || [ "$err" == "0" ]; then
-                echo "No errors"
-            else
-                printf "Error: 0x%x\n" "$err"
-            fi
+            bambu_print_check
             ;;
         *)
             die "Unknown subcommand: $subcommand"
@@ -300,6 +295,21 @@ function bambu_print() {
     esac
 }
 
+function bambu_print_check() {
+    local status="$(FROM_INTERNAL=true bambu_status)"
+    local err="$(echo "$status" | jq -r '.print.print_error')"
+    if [ -z "$err" ] || [ "$err" == "0" ]; then
+        local gcode_state="$(echo "$status" | jq -r '.print.gcode_state')"
+        if [ "$gcode_state" == "RUNNING" ]; then
+            echo "Now printing: $(echo "$status" | jq -r '.print.subtask_name')"
+            echo "Progress: $(echo "$status" | jq -r '.print.mc_percent')%"
+        fi
+        echo "No errors"
+    else
+        printf "Error: 0x%x\n" "$err"
+    fi
+}
+
 function bambu_print_start() {
     local file=""
     local timelapse="false"