Fixing a status input bounds bug.

QuinnDamerell · Nov 9, 2024 · d17a241 · d17a241
1 parent 7e9b870
commit d17a241
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 3 deletions.
diff --git a/bambu_octoeverywhere/bambucommandhandler.py b/bambu_octoeverywhere/bambucommandhandler.py
@@ -185,7 +185,8 @@ def GetCurrentJobStatus(self):
             {
                 "Progress" : progress,
                 "DurationSec" : durationSec,
-                "TimeLeftSec" : timeLeftSec,
+                # In some system buggy cases, the time left can be super high and won't fit into a int32, so we cap it.
+                "TimeLeftSec" : min(timeLeftSec, 2147483600),
                 "FileName" : fileName,
                 "EstTotalFilUsedMm" : filamentUsageMm,
                 "CurrentLayer": currentLayerInt,

diff --git a/moonraker_octoeverywhere/moonrakercommandhandler.py b/moonraker_octoeverywhere/moonrakercommandhandler.py
@@ -142,7 +142,8 @@ def GetCurrentJobStatus(self):
             {
                 "Progress" : progress,
                 "DurationSec" : durationSec,
-                "TimeLeftSec" : timeLeftSec,
+                # In some system buggy cases, the time left can be super high and won't fit into a int32, so we cap it.
+                "TimeLeftSec" : min(timeLeftSec, 2147483600),
                 "FileName" : fileName,
                 "EstTotalFilUsedMm" : filamentUsageMm,
                 "CurrentLayer": currentLayerInt,

diff --git a/octoprint_octoeverywhere/octoprintcommandhandler.py b/octoprint_octoeverywhere/octoprintcommandhandler.py
@@ -125,7 +125,8 @@ def GetCurrentJobStatus(self):
                 {
                     "Progress" : progress,
                     "DurationSec" : durationSec,
-                    "TimeLeftSec" : timeLeftSec,
+                    # In some system buggy cases, the time left can be super high and won't fit into a int32, so we cap it.
+                    "TimeLeftSec" : min(timeLeftSec, 2147483600),
                     "FileName" : fileName,
                     "EstTotalFilUsedMm" : estTotalFilamentUsageMm,
                     "CurrentLayer": None, # OctoPrint doesn't provide these.