virtui-manager 1.4.0__py3-none-any.whl → 1.5.0__py3-none-any.whl

vmanager/utils.py

@@ -13,6 +13,9 @@ from typing import List, Tuple, Union, Callable
 from urllib.parse import urlparse
 from .constants import AppInfo
 
+def is_running_under_flatpak():
+    return 'FLATPAK_ID' in os.environ
+
 def find_free_port(start: int, end: int) -> int:
     """
     Find a free port in the specified range.

vmanager/vmanager.py

@@ -62,7 +62,7 @@ from .utils import (
     generate_webconsole_keys_if_needed,
     get_server_color_cached,
     setup_cache_monitoring,
-    setup_logging
+    setup_logging, is_running_under_flatpak
 )
 from .vm_queries import (
     get_status,
@@ -1291,7 +1291,7 @@ class VMManagerTUI(App):
 
                     if result:
                         vm_info, domain, conn = result
-                        from modals.vmdetails_modals import VMDetailModal # Import here to avoid circular dep if any
+                        from .modals.vmdetails_modals import VMDetailModal # Import here to avoid circular dep if any
 
                         self.push_screen(
                             VMDetailModal(
@@ -1326,7 +1326,7 @@ class VMManagerTUI(App):
 
     def _perform_bulk_action_worker(self, action_type: str, vm_uuids: list[str], delete_storage_flag: bool = False) -> None:
         """Worker function to orchestrate a bulk action using the VMService."""
-
+        bulk_failed = False
         # Stop workers for all selected VMs to prevent conflicts
         for uuid in vm_uuids:
             vm_card = self.vm_card_pool.active_cards.get(uuid)
@@ -1357,8 +1357,10 @@ class VMManagerTUI(App):
             logging.info(summary)
 
             if successful_vms:
+                bulk_failed = False
                 self.call_from_thread(self.show_success_message, SuccessMessages.BULK_ACTION_SUCCESS_TEMPLATE.format(action_type=action_type, count=len(successful_vms)))
             if failed_vms:
+                bulk_failed = True
                 self.call_from_thread(self.show_error_message, ErrorMessages.BULK_ACTION_FAILED_TEMPLATE.format(action_type=action_type, count=len(failed_vms)))
 
         except Exception as e:
@@ -1371,7 +1373,8 @@ class VMManagerTUI(App):
             # Unlock immediately so UI is not stuck if refresh fails
             def unlock_and_refresh():
                 self.bulk_operation_in_progress = False
-                self.refresh_vm_list(force=True)
+                if bulk_failed is False:
+                    self.refresh_vm_list(force=True)
 
             self.call_from_thread(unlock_and_refresh)
 
@@ -1386,6 +1389,13 @@ class VMManagerTUI(App):
 
     def refresh_vm_list(self, force: bool = False, optimize_for_current_page: bool = False, on_complete: Callable | None = None) -> None:
         """Refreshes the list of VMs by running the fetch-and-display logic in a worker."""
+        # Prevent refresh during bulk operations to maintain UI stability
+        if self.bulk_operation_in_progress:
+            logging.debug("Skipping refresh_vm_list because bulk operation is in progress.")
+            if on_complete:
+                on_complete()
+            return
+
         # Don't display VMs until initial cache is complete
         if self.initial_cache_loading and not self.initial_cache_complete:
             return
@@ -1493,13 +1503,15 @@ class VMManagerTUI(App):
                         cpu = 0
                         memory = 0
 
+                    simple_uuid = uuid.split('@')[0] if '@' in uuid else uuid
+
                     return {
                         'uuid': uuid,
                         'name': vm_name,
                         'status': status,
                         'cpu': cpu,
                         'memory': memory,
-                        'is_selected': uuid in selected_uuids,
+                        'is_selected': simple_uuid in selected_uuids,
                         'domain': domain,
                         'conn': conn,
                         'uri': uri
@@ -1597,12 +1609,14 @@ class VMManagerTUI(App):
                     card.name = data['name']
                     card.cpu = data['cpu']
                     card.memory = data['memory']
-                    card.is_selected = data['is_selected']
+                    
                     card.server_border_color = self.get_server_color(data['uri'])
                     card.status = data['status']
                     card.internal_id = uuid
                     card.compact_view = self.compact_view
 
+                    card.is_selected = data['is_selected']
+
                 # Mount any new cards
                 if cards_to_mount:
                     vms_container.mount(*cards_to_mount)
@@ -1910,12 +1924,22 @@ class VMManagerTUI(App):
 
 def main():
     """Entry point for vmanager TUI application."""
+    if is_running_under_flatpak():
+        ldir = "/app/share/locale"
+    else:
+        if not os.path.exists("locale"):
+            # Installed on the system
+            ldir = "/usr/share/locale"
+        else:
+            # Devel version from git
+            ldir = "locale"
+
     parser = argparse.ArgumentParser(description="A Textual application to manage VMs.")
     parser.add_argument("--cmd", action="store_true", help="Run in command-line interpreter mode.")
     args = parser.parse_args()
 
     if args.cmd:
-        from vmanager_cmd import VManagerCMD
+        from .vmanager_cmd import VManagerCMD
         VManagerCMD().cmdloop()
     else:
         terminal_size = os.get_terminal_size()

vmanager/vmcard.css

@@ -158,3 +158,19 @@ Button {
   margin: 0 0;
   padding: 0 0;
 }
+
+.name-box {
+    height: 2;
+}
+
+.quick-actions {
+    width: 8;
+    height: 2;
+    padding: 0 0;
+}
+.btn-small {
+    min-width: 2;
+    height: 1;
+    border: none;
+    padding: 0 0;
+}

vmanager/vmcard.py

@@ -56,7 +56,7 @@ from .utils import (
 from .constants import (
     ButtonLabels, TabTitles, StatusText,
     SparklineLabels, ErrorMessages, DialogMessages, VmAction,
-    WarningMessages, SuccessMessages
+    WarningMessages, SuccessMessages, StaticText, ProgressMessages
 )
 
 class VMCardActions(Static):
@@ -252,6 +252,15 @@ class VMCard(Static):
             status_widget.update(status_text)
 
     def compose(self):
+        self.ui["btn_quick_start"] = Button("▶", id="start", variant="success", classes="btn-small")
+        self.ui["btn_quick_start"].tooltip = StaticText.START_VMS
+        self.ui["btn_quick_view"] = Button("👁", id="connect", classes="btn-small")
+        self.ui["btn_quick_view"].tooltip = StaticText.REMOTE_VIEWER
+        self.ui["btn_quick_resume"] = Button("⏯", id="resume", variant="success", classes="btn-small")
+        self.ui["btn_quick_resume"].tooltip = ButtonLabels.RESUME
+        self.ui["btn_quick_stop"] = Button("■", id="shutdown", variant="primary", classes="btn-small")
+        self.ui["btn_quick_stop"].tooltip = ButtonLabels.SHUTDOWN
+
         self.ui["checkbox"] = Checkbox("", id="vm-select-checkbox", classes="vm-select-checkbox", value=self.is_selected, tooltip="Select VM")
         self.ui["vmname"] = Static(self._get_vm_display_name(), id="vmname", classes="vmname")
         self.ui["status"] = Static(f"{self.status}{self.webc_status_indicator}", id="status")
@@ -290,6 +299,12 @@ class VMCard(Static):
                 with Vertical():
                     yield self.ui["vmname"]
                     yield self.ui["status"]
+                with Horizontal(classes="quick-actions"):
+                    with Vertical():
+                        yield self.ui["btn_quick_resume"]
+                        yield self.ui["btn_quick_stop"]
+                        yield self.ui["btn_quick_view"]
+                        yield self.ui["btn_quick_start"]
 
             yield self.ui["sparklines_container"]
             yield self.ui["collapsible"]
@@ -315,6 +330,8 @@ class VMCard(Static):
         # Clean up dynamic UI references to avoid memory leaks and stale state
         keys_to_keep = {
             "checkbox", "vmname", "status", "collapsible",
+            "btn_quick_start", "btn_quick_stop", "btn_quick_view",
+            "btn_quick_resume",
             "sparklines_container",
             # Resource Sparklines
             "cpu_label", "cpu_sparkline", "cpu_sparkline_container",
@@ -555,19 +572,20 @@ class VMCard(Static):
         if not self.ui:
             return
 
-        #sparklines = self.ui.get("sparklines_container")
+        sparklines = self.ui.get("sparklines_container")
         collapsible = self.ui.get("collapsible")
         vmname = self.ui.get("vmname")
         vmstatus = self.ui.get("status")
         checkbox = self.ui.get("checkbox")
 
-        if value: # if compact view, add hidden class
-            #if sparklines and sparklines.is_mounted:
-            #    logging.info("DEBUG remove spark")
-            #    sparklines.remove()
+        if value:
+            if sparklines and sparklines.is_mounted:
+                sparklines.display = False
             if collapsible and collapsible.is_mounted:
                 collapsible.collapsed = True
                 collapsible.remove()
+            #if checkbox and checkbox.is_mounted:
+            #    checkbox.display = False
         else:
             try:
                 info_container = self.query_one("#info-container")
@@ -575,6 +593,11 @@ class VMCard(Static):
                     # Check if collapsible is already a child of info_container to avoid double mounting
                     if collapsible not in info_container.children:
                         info_container.mount(collapsible)
+                if sparklines:
+                    sparklines.display = True
+                #if checkbox:
+                #    checkbox.display = True
+
             except NoMatches:
                 # This can happen if the card is not fully initialized or structures changed
                 logging.warning(f"Could not find #info-container on VMCard {self.name} when switching to detailed view.")
@@ -589,10 +612,11 @@ class VMCard(Static):
         if value: # Compact view
             self.styles.height = 4
             self.styles.width = 20
-            if vmname: vmname.styles.content_align = ("left", "middle")
+            if vmname:
+                vmname.styles.content_align = ("left", "middle")
             if vmstatus: vmstatus.styles.content_align = ("left", "middle")
             if checkbox: checkbox.styles.width = "2"
-        else: # Detailed view
+        else: # Detailed view 
             self.styles.height = 14
             self.styles.width = 41
             if vmname: vmname.styles.content_align = ("center", "middle")
@@ -629,7 +653,17 @@ class VMCard(Static):
 
     def watch_server_border_color(self, old_color: str, new_color: str) -> None:
         """Called when server_border_color changes."""
-        self.styles.border = ("solid", new_color)
+        if self.is_selected:
+            self.styles.border = ("panel", "white")
+        else:
+            self.styles.border = ("solid", new_color)
+
+    def on_click(self, event: Click) -> None:
+        """Handle click events on the card."""
+        if event.button == 3:
+            self.is_selected = not self.is_selected
+            self.post_message(VMSelectionChanged(vm_uuid=self.raw_uuid, is_selected=self.is_selected))
+            event.stop()
 
     def on_unmount(self) -> None:
         """Stop the timer and cancel any running stat workers when the widget is removed."""
@@ -673,11 +707,10 @@ class VMCard(Static):
 
     def watch_is_selected(self, old_value: bool, new_value: bool) -> None:
         """Called when is_selected changes to update the checkbox."""
-        if not self.ui:
-            return
-        checkbox = self.ui.get("checkbox")
-        if checkbox:
-            checkbox.value = new_value
+        if self.ui:
+            checkbox = self.ui.get("checkbox")
+            if checkbox:
+                checkbox.value = new_value
 
         if new_value:
             self.styles.border = ("panel", "white")
@@ -888,6 +921,14 @@ class VMCard(Static):
         is_pmsuspended = self.status == StatusText.PMSUSPENDED
         is_blocked = self.status == StatusText.BLOCKED
 
+        if not self.ui.get("btn_quick_start"):
+            return
+
+        self.ui["btn_quick_start"].display = is_stopped
+        self.ui["btn_quick_stop"].display = is_running or is_blocked
+        self.ui["btn_quick_view"].display = (is_running or is_paused or is_blocked)
+        self.ui["btn_quick_resume"].display = is_paused or is_pmsuspended
+
         if not self.ui.get("rename-button"):
             return
 
@@ -1020,10 +1061,10 @@ class VMCard(Static):
                 pane = tabbed_content.get_tab("snapshot-tab")
                 if snapshot_count > 0:
                     latest = snapshot_summary.get('latest')
-                    info = f"Latest: {latest['name']} ({latest['time']})" if latest else "Unknown"
+                    info = f"{StaticText.LATEST_SNAPSHOT} {latest['name']} ({latest['time']})" if latest else "Unknown"
                     pane.tooltip = f"{info}\nTotal: {snapshot_count}"
                 else:
-                    pane.tooltip = "No Snapshots created"
+                   pane.tooltip = StaticText.NO_SNAPSHOTS_CREATED
             except Exception:
                 pass
 
@@ -1183,7 +1224,7 @@ class VMCard(Static):
                             self.app.vm_service.unsuppress_vm_events(self.internal_id)
 
                 self.app.push_screen(
-                    ConfirmationDialog(f"Are you sure you want to discard changes in '{target_disk}' and revert to its backing file? This action cannot be undone."),
+                    ConfirmationDialog(DialogMessages.CONFIRM_DISCARD_CHANGES.format(target_disk=target_disk)),
                     on_confirm
                 )
 
@@ -1191,7 +1232,7 @@ class VMCard(Static):
                 proceed_with_discard(overlay_disks[0])
             else:
                 self.app.push_screen(
-                    SelectDiskModal(overlay_disks, "Select overlay disk to discard:"),
+                    SelectDiskModal(overlay_disks, StaticText.SELECT_OVERLAY_DISCARD),
                     proceed_with_discard
                 )
 
@@ -1217,7 +1258,7 @@ class VMCard(Static):
 
             def on_confirm(confirmed: bool):
                 if confirmed:
-                    progress_modal = ProgressModal(title=f"Committing changes for {self.name}...")
+                    progress_modal = ProgressModal(title=ProgressMessages.COMMITTING_CHANGES_FOR.format(name=self.name))
                     self.app.push_screen(progress_modal)
 
                     def do_commit():
@@ -1236,7 +1277,7 @@ class VMCard(Static):
                     self.app.worker_manager.run(do_commit, name=f"commit_{self.name}")
 
             self.app.push_screen(
-                ConfirmationDialog(f"Are you sure you want to merge changes from '{target_disk}' into its backing file?"),
+                ConfirmationDialog(DialogMessages.CONFIRM_MERGE_CHANGES.format(target_disk=target_disk)),
                 on_confirm
             )
 
@@ -1751,10 +1792,10 @@ class VMCard(Static):
                                 pane = tabbed_content.get_tab("snapshot-tab")
                                 if snapshot_count > 0:
                                     latest = snapshot_summary.get('latest')
-                                    info = f"Latest: {latest['name']} ({latest['time']})" if latest else "Unknown"
+                                    info = f"{StaticText.LATEST_SNAPSHOT} {latest['name']} ({latest['time']})" if latest else "Unknown"
                                     pane.tooltip = f"{info}\nTotal: {snapshot_count}"
                                 else:
-                                    pane.tooltip = "No Snapshots created"
+                                    pane.tooltip = StaticText.NO_SNAPSHOTS_CREATED
                             except Exception:
                                 pass