Merge pull request #30 from aacater/main
Option to filter guests by type
This commit is contained in:
		
						commit
						02df87523d
					
				@ -13,7 +13,8 @@ kiosk = False
 | 
				
			|||||||
fullscreen = True
 | 
					fullscreen = True
 | 
				
			||||||
# Enable displaying SPICE ini file before opening virt-viewer
 | 
					# Enable displaying SPICE ini file before opening virt-viewer
 | 
				
			||||||
inidebug = False
 | 
					inidebug = False
 | 
				
			||||||
 | 
					# Select which guest types to display. Acceptable values: both, lxc, qemu
 | 
				
			||||||
 | 
					guest_type = both
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[Authentication]
 | 
					[Authentication]
 | 
				
			||||||
# This is the authentication backend that will be used to authenticate
 | 
					# This is the authentication backend that will be used to authenticate
 | 
				
			||||||
@ -26,7 +27,7 @@ tls_verify = false
 | 
				
			|||||||
#user = user
 | 
					#user = user
 | 
				
			||||||
# API Token Name
 | 
					# API Token Name
 | 
				
			||||||
#token_name = dvi
 | 
					#token_name = dvi
 | 
				
			||||||
#API Token Value
 | 
					# API Token Value
 | 
				
			||||||
#token_value = xxx-x-x-x-xxx
 | 
					#token_value = xxx-x-x-x-xxx
 | 
				
			||||||
 | 
					
 | 
				
			||||||
[Hosts]
 | 
					[Hosts]
 | 
				
			||||||
 | 
				
			|||||||
							
								
								
									
										10
									
								
								vdiclient.py
									
									
									
									
									
								
							
							
						
						
									
										10
									
								
								vdiclient.py
									
									
									
									
									
								
							@ -38,6 +38,7 @@ class G:
 | 
				
			|||||||
	inidebug = False
 | 
						inidebug = False
 | 
				
			||||||
	addl_params = None
 | 
						addl_params = None
 | 
				
			||||||
	theme = 'LightBlue'
 | 
						theme = 'LightBlue'
 | 
				
			||||||
 | 
						guest_type = 'both'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
def get_dpi():
 | 
					def get_dpi():
 | 
				
			||||||
	import ctypes
 | 
						import ctypes
 | 
				
			||||||
@ -113,6 +114,8 @@ def loadconfig(config_location = None):
 | 
				
			|||||||
			G.fullscreen = config['General'].getboolean('fullscreen')
 | 
								G.fullscreen = config['General'].getboolean('fullscreen')
 | 
				
			||||||
		if 'inidebug' in config['General']:
 | 
							if 'inidebug' in config['General']:
 | 
				
			||||||
			G.inidebug = config['General'].getboolean('inidebug')
 | 
								G.inidebug = config['General'].getboolean('inidebug')
 | 
				
			||||||
 | 
							if 'guest_type' in config['General']:
 | 
				
			||||||
 | 
								G.guest_type = config['General']['guest_type']
 | 
				
			||||||
	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
 | 
				
			||||||
@ -187,7 +190,12 @@ def getvms():
 | 
				
			|||||||
	vms = []
 | 
						vms = []
 | 
				
			||||||
	try:
 | 
						try:
 | 
				
			||||||
		for vm in G.proxmox.cluster.resources.get(type='vm'):
 | 
							for vm in G.proxmox.cluster.resources.get(type='vm'):
 | 
				
			||||||
			vms.append(vm)
 | 
								if vm['template']:
 | 
				
			||||||
 | 
									continue
 | 
				
			||||||
 | 
								if G.guest_type == 'both':
 | 
				
			||||||
 | 
									vms.append(vm)
 | 
				
			||||||
 | 
								elif G.guest_type == vm['type']:
 | 
				
			||||||
 | 
									vms.append(vm)
 | 
				
			||||||
		return vms
 | 
							return vms
 | 
				
			||||||
	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')
 | 
				
			||||||
 | 
				
			|||||||
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user