Merge pull request #47 from bekema/main

Prevent exceptions when a node is offline

README.md

@@ -24,7 +24,9 @@ you will need to download the latest 3.10 python release, and run the following
 
 Run the following commands on a Debian/Ubuntu Linux system to install the appropriate prerequisites
 
-    apt install python3-pip virt-viewer
+    apt install python3-pip virt-viewer git
+    git clone https://github.com/joshpatten/PVE-VDIClient.git
+    cd ./PVE-VDIClient/
     chmod +x requirements.sh
     ./requirements.sh
     cp vdiclient.py /usr/local/bin

dist/vdiclient.json

@@ -1,6 +1,6 @@
 {
 	"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
-	"version" : "1.1.0",
+	"version" : "1.1.01",
 	"product_name" : "VDI Client",
 	"manufacturer" : "Josh Patten",
 	"name" : "VDI Client",

vdiclient.ini.example

@@ -1,7 +1,7 @@
 [General]
 # This is the title that is diplayed to the user
 title = VDI Login
-# This is the PySimpleGui Theme that is used. Run pvevdi.py with flag `--list_themes` for a list of themes
+# This is the PySimpleGui Theme that is used. Run vdiclient.py with flag `--list_themes` for a list of themes
 theme = LightBlue
 # Program Icon
 icon = vdiicon.ico

vdiclient.py

@@ -3,9 +3,11 @@ import proxmoxer # pip install proxmoxer
 import PySimpleGUI as sg # pip install PySimpleGUI
 gui = 'TK'
 import requests
+from datetime import datetime
 from configparser import ConfigParser
 import random
 import sys
+import copy
 import os
 import subprocess
 from time import sleep
@@ -36,24 +38,6 @@ class G:
 	theme = 'LightBlue'
 	guest_type = 'both'
 
-def get_dpi():
-	import ctypes
-	import win32api # pip install pywin32
-	shcore = ctypes.windll.shcore
-	monitors = win32api.EnumDisplayMonitors()
-	hresult = shcore.SetProcessDpiAwareness(2)
-	assert hresult == 0
-	dpiX = ctypes.c_uint()
-	dpiY = ctypes.c_uint()
-	for i, monitor in enumerate(monitors):
-		shcore.GetDpiForMonitor(
-			monitor[0].handle,
-			0,
-			ctypes.byref(dpiX),
-			ctypes.byref(dpiY)
-		)
-		return dpiX.value/96
-
 def loadconfig(config_location = None):
 	if config_location:
 		config = ConfigParser(delimiters='=')
@@ -147,10 +131,12 @@ def loadconfig(config_location = None):
 	return True
 
 def win_popup(message):
-	layout = [[sg.Text(message)]]
-	window = sg.Window('Message', layout, no_titlebar=True, keep_on_top=True, finalize=True)
+	layout = [
+		[sg.Text(message)]
+	]
+	window = sg.Window('Message', layout, return_keyboard_events=True, no_titlebar=True, keep_on_top=True, finalize=True)
 	window.bring_to_front()
-	_, _ = window.read(timeout=1) # Fixes a black screen bug
+	_, _ = window.read(timeout=10) # Fixes a black screen bug
 	return window
 	
 def win_popup_button(message, button):
@@ -178,21 +164,35 @@ def setmainlayout():
 	if G.totp:
 		layout.append([sg.Text("OTP Key", size =(12*G.scaling, 1), font=["Helvetica", 12]), sg.InputText(key='-totp-', font=["Helvetica", 12])])
 	if G.kiosk:
-		layout.append([sg.Button("Log In", font=["Helvetica", 14])])
+		layout.append([sg.Button("Log In", font=["Helvetica", 14], bind_return_key=True)])
 	else:
-		layout.append([sg.Button("Log In", font=["Helvetica", 14]), sg.Button("Cancel", font=["Helvetica", 14])])
+		layout.append([sg.Button("Log In", font=["Helvetica", 14], bind_return_key=True), sg.Button("Cancel", font=["Helvetica", 14])])
 	return layout
 
-def getvms():
+def getvms(listonly = False):
 	vms = []
 	try:
+		nodes = []
+		for node in G.proxmox.cluster.resources.get(type='node'):
+			if node['status'] == 'online':
+				nodes.append(node['node'])
+
 		for vm in G.proxmox.cluster.resources.get(type='vm'):
+			if vm['node'] not in nodes:
+				continue
 			if 'template' in vm and vm['template']:
 				continue
-			if G.guest_type == 'both':
-				vms.append(vm)
-			elif G.guest_type == vm['type']:
-				vms.append(vm)
+			if G.guest_type == 'both' or G.guest_type == vm['type']:
+				if listonly:
+					vms.append(
+						{
+							'vmid': vm['vmid'],
+							'name': vm['name'],
+							'node': vm['node']
+						}
+					)
+				else:
+					vms.append(vm)
 		return vms
 	except proxmoxer.core.ResourceException as e:
 		win_popup_button(f"Unable to display list of VMs:\n {e!r}", 'OK')
@@ -209,7 +209,7 @@ def setvmlayout(vms):
 	for vm in vms:
 		if not vm["status"] == "unknown":
 			connkeyname = f'-CONN|{vm["vmid"]}-'
-			layoutcolumn.append([sg.Text(vm['name'], font=["Helvetica", 14]), sg.Button('Connect', font=["Helvetica", 14], key=connkeyname)])
+			layoutcolumn.append([sg.Text(vm['name'], font=["Helvetica", 14], size=(22*G.scaling, 1*G.scaling)), sg.Button('Connect', font=["Helvetica", 14], key=connkeyname)])
 			layoutcolumn.append([sg.HorizontalSeparator()])
 	if len(vms) > 5: # We need a scrollbar
 		layout.append([sg.Column(layoutcolumn, scrollable = True, size = [450*G.scaling, None] )])
@@ -414,18 +414,34 @@ def loginwindow():
 
 def showvms():
 	vms = getvms()
+	vmlist = getvms(listonly=True)
+	newvmlist = vmlist.copy()
 	if vms == False:
 		return False
 	if len(vms) < 1:
 		win_popup_button('No desktop instances found, please consult with your system administrator', 'OK')
 		return False
 	layout = setvmlayout(vms)
+
 	if G.icon:
-		window = sg.Window(G.title, layout, return_keyboard_events=True, resizable=False, no_titlebar=G.kiosk, icon=G.icon)
+		window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk, icon=G.icon)
 	else:
-		window = sg.Window(G.title, layout, return_keyboard_events=True, resizable=False, no_titlebar=G.kiosk)
+		window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk)
+	timer = datetime.now()
 	while True:
-		event, values = window.read()
+		if (datetime.now() - timer).total_seconds() > 10:
+			timer = datetime.now()
+			newvmlist = getvms(listonly = True)
+			if vmlist != newvmlist:
+				vmlist = newvmlist.copy()
+				layout = setvmlayout(getvms())
+				window.close()
+				if G.icon:
+					window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk, icon=G.icon)
+				else:
+					window = sg.Window(G.title, layout, return_keyboard_events=True,finalize=True, resizable=False, no_titlebar=G.kiosk)
+				window.bring_to_front()
+		event, values = window.read(timeout = 1000)
 		if event in ('Logout', None):
 			window.close()
 			return False
@@ -442,13 +458,7 @@ def showvms():
 	return True
 
 def main():
-	if os.name == 'nt' and gui == 'QT':
-		G.scaling = get_dpi()
-	else:
-		if gui == 'QT':
-			G.scaling = 1.0 #TODO FIXME: Figure out scaling on Linux
-		else:
-			G.scaling = 1 # TKinter requires integers
+	G.scaling = 1 # TKinter requires integers
 	config_location = None
 	if len(sys.argv) > 1:
 		if sys.argv[1] == '--list_themes':