Compare commits
10 Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
3762af5d8c | ||
|
|
ed2b8220f1 | ||
|
|
4a4f8df5f6 | ||
|
|
ff44f186c2 | ||
|
|
e8bdbdf67c | ||
|
|
c2fe33eda5 | ||
|
|
fb981b8a51 | ||
|
|
b32d38338b | ||
|
|
8dff999823 | ||
|
|
48c1e6f9d3 |
@@ -10,7 +10,7 @@ This project's focus is to create a simple VDI client intended for mass deployme
|
||||
|
||||
## 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
|
||||
|
||||
|
||||
2
dist/vdiclient.json
vendored
2
dist/vdiclient.json
vendored
@@ -1,6 +1,6 @@
|
||||
{
|
||||
"upgrade_guid" : "46cbad92-353e-4b28-9bee-83950991dad8",
|
||||
"version" : "1.2.02",
|
||||
"version" : "1.2.04",
|
||||
"product_name" : "VDI Client",
|
||||
"manufacturer" : "Josh Patten",
|
||||
"name" : "VDI Client",
|
||||
|
||||
67
vdiclient.py
67
vdiclient.py
@@ -1,4 +1,4 @@
|
||||
#!/usr/bin/python3
|
||||
#!/usr/bin/env python3
|
||||
import proxmoxer # pip install proxmoxer
|
||||
import PySimpleGUI as sg # pip install PySimpleGUI
|
||||
gui = 'TK'
|
||||
@@ -210,6 +210,9 @@ def getvms(listonly = False):
|
||||
except proxmoxer.core.ResourceException as e:
|
||||
win_popup_button(f"Unable to display list of VMs:\n {e!r}", 'OK')
|
||||
return False
|
||||
except requests.exceptions.ConnectionError as e:
|
||||
print(f"Encountered error when querying proxmox: {e!r}")
|
||||
return False
|
||||
|
||||
def setvmlayout(vms):
|
||||
layout = []
|
||||
@@ -221,7 +224,6 @@ def setvmlayout(vms):
|
||||
layoutcolumn = []
|
||||
for vm in vms:
|
||||
if not vm["status"] == "unknown":
|
||||
print(vm)
|
||||
vmkeyname = f'-VM|{vm["vmid"]}-'
|
||||
connkeyname = f'-CONN|{vm["vmid"]}-'
|
||||
resetkeyname = f'-RESET|{vm["vmid"]}-'
|
||||
@@ -253,7 +255,7 @@ def setvmlayout(vms):
|
||||
layoutcolumn.append(tmplayout)
|
||||
layoutcolumn.append([sg.HorizontalSeparator()])
|
||||
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:
|
||||
for row in layoutcolumn:
|
||||
layout.append(row)
|
||||
@@ -521,35 +523,38 @@ def showvms():
|
||||
if (datetime.now() - timer).total_seconds() > 5:
|
||||
timer = datetime.now()
|
||||
newvmlist = getvms(listonly = True)
|
||||
if vmlist != newvmlist:
|
||||
vmlist = newvmlist.copy()
|
||||
vms = getvms()
|
||||
layout = setvmlayout(vms)
|
||||
window.close()
|
||||
if 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:
|
||||
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()
|
||||
else: # Refresh existing vm status
|
||||
newvms = getvms()
|
||||
for vm in newvms:
|
||||
vmkeyname = f'-VM|{vm["vmid"]}-'
|
||||
connkeyname = f'-CONN|{vm["vmid"]}-'
|
||||
state = 'stopped'
|
||||
if vm['status'] == 'running':
|
||||
if 'lock' in vm:
|
||||
state = vm['lock']
|
||||
if state in ('suspending', 'suspended'):
|
||||
window[connkeyname].update(disabled=True)
|
||||
if state == 'suspended':
|
||||
state = 'starting'
|
||||
if newvmlist:
|
||||
if vmlist != newvmlist:
|
||||
vmlist = newvmlist.copy()
|
||||
vms = getvms()
|
||||
if vms:
|
||||
layout = setvmlayout(vms)
|
||||
window.close()
|
||||
if 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:
|
||||
state = vm['status']
|
||||
window[connkeyname].update(disabled=False)
|
||||
else:
|
||||
window[connkeyname].update(disabled=False)
|
||||
window[vmkeyname].update(f"State: {state}")
|
||||
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()
|
||||
else: # Refresh existing vm status
|
||||
newvms = getvms()
|
||||
if newvms:
|
||||
for vm in newvms:
|
||||
vmkeyname = f'-VM|{vm["vmid"]}-'
|
||||
connkeyname = f'-CONN|{vm["vmid"]}-'
|
||||
state = 'stopped'
|
||||
if vm['status'] == 'running':
|
||||
if 'lock' in vm:
|
||||
state = vm['lock']
|
||||
if state in ('suspending', 'suspended'):
|
||||
window[connkeyname].update(disabled=True)
|
||||
if state == 'suspended':
|
||||
state = 'starting'
|
||||
else:
|
||||
state = vm['status']
|
||||
window[connkeyname].update(disabled=False)
|
||||
else:
|
||||
window[connkeyname].update(disabled=False)
|
||||
window[vmkeyname].update(f"State: {state}")
|
||||
|
||||
event, values = window.read(timeout = 1000)
|
||||
if event in ('Logout', None):
|
||||
|
||||
Reference in New Issue
Block a user