clan/clan-core
11
2
Fork 13
Code Issues 91 Pull Requests 6 Actions Packages Projects 1 Releases Wiki Activity

clan-vm-manager: Fix incorrect use of all Glib.idle_add uses

Browse Source
This commit is contained in:
Luis Hebendanz 2024-03-03 11:21:12 +07:00
parent da34bd7199
commit f17cf41093
2 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
pkgs/clan-vm-manager/clan_vm_manager/models/use_join.py
View File

@ -26,6 +26,10 @@ class JoinValue(GObject.Object):
url: ClanURI
def join_finished(self) -> bool:
self.emit("join_finished", self)
return GLib.SOURCE_REMOVE
def __init__(
self, url: ClanURI, on_join: Callable[["JoinValue", Any], None]
) -> None:
@ -35,7 +39,7 @@ class JoinValue(GObject.Object):
def __join(self) -> None:
add_history(self.url, all_machines=False)
GLib.idle_add(self.emit, "join_finished", self)
GLib.idle_add(self.join_finished)
def join(self) -> None:
threading.Thread(target=self.__join).start()

18
pkgs/clan-vm-manager/clan_vm_manager/models/use_vms.py
View File

@ -35,6 +35,10 @@ class VM(GObject.Object):
"vm_status_changed": (GObject.SignalFlags.RUN_FIRST, None, [GObject.Object])
}
def vm_status_changed(self) -> bool:
self.emit("vm_status_changed", self)
return GLib.SOURCE_REMOVE
def __init__(
self,
icon: Path,
@ -75,12 +79,12 @@ class VM(GObject.Object):
self.switch_handler_id: int = self.switch.connect(
"notify::active", self.on_switch_toggle
)
self.connect("vm_status_changed", self.vm_status_changed)
self.connect("vm_status_changed", self.on_vm_status_changed)
# Make sure the VM is killed when the reference to this object is dropped
self._finalizer = weakref.finalize(self, self.kill_ref_drop)
def vm_status_changed(self, vm: "VM", _vm: "VM") -> None:
def on_vm_status_changed(self, vm: "VM", _vm: "VM") -> None:
self.switch.set_state(self.is_running() and not self.is_building())
if self.switch.get_sensitive() is False and not self.is_building():
self.switch.set_sensitive(True)
@ -145,7 +149,7 @@ class VM(GObject.Object):
tmpdir=log_dir,
vm=self.data.flake.vm,
)
GLib.idle_add(self.emit, "vm_status_changed", self)
GLib.idle_add(self.vm_status_changed)
# Start the logs watcher
self._logs_id = GLib.timeout_add(
@ -170,7 +174,7 @@ class VM(GObject.Object):
# Check if the VM was built successfully
if self.build_process.proc.exitcode != 0:
log.error(f"Failed to build VM {self.get_id()}")
GLib.idle_add(self.emit, "vm_status_changed", self)
GLib.idle_add(self.vm_status_changed)
return
log.info(f"Successfully built VM {self.get_id()}")
@ -182,7 +186,7 @@ class VM(GObject.Object):
vm=self.data.flake.vm,
)
log.debug(f"Started VM {self.get_id()}")
GLib.idle_add(self.emit, "vm_status_changed", self)
GLib.idle_add(self.vm_status_changed)
# Start the logs watcher
self._logs_id = GLib.timeout_add(50, self._get_logs_task, self.vm_process)
@ -193,7 +197,7 @@ class VM(GObject.Object):
# Wait for the VM to stop
self.vm_process.proc.join()
log.debug(f"VM {self.get_id()} has stopped")
GLib.idle_add(self.emit, "vm_status_changed", self)
GLib.idle_add(self.vm_status_changed)
def start(self) -> None:
if self.is_running():
@ -269,7 +273,7 @@ class VM(GObject.Object):
# Try 20 times to stop the VM
time.sleep(self.KILL_TIMEOUT / 20)
GLib.idle_add(self.emit, "vm_status_changed", self)
GLib.idle_add(self.vm_status_changed)
log.debug(f"VM {self.get_id()} has stopped")
def shutdown(self) -> None: