Protect live state during restore and reset

2026-08-18 03:10:31 -04:00
parent c2cd79b547
commit 6d3f888784
10 changed files with 212 additions and 17 deletions
@@ -13,6 +13,9 @@ ShellRoot {
    property var calls: []
    property bool homeInitialized: false
    property var homeFavorites: []
+    property bool displayOperationBusy: false
+    property bool displayBlocked: false
+    property var displayGeneration: ({ "DP-2": { mode: "4500x3000@60", scale: 1.5, transform: 0 } })

    function record(name: string): void {
        const next = root.calls.slice();
@@ -43,6 +46,17 @@ ShellRoot {
                favorite.id === id ? { id: id, alias: alias } : favorite);
        };
        SettingsBackup.reloadDesktop = function() { root.record("desktop.reload"); };
+        SettingsBackup.readDisplays = function() { return root.displayGeneration; };
+        SettingsBackup.protectDisplays = function(value) {
+            root.record("display.protect:" + JSON.stringify(value));
+            root.displayGeneration = value;
+            return true;
+        };
+        SettingsBackup.displayBusy = function() { return root.displayOperationBusy; };
+        SettingsBackup.setDisplayBlocked = function(blocked) {
+            root.record("display.block:" + blocked);
+            root.displayBlocked = blocked;
+        };
        SettingsBackup.applyCompositor = function() { root.record("system.apply"); };
        SettingsBackup.reloadKeybinds = function() { root.record("keybinds.reload"); };
        SettingsBackup.keybindsReloading = function() { return false; };
@@ -59,17 +73,29 @@ ShellRoot {
            root.calls = [];
            root.homeInitialized = false;
            root.homeFavorites = [];
+            root.displayOperationBusy = false;
+            root.displayBlocked = false;
+            SettingsBackup.protectedDisplays = root.displayGeneration;
        }

        function apply(output: string): bool {
            return SettingsBackup.handleRestoreOutput(output);
        }

+        function restoreWhileDisplayBusy(): bool {
+            root.displayOperationBusy = true;
+            SettingsBackup.snapshots = [{ name: "settings-20260818-010203004.json" }];
+            return SettingsBackup.restore("settings-20260818-010203004.json");
+        }
+
        function status(): string {
            return JSON.stringify({
                calls: root.calls,
                initialized: root.homeInitialized,
-                favorites: root.homeFavorites
+                favorites: root.homeFavorites,
+                displayBlocked: root.displayBlocked,
+                displays: root.displayGeneration,
+                lastError: SettingsBackup.lastError
            });
        }
    }