add debug service and implemented monitors data parsing
This commit is contained in:
parent
f47e581fed
commit
8e749258af
@ -10,3 +10,4 @@ SERVICE_RESTART_COMPUTER = "restart_computer"
|
|||||||
SERVICE_CHANGE_MONITORS_CONFIG = "change_monitors_config"
|
SERVICE_CHANGE_MONITORS_CONFIG = "change_monitors_config"
|
||||||
SERVICE_STEAM_BIG_PICTURE = "steam_big_picture"
|
SERVICE_STEAM_BIG_PICTURE = "steam_big_picture"
|
||||||
SERVICE_CHANGE_AUDIO_CONFIG = "change_audio_config"
|
SERVICE_CHANGE_AUDIO_CONFIG = "change_audio_config"
|
||||||
|
SERVICE_DEBUG_INFO = "debug_info"
|
||||||
|
@ -1,6 +1,6 @@
|
|||||||
send_magic_packet:
|
send_magic_packet:
|
||||||
name: Send Magic Packet
|
name: Send Magic Packet
|
||||||
description: Send a 'magic packet' to awaken a device with 'Wake-On-LAN' capabilities.
|
description: Send a 'magic packet' to wake up a device with 'Wake-On-LAN' capabilities.
|
||||||
fields:
|
fields:
|
||||||
mac:
|
mac:
|
||||||
name: MAC Address
|
name: MAC Address
|
||||||
@ -139,3 +139,11 @@ change_audio_config:
|
|||||||
example: "Starship/Matisse HD Audio Controller Stereo Analog"
|
example: "Starship/Matisse HD Audio Controller Stereo Analog"
|
||||||
selector:
|
selector:
|
||||||
text:
|
text:
|
||||||
|
|
||||||
|
debug_info:
|
||||||
|
name: Debug Information
|
||||||
|
description: Display debug information to help with setup and troubleshooting. You can use this data (such as monitor resolutions, audio device names/IDs, etc.) with others services such as change_audio_config or change_monitors_config
|
||||||
|
target:
|
||||||
|
entity:
|
||||||
|
integration: easy_computer_manager
|
||||||
|
domain: switch
|
||||||
|
@ -23,7 +23,7 @@ from homeassistant.const import (
|
|||||||
CONF_PASSWORD,
|
CONF_PASSWORD,
|
||||||
CONF_PORT,
|
CONF_PORT,
|
||||||
CONF_USERNAME, )
|
CONF_USERNAME, )
|
||||||
from homeassistant.core import HomeAssistant
|
from homeassistant.core import HomeAssistant, ServiceResponse, SupportsResponse
|
||||||
from homeassistant.exceptions import HomeAssistantError
|
from homeassistant.exceptions import HomeAssistantError
|
||||||
from homeassistant.helpers import (
|
from homeassistant.helpers import (
|
||||||
config_validation as cv,
|
config_validation as cv,
|
||||||
@ -37,7 +37,7 @@ from paramiko.ssh_exception import AuthenticationException
|
|||||||
from . import utils
|
from . import utils
|
||||||
from .const import SERVICE_RESTART_TO_WINDOWS_FROM_LINUX, SERVICE_PUT_COMPUTER_TO_SLEEP, \
|
from .const import SERVICE_RESTART_TO_WINDOWS_FROM_LINUX, SERVICE_PUT_COMPUTER_TO_SLEEP, \
|
||||||
SERVICE_START_COMPUTER_TO_WINDOWS, SERVICE_RESTART_COMPUTER, SERVICE_RESTART_TO_LINUX_FROM_WINDOWS, \
|
SERVICE_START_COMPUTER_TO_WINDOWS, SERVICE_RESTART_COMPUTER, SERVICE_RESTART_TO_LINUX_FROM_WINDOWS, \
|
||||||
SERVICE_CHANGE_MONITORS_CONFIG, SERVICE_STEAM_BIG_PICTURE, SERVICE_CHANGE_AUDIO_CONFIG
|
SERVICE_CHANGE_MONITORS_CONFIG, SERVICE_STEAM_BIG_PICTURE, SERVICE_CHANGE_AUDIO_CONFIG, SERVICE_DEBUG_INFO
|
||||||
|
|
||||||
_LOGGER = logging.getLogger(__name__)
|
_LOGGER = logging.getLogger(__name__)
|
||||||
|
|
||||||
@ -139,6 +139,14 @@ async def async_setup_entry(
|
|||||||
SERVICE_CHANGE_AUDIO_CONFIG,
|
SERVICE_CHANGE_AUDIO_CONFIG,
|
||||||
)
|
)
|
||||||
|
|
||||||
|
# Register the service to print debug info
|
||||||
|
platform.async_register_entity_service(
|
||||||
|
SERVICE_DEBUG_INFO,
|
||||||
|
{},
|
||||||
|
SERVICE_DEBUG_INFO,
|
||||||
|
supports_response=SupportsResponse.ONLY
|
||||||
|
)
|
||||||
|
|
||||||
|
|
||||||
class ComputerSwitch(SwitchEntity):
|
class ComputerSwitch(SwitchEntity):
|
||||||
"""Representation of a computer switch."""
|
"""Representation of a computer switch."""
|
||||||
@ -335,3 +343,7 @@ class ComputerSwitch(SwitchEntity):
|
|||||||
)
|
)
|
||||||
|
|
||||||
self._state = False
|
self._state = False
|
||||||
|
|
||||||
|
def debug_info(self) -> ServiceResponse:
|
||||||
|
"""Prints debug info."""
|
||||||
|
return utils.get_debug_info(self._connection)
|
@ -263,32 +263,61 @@ def silent_install_nircmd(connection: Connection):
|
|||||||
return
|
return
|
||||||
|
|
||||||
|
|
||||||
def parse_gnome_monitor_config(output):
|
def get_monitors_config(connection: Connection) -> dict:
|
||||||
# SHOULD NOT BE USED YET, STILL IN DEVELOPMENT
|
|
||||||
"""Parse the output of the gnome-monitor-config command to get the current monitor configuration."""
|
"""Parse the output of the gnome-monitor-config command to get the current monitor configuration."""
|
||||||
|
|
||||||
monitors = []
|
if is_unix_system(connection):
|
||||||
current_monitor = None
|
result = connection.run("gnome-monitor-config list")
|
||||||
|
if result.return_code != 0:
|
||||||
|
raise HomeAssistantError(f"Could not get monitors config on system running at {connection.host}.")
|
||||||
|
|
||||||
for line in output.split('\n'):
|
monitors = []
|
||||||
monitor_match = re.match(r'^Monitor \[ (.+?) \] (ON|OFF)$', line)
|
current_monitor = None
|
||||||
if monitor_match:
|
|
||||||
if current_monitor:
|
|
||||||
monitors.append(current_monitor)
|
|
||||||
source, status = monitor_match.groups()
|
|
||||||
current_monitor = {'source': source, 'status': status, 'names': [], 'resolutions': []}
|
|
||||||
elif current_monitor:
|
|
||||||
display_name_match = re.match(r'^\s+display-name: (.+)$', line)
|
|
||||||
resolution_match = re.match(r'^\s+(\d+x\d+@\d+(?:\.\d+)?).*$', line)
|
|
||||||
if display_name_match:
|
|
||||||
current_monitor['names'].append(display_name_match.group(1).replace('"', ''))
|
|
||||||
elif resolution_match:
|
|
||||||
current_monitor['resolutions'].append(resolution_match.group(1))
|
|
||||||
|
|
||||||
if current_monitor:
|
for line in result.stdout.split('\n'):
|
||||||
monitors.append(current_monitor)
|
monitor_match = re.match(r'^Monitor \[ (.+?) \] (ON|OFF)$', line)
|
||||||
|
if monitor_match:
|
||||||
|
if current_monitor:
|
||||||
|
monitors.append(current_monitor)
|
||||||
|
source, status = monitor_match.groups()
|
||||||
|
current_monitor = {'source': source, 'status': status, 'names': [], 'resolutions': []}
|
||||||
|
elif current_monitor:
|
||||||
|
display_name_match = re.match(r'^\s+display-name: (.+)$', line)
|
||||||
|
resolution_match = re.match(r'^\s+(\d+x\d+@\d+(?:\.\d+)?).*$', line)
|
||||||
|
if display_name_match:
|
||||||
|
current_monitor['names'].append(display_name_match.group(1).replace('"', ''))
|
||||||
|
elif resolution_match:
|
||||||
|
# Don't include resolutions under 1280x720
|
||||||
|
if int(resolution_match.group(1).split('@')[0].split('x')[0]) >= 1280:
|
||||||
|
|
||||||
return monitors
|
# If there are already resolutions in the list, check if the framerate between the last is >1
|
||||||
|
if len(current_monitor['resolutions']) > 0:
|
||||||
|
last_resolution = current_monitor['resolutions'][-1]
|
||||||
|
last_resolution_size = last_resolution.split('@')[0]
|
||||||
|
this_resolution_size = resolution_match.group(1).split('@')[0]
|
||||||
|
|
||||||
|
# Only truncate some framerates if the resolution are the same
|
||||||
|
if last_resolution_size == this_resolution_size:
|
||||||
|
last_resolution_framerate = float(last_resolution.split('@')[1])
|
||||||
|
this_resolution_framerate = float(resolution_match.group(1).split('@')[1])
|
||||||
|
|
||||||
|
# If the difference between the last resolution framerate and this one is >1, ignore it
|
||||||
|
if last_resolution_framerate - 1 > this_resolution_framerate:
|
||||||
|
current_monitor['resolutions'].append(resolution_match.group(1))
|
||||||
|
else:
|
||||||
|
# If the resolution is different, this adds the new resolution
|
||||||
|
# to the list without truncating
|
||||||
|
current_monitor['resolutions'].append(resolution_match.group(1))
|
||||||
|
else:
|
||||||
|
# This is the first resolution, add it to the list
|
||||||
|
current_monitor['resolutions'].append(resolution_match.group(1))
|
||||||
|
|
||||||
|
if current_monitor:
|
||||||
|
monitors.append(current_monitor)
|
||||||
|
|
||||||
|
return monitors
|
||||||
|
else:
|
||||||
|
raise HomeAssistantError("Not implemented yet for Windows OS.")
|
||||||
|
|
||||||
|
|
||||||
def steam_big_picture(connection: Connection, action: str):
|
def steam_big_picture(connection: Connection, action: str):
|
||||||
@ -420,3 +449,39 @@ def change_audio_config(connection: Connection, volume: int, mute: bool, input_d
|
|||||||
f"Could not change audio config on system running on {connection.host}, check logs with debug")
|
f"Could not change audio config on system running on {connection.host}, check logs with debug")
|
||||||
else:
|
else:
|
||||||
raise HomeAssistantError("Not implemented yet for Windows OS.")
|
raise HomeAssistantError("Not implemented yet for Windows OS.")
|
||||||
|
|
||||||
|
|
||||||
|
def get_debug_info(connection: Connection):
|
||||||
|
"""Return debug information about the host system."""
|
||||||
|
|
||||||
|
data = {}
|
||||||
|
|
||||||
|
data_os = {
|
||||||
|
'name': get_operating_system(connection),
|
||||||
|
'version': get_operating_system_version(connection),
|
||||||
|
'is_unix': is_unix_system(connection)
|
||||||
|
}
|
||||||
|
|
||||||
|
data_ssh = {
|
||||||
|
'is_connected': connection.is_connected,
|
||||||
|
'username': connection.user,
|
||||||
|
'host': connection.host,
|
||||||
|
'port': connection.port
|
||||||
|
}
|
||||||
|
|
||||||
|
data_grub = {
|
||||||
|
'windows_entry': get_windows_entry_in_grub(connection)
|
||||||
|
}
|
||||||
|
|
||||||
|
data_audio = {
|
||||||
|
'speakers': get_audio_config(connection).get('sinks'),
|
||||||
|
'microphones': get_audio_config(connection).get('sources')
|
||||||
|
}
|
||||||
|
|
||||||
|
data['os'] = data_os
|
||||||
|
data['ssh'] = data_ssh
|
||||||
|
data['grub'] = data_grub
|
||||||
|
data['audio'] = data_audio
|
||||||
|
data['monitors'] = get_monitors_config(connection)
|
||||||
|
|
||||||
|
return data
|
||||||
|
Loading…
Reference in New Issue
Block a user