fix: better start detection
This commit is contained in:
@@ -7,6 +7,7 @@ from .constants import (
|
||||
ACTIVE_SRC_RECT_BOUNDS,
|
||||
BACKGROUND_IMG_PATH,
|
||||
ESTIMATED_BOOT_TIME_SECONDS,
|
||||
ESTIMATED_LONG_BOOT_TIME_SECONDS,
|
||||
FONT_1_PATH,
|
||||
FONT_2_PATH,
|
||||
FX_GROUP,
|
||||
@@ -19,7 +20,6 @@ from .constants import (
|
||||
SRCA_FRAG,
|
||||
SRCB_FRAG,
|
||||
)
|
||||
from .enums import ForgeState
|
||||
from .forge_data import ForgeData
|
||||
from .glsl_funcs import mod
|
||||
|
||||
@@ -41,10 +41,27 @@ def __get_loading_display(data: ForgeData, t0: float) -> Image.Image:
|
||||
draw = ImageDraw.Draw(im)
|
||||
|
||||
now = time.time()
|
||||
elapsed = now - t0
|
||||
|
||||
percent = min(1.0, (now - t0) / ESTIMATED_BOOT_TIME_SECONDS)
|
||||
|
||||
draw.rectangle((24, 35, 24 + 80 * percent, 40), fill="white")
|
||||
if elapsed < ESTIMATED_BOOT_TIME_SECONDS:
|
||||
draw.rectangle(
|
||||
(24, 35, 24 + int(80 * elapsed / ESTIMATED_BOOT_TIME_SECONDS), 40),
|
||||
fill="white",
|
||||
)
|
||||
elif elapsed < ESTIMATED_LONG_BOOT_TIME_SECONDS * 2.0:
|
||||
draw.rectangle(
|
||||
(
|
||||
24,
|
||||
35,
|
||||
24 + int(80 * min(1.0, elapsed / ESTIMATED_LONG_BOOT_TIME_SECONDS)),
|
||||
40,
|
||||
),
|
||||
fill="white",
|
||||
)
|
||||
draw.text((36, 43), "Compiling...", fill="white", font=FONT_1)
|
||||
else:
|
||||
draw.rectangle((24, 35, 24 + 80, 40), fill="white")
|
||||
draw.text((28, 43), "Please reboot", fill="white", font=FONT_1)
|
||||
|
||||
return im
|
||||
|
||||
@@ -173,6 +190,6 @@ def __get_running_display(data: ForgeData) -> Image.Image:
|
||||
|
||||
|
||||
def get_display(data: ForgeData, t0: float) -> Image.Image:
|
||||
if data.state == ForgeState.RUNNING:
|
||||
if data.running:
|
||||
return __get_running_display(data)
|
||||
return __get_loading_display(data, t0)
|
||||
|
||||
Reference in New Issue
Block a user