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

vmanager/webconsole_manager.py

@@ -17,7 +17,7 @@ from urllib.parse import urlparse
 
 import libvirt
 
-from .constants import AppInfo
+from .constants import AppInfo, ErrorMessages, SuccessMessages
 from .events import VmCardUpdateRequest
 from .config import load_config, get_log_path
 from .vm_queries import get_vm_graphics_info
@@ -153,12 +153,12 @@ wp.websockify_init()
             graphics_info = get_vm_graphics_info(root)
 
             if graphics_info.get('type') != 'vnc':
-                self.app.call_from_thread(self.app.show_error_message, "Web console only supports VNC graphics.")
+                self.app.call_from_thread(self.app.show_error_message, ErrorMessages.WEBCONSOLE_VNC_ONLY)
                 return
 
             vnc_port = graphics_info.get('port')
             if not vnc_port or vnc_port == '-1':
-                self.app.call_from_thread(self.app.show_error_message, "Could not determine VNC port for the VM.")
+                self.app.call_from_thread(self.app.show_error_message, ErrorMessages.COULD_NOT_DETERMINE_VNC_PORT)
                 return
 
             is_remote_ssh = WebConsoleManager.is_remote_connection(conn.getURI())
@@ -173,7 +173,7 @@ wp.websockify_init()
                     self._launch_websockify(uuid, vm_name, vnc_target_host, vnc_target_port, ssh_info)
 
         except (libvirt.libvirtError, FileNotFoundError, Exception) as e:
-            self.app.call_from_thread(self.app.show_error_message, f"Failed to start web console: {e}")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.FAILED_TO_START_WEBCONSOLE_TEMPLATE.format(error=e))
             logging.error(f"Error during web console startup for VM {vm_name}: {e}", exc_info=True)
 
     def stop_console(self, uuid: str, vm_name: str):
@@ -217,7 +217,7 @@ wp.websockify_init()
 
         self.remove_session(uuid)
         self.app.post_message(VmCardUpdateRequest(uuid))
-        self.app.call_from_thread(self.app.show_success_message, "Web console stopped.")
+        self.app.call_from_thread(self.app.show_success_message, SuccessMessages.WEBCONSOLE_STOPPED)
 
     def _get_next_available_port(self, remote_host: str | None = None) -> int | None:
         """
@@ -296,7 +296,7 @@ wp.websockify_init()
         # Find a free port for websockify on the remote server.
         web_port = self._get_next_available_port(remote_user_host)
         if not web_port:
-            self.app.call_from_thread(self.app.show_error_message, "Could not find a free port for the web console (all ports in range used by other sessions).")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.NO_FREE_WEBCONSOLE_PORT)
             return
 
         remote_websockify_path = self.config.get('websockify_path', '/usr/bin/websockify')
@@ -342,15 +342,15 @@ wp.websockify_init()
                 cert_status = stdout_lines[0]
                 if "user_cert" in cert_status:
                     url_scheme = "https"
-                    self.app.call_from_thread(self.app.show_success_message, "Remote user cert/key found, using secure wss connection.")
+                    self.app.call_from_thread(self.app.show_success_message, SuccessMessages.REMOTE_USER_CERT_FOUND)
                     remote_websockify_cmd_list.extend(["--cert", remote_cert_file, "--key", remote_key_file])
                 elif "system_cert" in cert_status:
                     url_scheme = "https"
-                    self.app.call_from_thread(self.app.show_success_message, "Remote system cert/key found, using secure wss connection.")
+                    self.app.call_from_thread(self.app.show_success_message, SuccessMessages.REMOTE_SYSTEM_CERT_FOUND)
                     remote_websockify_cmd_list.extend(["--cert", system_cert_file, "--key", system_key_file])
                 else:
                     # Attempt to generate keys remotely
-                    self.app.call_from_thread(self.app.show_success_message, "No remote cert/key found. Attempting to generate in system directory...")
+                    self.app.call_from_thread(self.app.show_success_message, SuccessMessages.NO_REMOTE_CERT_FOUND_GENERATING)
                     gen_msgs = generate_webconsole_keys_if_needed(config_dir="/etc/" + AppInfo.name + "/keys", remote_host=remote_user_host)
 
                     failed_gen = False
@@ -366,7 +366,7 @@ wp.websockify_init()
                         url_scheme = "https"
                         remote_websockify_cmd_list.extend(["--cert", system_cert_file, "--key", system_key_file])
                     else:
-                        self.app.call_from_thread(self.app.show_error_message, f"Remote key generation failed. Falling back to insecure ws connection.")
+                        self.app.call_from_thread(self.app.show_error_message, ErrorMessages.REMOTE_KEY_GENERATION_FAILED)
 
                 if len(stdout_lines) > 1:
                     remote_novnc_path = stdout_lines[1]
@@ -381,7 +381,7 @@ wp.websockify_init()
 
         except (subprocess.CalledProcessError, subprocess.TimeoutExpired, FileNotFoundError) as e:
             logging.warning(f"Could not check for remote certs/novnc: {e}. Proceeding without SSL options and default novnc path.")
-            self.app.call_from_thread(self.app.show_success_message, "Could not check for remote cert/key, using insecure ws connection.")
+            self.app.call_from_thread(self.app.show_success_message, SuccessMessages.NO_REMOTE_CERT_CHECK_INSECURE)
 
         # Build SSH command with custom port if needed
         ssh_base_args = ["ssh"]
@@ -433,7 +433,7 @@ wp.websockify_init()
             proc.stdout.close()
 
         if remote_pid is None:
-            self.app.call_from_thread(self.app.show_error_message, f"Failed to start remote websockify for [b]{vm_name}[/b]. Check logs.")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.FAILED_TO_START_REMOTE_WEBSOCKIFY_TEMPLATE.format(vm_name=vm_name))
             try:
                 proc.terminate()
             except:
@@ -448,7 +448,7 @@ wp.websockify_init()
             if result.returncode != 0:
                 # Process is not alive
                 logging.error(f"Remote websockify process {remote_pid} on {remote_user_host} crashed after launch.")
-                self.app.call_from_thread(self.app.show_error_message, f"Remote web console process for [b]{vm_name}[/b] failed to start or crashed. Check remote logs.")
+                self.app.call_from_thread(self.app.show_error_message, ErrorMessages.REMOTE_WEBCONSOLE_CRASHED_TEMPLATE.format(vm_name=vm_name))
                 # Clean up the local ssh process
                 try:
                     proc.terminate()
@@ -472,7 +472,7 @@ wp.websockify_init()
                 )
             except:
                 pass
-            self.app.call_from_thread(self.app.show_error_message, "Could not find a free local port for SSH tunnel.")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.NO_FREE_LOCAL_PORT_FOR_SSH_TUNNEL)
             return
 
         # Create control socket for the tunnel
@@ -510,7 +510,7 @@ wp.websockify_init()
                 )
             except:
                 pass
-            self.app.call_from_thread(self.app.show_error_message, f"Failed to create SSH tunnel: {e}")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.FAILED_TO_CREATE_SSH_TUNNEL_TEMPLATE.format(error=e))
             return
 
 
@@ -557,7 +557,7 @@ wp.websockify_init()
         if not is_remote_ssh:
             return vnc_target_host, vnc_port, {}
 
-        self.app.call_from_thread(self.app.show_success_message, "Remote connection detected. Setting up SSH tunnel...")
+        self.app.call_from_thread(self.app.show_success_message, SuccessMessages.REMOTE_CONNECTION_SSH_TUNNEL_SETUP)
         parsed_uri = urlparse(conn.getURI())
         user = parsed_uri.username
         host = parsed_uri.hostname
@@ -569,7 +569,7 @@ wp.websockify_init()
 
         tunnel_port = self._get_next_available_port(None)
         if not tunnel_port:
-            self.app.call_from_thread(self.app.show_error_message, "Could not find a free port for the SSH tunnel.")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.NO_FREE_LOCAL_PORT_FOR_SSH_TUNNEL)
             return None, None, {}
 
 
@@ -591,9 +591,9 @@ wp.websockify_init()
             logging.info(f"SSH tunnel created for VM {vm_name} via {control_socket}")
             return '127.0.0.1', tunnel_port, {"control_socket": control_socket}
         except FileNotFoundError:
-            self.app.call_from_thread(self.app.show_error_message, "SSH command not found. Cannot create tunnel.")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.SSH_COMMAND_NOT_FOUND)
         except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
-            self.app.call_from_thread(self.app.show_error_message, f"Failed to create SSH tunnel...")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.FAILED_TO_CREATE_SSH_TUNNEL_GENERIC)
             logging.error(f"SSH tunnel command failed: {' '.join(ssh_cmd)}")
 
         return None, None, {}
@@ -614,7 +614,7 @@ wp.websockify_init()
         """Launches the websockify process and shows the console dialog."""
         web_port = self._get_next_available_port(None)
         if not web_port:
-            self.app.call_from_thread(self.app.show_error_message, "Could not find a free port for the web console.")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.NO_FREE_WEBCONSOLE_PORT)
             return
 
         websockify_path = self.config.get('websockify_path', '/usr/bin/websockify')
@@ -638,7 +638,7 @@ wp.websockify_init()
             if cert_file.exists() and key_file.exists():
                 websockify_cmd.extend(["--cert", str(cert_file), "--key", str(key_file)])
                 url_scheme = "https"
-                self.app.call_from_thread(self.app.show_success_message, "Found cert/key, using secure wss connection.")
+                self.app.call_from_thread(self.app.show_success_message, SuccessMessages.LOCAL_CERT_FOUND)
 
             # Detach local process
             proc = subprocess.Popen(
@@ -686,7 +686,7 @@ wp.websockify_init()
             subprocess.run(stop_cmd, check=True, timeout=5, capture_output=True)
             logging.info(f"SSH tunnel stopped for VM {vm_name} using socket {control_socket}")
         except FileNotFoundError:
-            self.app.call_from_thread(self.app.show_error_message, "[b]ssh[/b] command not found.")
+            self.app.call_from_thread(self.app.show_error_message, ErrorMessages.SSH_COMMAND_NOT_FOUND)
         except (subprocess.CalledProcessError, subprocess.TimeoutExpired) as e:
             logging.warning(f"Could not stop SSH tunnel cleanly for VM {vm_name}: {e.stderr.decode() if e.stderr else e}")
         finally:

virtui_manager-1.1.6.dist-info/RECORD

@@ -1,65 +0,0 @@
-virtui_manager-1.1.6.dist-info/licenses/LICENSE,sha256=OXLcl0T2SZ8Pmy2_dmlvKuetivmyPd5m1q-Gyd-zaYY,35149
-vmanager/__init__.py,sha256=-gTpOgkPAOtbLwxz-U9i2uVtFW1SB9JhBguViXnQPJ8,15
-vmanager/config.py,sha256=OBMWtXBTnmws1ITjQ7D_C0LVMxzvGaRH8nZOlW9cbqk,3102
-vmanager/connection_manager.py,sha256=osk0EHJ0ua2wnDOu-9faK8fMd7s9TGsI6OtgxLAMTCI,12984
-vmanager/constants.py,sha256=q7oX6P0XKLOKEh6JxY1Jduhl5Q5aMFKk8DfKii7BvyM,5907
-vmanager/dialog.css,sha256=iWGRlTZ-D-wc2uQQTftPoqDpysrAD6qMMENE3HXXlQg,11300
-vmanager/events.py,sha256=yvjcYHMoDnnDKsMjfweZYnu0-U7lxQlB2uuIbtK5FeY,1556
-vmanager/firmware_manager.py,sha256=i64S8uPKIj-Qe-xpQYAvelOLYZc0yO31ome9qMT8ObQ,3360
-vmanager/libvirt_error_handler.py,sha256=aDumo2yNv9_rsbWjYtglt0ixQx8T2WTvgdEF8Uuanqw,1797
-vmanager/libvirt_utils.py,sha256=fj74jXP2fHrn5VRWf8kwSlf57VyvWIVZ8gF0POyPUCA,16048
-vmanager/network_manager.py,sha256=yMU3VXBCDDBKT2H7OL5s9XAD5uknfLPLH72e4228_Do,8627
-vmanager/remote_viewer.py,sha256=evFvp7ilKPuTf-YA4jCGMgO6dzdhbL1iea1lzETwWeU,89495
-vmanager/remote_viewer_gtk4.py,sha256=KIyejYq_PgmSL6yAUOnnloqpaIWdkYIPdoP6CmMaTOo,45994
-vmanager/storage_manager.py,sha256=-Z-NqRklx9PjRhbipvHReSjTDkGqv5uO79vZRAZVv0g,42195
-vmanager/utils.py,sha256=V3jOjBVD9Hf29hC6xIRkfPkjqx-_VL7eozMomaMqW9U,17254
-vmanager/virtui_dev.py,sha256=M2pJEZRNApqezkj4RdEJR9neEdc_7HV3KInVGy9QgiQ,3118
-vmanager/vm_actions.py,sha256=HpK7O2TtpMj-RjBGfF2hdPElwh-aIXh3HbJwjbrEs3w,117279
-vmanager/vm_cache.py,sha256=dxNj1TrkIAI8NW8SZj0QsfhHkjCrylQ5rgcvPN2zDnQ,1181
-vmanager/vm_migration.py,sha256=x0lpjAS8P_Q90nkyGA5BnR9UMrECaCy_9xvpiy4HRsM,16077
-vmanager/vm_provisioner.py,sha256=ZOlwHQzsa1Ur90wWtFl8oBUTfozT9wjURV6Yk1O6H84,46090
-vmanager/vm_queries.py,sha256=ExpcNW8c3jMDCDgkhsBXR4dKysIXd5bAw45YLqWx8jE,51227
-vmanager/vm_service.py,sha256=zEDkKEt1ShuA5RH9evexUTfxVWI4irHfkXCQHYmoHLA,70680
-vmanager/vmanager.css,sha256=bpgNxy4R4EUdO2_YR2iDU0rMdoTrurmDmG0pydkpROU,14108
-vmanager/vmanager.py,sha256=9WiiMJaxezCjqEJDWeHW3YR9HGBGYNAxaM_-UjT2AAE,75832
-vmanager/vmanager_cmd.py,sha256=IQtCozK6OvdjpIgL_umuv8LkHNk-W9DsQtsxpZ5fQRk,32161
-vmanager/vmcard.css,sha256=IIAzRH4GMaTD9K4qb9MEvATMgyfWdJb1bTHGm0Ebee4,3087
-vmanager/vmcard.py,sha256=s7zHzoDq8Ow_phm0sHzc3o08YqTCHT2MTVcmvxacpRs,98719
-vmanager/vmcard_pool.py,sha256=IgZZIHNNt3t8CAiKalpQpEF69KY8MZ-csuBrh71AmKM,3514
-vmanager/webconsole_manager.py,sha256=ZolHJRIDt5HLAjcT5-5HnEKtJPxdJlwx-yKgXBHEL4g,29028
-vmanager/wrapper.py,sha256=6aIz7YRN__Cl78XEBxqQ6g7tWMZ9S_8Nq6XaOtaivTM,1265
-vmanager/modals/__init__.py,sha256=Os1P7i7chUJCxGu4LOC_LJaJgpVOiOhxYzWNoW9Ubuw,36
-vmanager/modals/base_modals.py,sha256=quGmI_FnoD7UVemruvYsvtz1whhJCNVr2hzQ3tl0hak,1263
-vmanager/modals/bulk_modals.py,sha256=VsaOR20vVDkaqqnZhD9tJUao6WwTYmV2ZuPpnNQhnGI,3020
-vmanager/modals/cache_stats_modal.py,sha256=smPT_0396ilCv0DvxSj_1FE2xhFpBQj5MqG8Tdfk4ME,2318
-vmanager/modals/config_modal.py,sha256=DMNGqjej-nAvN9t1OqK-uaR_r6d1m4Vi1X5eX7D3ZTg,8301
-vmanager/modals/cpu_mem_pc_modals.py,sha256=puKOVeEqi36wzaXbKNyXjZQjCjXKntuIVTWKh5RsY38,9378
-vmanager/modals/custom_migration_modal.py,sha256=-kDRI8yeBJnh9jx5_ZJFWfXIfcmOZMO0dXUht3uowC8,2289
-vmanager/modals/disk_pool_modals.py,sha256=xme7vS52kkM4CBE3WduNfjqzJz5BAdVGxdD-HfMvw7o,28236
-vmanager/modals/howto_disk_modal.py,sha256=yHMy4GFB39YXV4PVFyJe2y_1WgoeBCIlwr20gZEjF5c,1193
-vmanager/modals/howto_network_modal.py,sha256=arSiPHlq_wW7QLzwBkH_L5O-E7UmvwMXiuaEVlAGJdk,1215
-vmanager/modals/howto_overlay_modal.py,sha256=EJYrrW9nJsD0qSXBKabFbAEP_R1MOodsyDxEDW-ONbc,1228
-vmanager/modals/howto_ssh_modal.py,sha256=e0I-ntbk8-DZSl9t2T3eKW_EBcQvVqiwdqQKa9HIylM,1177
-vmanager/modals/howto_virtiofs_modal.py,sha256=GSnKjSBAutOXa16EToyuOWHycLRf94Qdlnq1XcJGHd0,1209
-vmanager/modals/input_modals.py,sha256=PEfM2IHc8QFR4BZf5uSuJz-7uiclRq6z65cZES_GJpk,7719
-vmanager/modals/log_modal.py,sha256=WXzha9mm5dO9jOmTSO52gJnOmgO7ZkBRrjS2_MiYMyQ,1095
-vmanager/modals/migration_modals.py,sha256=MkuGeDBe1v-BxP7BjrpGB8KxQh4x-SZHHKD1c9mV5wE,20422
-vmanager/modals/network_modals.py,sha256=U8lKrLdW57WIpfzHDd_d5hqNTFrtWheF9CRvwnEqtzo,18506
-vmanager/modals/provisioning_modals.py,sha256=Yx7zO8Zvo0qVpW9ctRZg0RmzIwik-tevXADXn5AhEeg,28882
-vmanager/modals/select_server_modals.py,sha256=eAA9hmBjeK_2_AF7jRKyWcocj_LvmgP7ZFRp6H0NGi4,4994
-vmanager/modals/selection_modals.py,sha256=Pd8ZhQ-ezp2MUNT7SV0pdk2OpAYpI5YuuizaDJQTtek,6096
-vmanager/modals/server_modals.py,sha256=fQP8Sj7y7-i2UijS27yFvOywFAWiXdQcj27scYa2IoE,10191
-vmanager/modals/server_prefs_modals.py,sha256=AxRYfJm8Q-IFkKx1u3To_7yZkGhaPanabI-COdULD-k,39275
-vmanager/modals/utils_modals.py,sha256=ijJQZF68icCWNwmKFnoeS7avufjafc7Z4egaaB_79Xg,8675
-vmanager/modals/virsh_modals.py,sha256=t5TT8sNyb3vUJ0a7j6KpH8LdXAvjJ0U9L6NtulSB5x0,4782
-vmanager/modals/virtiofs_modals.py,sha256=R2R6Rcaeg3QLsUgC5v9BjJfvyXtXWVO_eL3iqchanuk,2145
-vmanager/modals/vm_type_info_modal.py,sha256=KlNGwPnpZSkkONoLI7eLp64eYgNYNlWaYiIukfugmL8,4218
-vmanager/modals/vmanager_modals.py,sha256=Ix4SxO_e8SfBg0B2iou6M5xk1DigO814e6iwD5kqkjY,7363
-vmanager/modals/vmcard_dialog.py,sha256=EYS19Ooy6KviTPLVzBjGEkALvKRYLJG9rksMHXRO0VU,18674
-vmanager/modals/vmdetails_modals.py,sha256=YE0u71-K-GV5n_38oIzCD2EvqTCIJmJcv3B1Ofej5Rg,149636
-vmanager/modals/xml_modals.py,sha256=iY981cqzVnDYOUo-kw1DHpW9I7IVAU1K7rFqqvxltOk,1653
-virtui_manager-1.1.6.dist-info/METADATA,sha256=rVmqF190noCHtV6z3ZsXhWjC-OoAfUmnn6pKC0-8v9c,5329
-virtui_manager-1.1.6.dist-info/WHEEL,sha256=wUyA8OaulRlbfwMtmQsvNngGrxQHAvkKcvRmdizlJi0,92
-virtui_manager-1.1.6.dist-info/entry_points.txt,sha256=hnJHxJyDFPSNdOaxmMYikXeoJMXG2llKG-l_Ygv7ges,163
-virtui_manager-1.1.6.dist-info/top_level.txt,sha256=fQ1nwH-4wZrf6Rc9HEHbudVahpy3TqeuMxgaaNHevxM,9
-virtui_manager-1.1.6.dist-info/RECORD,,