Merge pull request 'clan-vm-manager: init log view with current state of log' (#990) from hsjobeki-main into main

pkgs/clan-vm-manager/clan_vm_manager/singletons/use_vms.py

@@ -117,11 +117,7 @@ class ClanStore:
         if vm == self._logging_vm:
             gfile.load_contents_async(None, file_read_callback, None)
         else:
-            log.warning(
-                "Cannot log details of VM that is not the current logging VM.",
-                vm,
-                self._logging_vm,
-            )
+            log.info("Log details of VM hidden, vm is not current logging VM.")
 
         # we cannot check this type, python is not smart enough
 

pkgs/clan-vm-manager/clan_vm_manager/views/list.py

@@ -1,3 +1,4 @@
+import base64
 import logging
 from collections.abc import Callable
 from functools import partial
@@ -175,7 +176,12 @@ class ClanList(Gtk.Box):
         open_action = Gio.SimpleAction.new("edit", GLib.VariantType.new("s"))
         open_action.connect("activate", self.on_edit)
 
-        build_logs_action = Gio.SimpleAction.new("logs", GLib.VariantType.new("s"))
+        action_id = base64.b64encode(vm.get_id().encode("utf-8")).decode("utf-8")
+
+        build_logs_action = Gio.SimpleAction.new(
+            f"logs.{action_id}", GLib.VariantType.new("s")
+        )
+
         build_logs_action.connect("activate", self.on_show_build_logs)
         build_logs_action.set_enabled(False)
 
@@ -204,7 +210,7 @@ class ClanList(Gtk.Box):
 
         menu_model = Gio.Menu()
         menu_model.append("Edit", f"app.edit::{vm.get_id()}")
-        menu_model.append("Show Logs", f"app.logs::{vm.get_id()}")
+        menu_model.append("Show Logs", f"app.logs.{action_id}::{vm.get_id()}")
 
         pref_button = Gtk.MenuButton()
         pref_button.set_icon_name("open-menu-symbolic")
@@ -245,7 +251,9 @@ class ClanList(Gtk.Box):
         name = vm.machine.name if vm.machine else "Unknown"
 
         logs.set_title(f"""📄<span weight="normal"> {name}</span>""")
-        logs.set_message("Loading ...")
+        # initial message. Streaming happens automatically when the file is changed by the build process
+        with open(vm.build_process.out_file) as f:
+            logs.set_message(f.read())
 
         views.set_visible_child_name("logs")