Add inventory controls and enhance dashboard
This commit is contained in:
+19
-1
@@ -289,6 +289,11 @@ def init(global_state):
|
||||
g.break_time = 0
|
||||
|
||||
g.dumping = None
|
||||
g.dump_waiting = None
|
||||
g.dump_dropped = 0
|
||||
g.dump_total = 0
|
||||
g.dump_error = None
|
||||
g.drop_waiting = None
|
||||
g.draining = False
|
||||
g.item_lock = False
|
||||
g.command_lock = False
|
||||
@@ -413,6 +418,12 @@ def start_automation(global_state, initialize=True):
|
||||
g.item_lock = False
|
||||
g.minimum_cache_slots = g.get('minimum_cache_slots', 27)
|
||||
g.draining = False
|
||||
g.dumping = None
|
||||
g.dump_waiting = None
|
||||
g.dump_dropped = 0
|
||||
g.dump_total = 0
|
||||
g.dump_error = None
|
||||
g.drop_waiting = None
|
||||
g.drain_slots = []
|
||||
g.drain_waiting = None
|
||||
g.drain_dropped = 0
|
||||
@@ -437,6 +448,12 @@ def start_automation(global_state, initialize=True):
|
||||
# Preserve active work during hot reloads, but give the worker all fields
|
||||
# introduced by the currently migrated inventory controls.
|
||||
g.setdefault('draining', False)
|
||||
g.setdefault('dumping', None)
|
||||
g.setdefault('dump_waiting', None)
|
||||
g.setdefault('dump_dropped', 0)
|
||||
g.setdefault('dump_total', 0)
|
||||
g.setdefault('dump_error', None)
|
||||
g.setdefault('drop_waiting', None)
|
||||
g.setdefault('drain_slots', [])
|
||||
g.setdefault('drain_waiting', None)
|
||||
g.setdefault('drain_dropped', 0)
|
||||
@@ -485,7 +502,8 @@ def start_automation(global_state, initialize=True):
|
||||
movement_ready = initial_world_ready
|
||||
job_active = (g.job is not None and g.job.state != g.job.idle)
|
||||
has_work = (bool(g.path) or job_active or bool(g.breaking) or
|
||||
bool(g.draining))
|
||||
bool(g.draining) or g.get('dumping') is not None or
|
||||
bool(g.get('drop_waiting')))
|
||||
if g.get('movement_paused'):
|
||||
set_status('paused')
|
||||
elif has_work and not movement_ready:
|
||||
|
||||
Reference in New Issue
Block a user