Development

docker/routlin-dash/app/config_utils.py

@@ -8,6 +8,8 @@ DASHBOARD_QUEUE    = f'{CONFIGS_DIR}/.dashboard-queue'
 DASHBOARD_DONE     = f'{CONFIGS_DIR}/.dashboard-done'
 DASHBOARD_LAST_RUN = f'{CONFIGS_DIR}/.dashboard-last-run'
 DASHBOARD_LOCK     = f'{CONFIGS_DIR}/.dashboard-lock'
+DASHBOARD_PENDING  = f'{CONFIGS_DIR}/.dashboard-pending'
+STATUS_FILE        = f'{CONFIGS_DIR}/.status'
 DASHB_TIMER_NAME      = 'routlin-dashboard-queue'
 PRODUCT_DISPLAY_NAME  = os.environ.get('PRODUCT_DISPLAY_NAME', 'Routlin Dashboard')
 DASHB_INTERVAL_SECS = 60
@@ -103,7 +105,77 @@ def _trim_if_needed():
         pass
 
 
-def _queue_command(cmd):
+def _apply_on_save():
+    try:
+        return load_core().get('general', {}).get('apply_on_save', True)
+    except Exception:
+        return True
+
+
+def _read_dashboard_pending():
+    """Return list of (uuid, ts, cmd, user, description) from .dashboard-pending."""
+    items = []
+    try:
+        lines = open(DASHBOARD_PENDING).read().splitlines()
+    except Exception:
+        return items
+    for line in lines:
+        if not line.strip():
+            continue
+        try:
+            main, _, desc = line.partition(' :: ')
+            parts = main.split(None, 3)
+            if len(parts) == 4:
+                entry_uuid, entry_ts, _dt, rest = parts
+                cmd_user   = rest.rsplit(' (', 1)
+                entry_cmd  = cmd_user[0].strip('[]')
+                entry_user = cmd_user[1].rstrip(')') if len(cmd_user) == 2 else ''
+                items.append((entry_uuid, int(entry_ts), entry_cmd, entry_user, desc))
+        except Exception:
+            pass
+    return items
+
+
+def get_dashboard_pending():
+    return _read_dashboard_pending()
+
+
+def flush_pending_to_queue():
+    """Move all entries from .dashboard-pending to .dashboard-queue and clear pending."""
+    items = _read_dashboard_pending()
+    if not items:
+        return
+    done_set = _load_done_set()
+    existing_ids = {uu for uu, *_ in _read_pending(done_set)}
+    with open(DASHBOARD_QUEUE, 'a') as f:
+        for entry_uuid, entry_ts, entry_cmd, entry_user, _desc in items:
+            if entry_uuid not in existing_ids:
+                dt_str = datetime.fromtimestamp(entry_ts).strftime('%Y-%m-%dT%H:%M:%S')
+                f.write(f'{entry_uuid} {entry_ts} {dt_str} [{entry_cmd}] ({entry_user})\n')
+    open(DASHBOARD_PENDING, 'w').close()
+    _trim_if_needed()
+
+
+def _queue_pending_command(cmd, description=''):
+    """Append cmd to .dashboard-pending if not already present for this cmd+user."""
+    existing = _read_dashboard_pending()
+    current_user = session.get('email_address', 'unknown')
+    for entry_uuid, entry_ts, entry_cmd, entry_user, _desc in existing:
+        if entry_cmd == cmd and entry_user == current_user:
+            return entry_uuid, entry_ts
+    entry_uuid = str(uuid.uuid4())
+    now = datetime.now()
+    entry_ts = int(now.timestamp())
+    dt_str = now.strftime('%Y-%m-%dT%H:%M:%S')
+    desc_suffix = f' :: {description}' if description else ''
+    with open(DASHBOARD_PENDING, 'a') as f:
+        f.write(f'{entry_uuid} {entry_ts} {dt_str} [{cmd}] ({current_user}){desc_suffix}\n')
+    return entry_uuid, entry_ts
+
+
+def _queue_command(cmd, description=''):
+    if not _apply_on_save():
+        return _queue_pending_command(cmd, description)
     done_set = _load_done_set()
     pending = _read_pending(done_set)
     current_user = session.get('email_address', 'unknown')
@@ -155,17 +227,19 @@ def _lock_mtime():
         return None
 
 
-def queue_command(cmd):
+def queue_command(cmd, description=''):
     """Queue a command without generating a flash message."""
-    return _queue_command(cmd)
+    return _queue_command(cmd, description)
 
 
-def queued_msg(cmd=None):
+def queued_msg(cmd=None, description=''):
     """Queue cmd if given, then return a timing message.
     Without cmd, just returns timing (for commands already queued by the caller)."""
     entry_ts = None
     if cmd is not None:
-        _entry_uuid, entry_ts = queue_command(cmd)
+        _entry_uuid, entry_ts = queue_command(cmd, description)
+    if not _apply_on_save():
+        return 'Configuration saved. Click Apply Now on the Configuration Changes card to apply.'
     if _is_locked():
         mtime = _lock_mtime()
         if entry_ts is not None and mtime and entry_ts < mtime:
@@ -178,7 +252,7 @@ def queued_msg(cmd=None):
         return 'Changes queued. The processing service is not running.'
     parts = cmd.split()
     cli_cmd     = f'sudo python3 {parts[0]}.py --{parts[1]}' if len(parts) == 2 else cmd
-    install_cmd = f'sudo python3 {parts[0]}.py --install'    if len(parts) >= 1 else 'core.py --install'
+    install_cmd = f'sudo python3 install.py'
     from markupsafe import Markup
     return Markup(f'Configuration saved. The command processing service is not installed. '
                   f'Run <strong>{install_cmd}</strong> to enable it, '