Compare commits
11 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3762af5d8c | ||
|
|
ed2b8220f1 | ||
|
|
4a4f8df5f6 | ||
|
|
ff44f186c2 | ||
|
|
e8bdbdf67c | ||
|
|
c2fe33eda5 | ||
|
|
fb981b8a51 | ||
|
|
b32d38338b | ||
|
|
e848a938df | ||
|
|
8dff999823 | ||
|
|
48c1e6f9d3 |
@@ -10,7 +10,7 @@ This project's focus is to create a simple VDI client intended for mass deployme
|
|||||||
|
|
||||||
## Windows Installation
|
## Windows Installation
|
||||||
|
|
||||||
You **MUST** install virt-viewer prior to using PVE VDI client, you may download it from the [official Virtual Machine Manager](https://virt-manager.org/download) site.
|
You **MUST** install virt-viewer prior to using PVE VDI client, you may download it from the [official Virtual Machine Manager](https://virt-manager.org/download.html) site.
|
||||||
|
|
||||||
Please visit the [releases](https://github.com/joshpatten/PVE-VDIClient/releases) section to download a prebuilt MSI package
|
Please visit the [releases](https://github.com/joshpatten/PVE-VDIClient/releases) section to download a prebuilt MSI package
|
||||||
|
|
||||||
|
|||||||
2
dist/vdiclient.json
vendored
2
dist/vdiclient.json
vendored
@@ -1,6 +1,6 @@
|
|||||||
{
|
{
|
||||||
"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
|
"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
|
||||||
"version" : "1.2.01",
|
"version" : "1.2.04",
|
||||||
"product_name" : "VDI Client",
|
"product_name" : "VDI Client",
|
||||||
"manufacturer" : "Josh Patten",
|
"manufacturer" : "Josh Patten",
|
||||||
"name" : "VDI Client",
|
"name" : "VDI Client",
|
||||||
|
|||||||
@@ -17,6 +17,9 @@ inidebug = False
|
|||||||
guest_type = both
|
guest_type = both
|
||||||
# Show VM option for resetting VM
|
# Show VM option for resetting VM
|
||||||
#show_reset = True
|
#show_reset = True
|
||||||
|
# Set Window Dimensions. Only use if window isn't sizing properly
|
||||||
|
#window_width = 800
|
||||||
|
#window_height = 600
|
||||||
|
|
||||||
[Authentication]
|
[Authentication]
|
||||||
# This is the authentication backend that will be used to authenticate
|
# This is the authentication backend that will be used to authenticate
|
||||||
|
|||||||
25
vdiclient.py
25
vdiclient.py
@@ -1,4 +1,4 @@
|
|||||||
#!/usr/bin/python3
|
#!/usr/bin/env python3
|
||||||
import proxmoxer # pip install proxmoxer
|
import proxmoxer # pip install proxmoxer
|
||||||
import PySimpleGUI as sg # pip install PySimpleGUI
|
import PySimpleGUI as sg # pip install PySimpleGUI
|
||||||
gui = 'TK'
|
gui = 'TK'
|
||||||
@@ -39,6 +39,8 @@ class G:
|
|||||||
addl_params = None
|
addl_params = None
|
||||||
theme = 'LightBlue'
|
theme = 'LightBlue'
|
||||||
guest_type = 'both'
|
guest_type = 'both'
|
||||||
|
width = None
|
||||||
|
height = None
|
||||||
|
|
||||||
def loadconfig(config_location = None):
|
def loadconfig(config_location = None):
|
||||||
if config_location:
|
if config_location:
|
||||||
@@ -100,6 +102,10 @@ def loadconfig(config_location = None):
|
|||||||
G.guest_type = config['General']['guest_type']
|
G.guest_type = config['General']['guest_type']
|
||||||
if 'show_reset' in config['General']:
|
if 'show_reset' in config['General']:
|
||||||
G.show_reset = config['General'].getboolean('show_reset')
|
G.show_reset = config['General'].getboolean('show_reset')
|
||||||
|
if 'window_width' in config['General']:
|
||||||
|
G.width = config['General'].getint('window_width')
|
||||||
|
if 'window_height' in config['General']:
|
||||||
|
G.height = config['General'].getint('window_height')
|
||||||
if not 'Authentication' in config:
|
if not 'Authentication' in config:
|
||||||
win_popup_button(f'Unable to read supplied configuration:\nNo `Authentication` section defined!', 'OK')
|
win_popup_button(f'Unable to read supplied configuration:\nNo `Authentication` section defined!', 'OK')
|
||||||
return False
|
return False
|
||||||
@@ -204,6 +210,9 @@ def getvms(listonly = False):
|
|||||||
except proxmoxer.core.ResourceException as e:
|
except proxmoxer.core.ResourceException as e:
|
||||||
win_popup_button(f"Unable to display list of VMs:\n {e!r}", 'OK')
|
win_popup_button(f"Unable to display list of VMs:\n {e!r}", 'OK')
|
||||||
return False
|
return False
|
||||||
|
except requests.exceptions.ConnectionError as e:
|
||||||
|
print(f"Encountered error when querying proxmox: {e!r}")
|
||||||
|
return False
|
||||||
|
|
||||||
def setvmlayout(vms):
|
def setvmlayout(vms):
|
||||||
layout = []
|
layout = []
|
||||||
@@ -215,7 +224,6 @@ def setvmlayout(vms):
|
|||||||
layoutcolumn = []
|
layoutcolumn = []
|
||||||
for vm in vms:
|
for vm in vms:
|
||||||
if not vm["status"] == "unknown":
|
if not vm["status"] == "unknown":
|
||||||
print(vm)
|
|
||||||
vmkeyname = f'-VM|{vm["vmid"]}-'
|
vmkeyname = f'-VM|{vm["vmid"]}-'
|
||||||
connkeyname = f'-CONN|{vm["vmid"]}-'
|
connkeyname = f'-CONN|{vm["vmid"]}-'
|
||||||
resetkeyname = f'-RESET|{vm["vmid"]}-'
|
resetkeyname = f'-RESET|{vm["vmid"]}-'
|
||||||
@@ -247,7 +255,7 @@ def setvmlayout(vms):
|
|||||||
layoutcolumn.append(tmplayout)
|
layoutcolumn.append(tmplayout)
|
||||||
layoutcolumn.append([sg.HorizontalSeparator()])
|
layoutcolumn.append([sg.HorizontalSeparator()])
|
||||||
if len(vms) > 5: # We need a scrollbar
|
if len(vms) > 5: # We need a scrollbar
|
||||||
layout.append([sg.Column(layoutcolumn, scrollable = True, size = [450*G.scaling, None] )])
|
layout.append([sg.Column(layoutcolumn, scrollable = True, size = [None, None] )])
|
||||||
else:
|
else:
|
||||||
for row in layoutcolumn:
|
for row in layoutcolumn:
|
||||||
layout.append(row)
|
layout.append(row)
|
||||||
@@ -507,26 +515,29 @@ def showvms():
|
|||||||
layout = setvmlayout(vms)
|
layout = setvmlayout(vms)
|
||||||
|
|
||||||
if G.icon:
|
if G.icon:
|
||||||
window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=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, size=(G.width, G.height), icon=G.icon)
|
||||||
else:
|
else:
|
||||||
window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, no_titlebar=G.kiosk)
|
window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=True, resizable=False, size=(G.width, G.height), no_titlebar=G.kiosk)
|
||||||
timer = datetime.now()
|
timer = datetime.now()
|
||||||
while True:
|
while True:
|
||||||
if (datetime.now() - timer).total_seconds() > 5:
|
if (datetime.now() - timer).total_seconds() > 5:
|
||||||
timer = datetime.now()
|
timer = datetime.now()
|
||||||
newvmlist = getvms(listonly = True)
|
newvmlist = getvms(listonly = True)
|
||||||
|
if newvmlist:
|
||||||
if vmlist != newvmlist:
|
if vmlist != newvmlist:
|
||||||
vmlist = newvmlist.copy()
|
vmlist = newvmlist.copy()
|
||||||
vms = getvms()
|
vms = getvms()
|
||||||
|
if vms:
|
||||||
layout = setvmlayout(vms)
|
layout = setvmlayout(vms)
|
||||||
window.close()
|
window.close()
|
||||||
if G.icon:
|
if G.icon:
|
||||||
window = sg.Window(G.title, layout, return_keyboard_events=True, finalize=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, size=(G.width, G.height), icon=G.icon)
|
||||||
else:
|
else:
|
||||||
window = sg.Window(G.title, layout, return_keyboard_events=True,finalize=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, size=(G.width, G.height))
|
||||||
window.bring_to_front()
|
window.bring_to_front()
|
||||||
else: # Refresh existing vm status
|
else: # Refresh existing vm status
|
||||||
newvms = getvms()
|
newvms = getvms()
|
||||||
|
if newvms:
|
||||||
for vm in newvms:
|
for vm in newvms:
|
||||||
vmkeyname = f'-VM|{vm["vmid"]}-'
|
vmkeyname = f'-VM|{vm["vmid"]}-'
|
||||||
connkeyname = f'-CONN|{vm["vmid"]}-'
|
connkeyname = f'-CONN|{vm["vmid"]}-'
|
||||||
|
|||||||
Reference in New Issue
Block a user