Require 64 bit support

- Remove PySimpleGUIQt support, as it requires breaking changes for Python 3.11
- Build MSI based off Python 3.11 (significantly smaller due to removing Qt requirement)
- Bump version to 1.1.0

dist/createmsi.py

@@ -304,7 +304,8 @@ class PackageGenerator:
 			})
 
 	def path_to_id(self, pathname):
-			return pathname.replace('\\', '_').replace('/', '_').replace('#', '_').replace('-', '_')																								   
+			return pathname.replace('\\', '_').replace('/', '_').replace('#', '_').replace('-', '_').replace("+", "__")
+	
 	def create_xml(self, nodes, current_dir, parent_xml_node, staging_dir):
 		cur_node = nodes[current_dir]
 		if cur_node.files:
@@ -327,7 +328,7 @@ class PackageGenerator:
 				})
 			self.component_num += 1
 			for f in cur_node.files:
-				file_id = self.path_to_id(os.path.join(current_dir, f)).replace("+", "__")
+				file_id = self.path_to_id(os.path.join(current_dir, f))
 				ET.SubElement(comp_xml_node, 'File', {
 					'Id': file_id,
 					'Name': f,
@@ -335,7 +336,7 @@ class PackageGenerator:
 				})
 
 		for dirname in cur_node.dirs:
-			dir_id = os.path.join(current_dir, dirname).replace('\\', '_').replace('/', '_')
+			dir_id = self.path_to_id(os.path.join(current_dir, dirname))
 			dir_node = ET.SubElement(parent_xml_node, 'Directory', {
 				'Id': dir_id,
 				'Name': dirname,

dist/vdiclient.json

@@ -1,10 +1,11 @@
 {
 	"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
-	"version" : "1.0.8",
+	"version" : "1.1.0",
 	"product_name" : "VDI Client",
 	"manufacturer" : "Josh Patten",
 	"name" : "VDI Client",
 	"name_base" : "vdiclient",
+	"arch": 64,
 	"comments" : "This is the Proxmox VDI client. This client interfaces with Proxmox requires that virt-viewer be installed.",
 	"installdir" : "VDIClient",
 	"installscope" : "perMachine",

requirements.bat

@@ -1,6 +1,6 @@
 @echo off
 pip install pyinstaller
 pip install proxmoxer
-pip install PySimpleGUIQt
+pip install PySimpleGUI
 pip install requests
 pip install pywin32

requirements.sh

@@ -1,6 +1,4 @@
 #!/bin/bash
 pip3 install proxmoxer
-pip3 install PySimpleGUIQt
-# If PySimpleGUIQt fails, VDIClient will fall back to PySimpleGUI
 pip3 install PySimpleGUI
 pip3 install requests

vdiclient.ini.example

@@ -13,7 +13,8 @@ kiosk = False
 fullscreen = True
 # Enable displaying SPICE ini file before opening virt-viewer
 inidebug = False
-
+# Select which guest types to display. Acceptable values: both, lxc, qemu
+guest_type = both
 
 [Authentication]
 # This is the authentication backend that will be used to authenticate
@@ -26,7 +27,7 @@ tls_verify = false
 #user = user
 # API Token Name
 #token_name = dvi
-#API Token Value
+# API Token Value
 #token_value = xxx-x-x-x-xxx
 
 [Hosts]

vdiclient.py

@@ -1,11 +1,7 @@
 #!/usr/bin/python3
 import proxmoxer # pip install proxmoxer
-try:
+import PySimpleGUI as sg # pip install PySimpleGUI
-	import PySimpleGUIQt as sg # pip install PySimpleGUIQt
+gui = 'TK'
-	gui = 'QT'
-except ImportError:
-	import PySimpleGUI as sg # pip install PySimpleGUI
-	gui = 'TK'
 import requests
 from configparser import ConfigParser
 import random
@@ -38,6 +34,7 @@ class G:
 	inidebug = False
 	addl_params = None
 	theme = 'LightBlue'
+	guest_type = 'both'
 
 def get_dpi():
 	import ctypes
@@ -113,6 +110,8 @@ def loadconfig(config_location = None):
 			G.fullscreen = config['General'].getboolean('fullscreen')
 		if 'inidebug' in config['General']:
 			G.inidebug = config['General'].getboolean('inidebug')
+		if 'guest_type' in config['General']:
+			G.guest_type = config['General']['guest_type']
 	if not 'Authentication' in config:
 		win_popup_button(f'Unable to read supplied configuration:\nNo `Authentication` section defined!', 'OK')
 		return False
@@ -151,6 +150,7 @@ def win_popup(message):
 	layout = [[sg.Text(message)]]
 	window = sg.Window('Message', layout, no_titlebar=True, keep_on_top=True, finalize=True)
 	window.bring_to_front()
+	_, _ = window.read(timeout=1) # Fixes a black screen bug
 	return window
 	
 def win_popup_button(message, button):
@@ -187,7 +187,12 @@ def getvms():
 	vms = []
 	try:
 		for vm in G.proxmox.cluster.resources.get(type='vm'):
-			vms.append(vm)
+			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)
 		return vms
 	except proxmoxer.core.ResourceException as e:
 		win_popup_button(f"Unable to display list of VMs:\n {e!r}", 'OK')
@@ -476,4 +481,6 @@ def main():
 						return 0
 				else:
 					return
-sys.exit(main())
+
+if __name__ == '__main__':
+	sys.exit(main())