csmith1865/obscreen
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 16 Wiki Activity

get all ip addresses

Browse Source
This commit is contained in:
jr-k 2024-07-17 01:26:15 +02:00
parent 7a99fd6b0b
commit 7df05960b1
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/service/Sysinfo.py
View File

@ -124,12 +124,12 @@ def get_all_sysinfo():
"sysinfo_os_version": get_os_version(), "sysinfo_os_version": get_os_version(),
"sysinfo_install_directory": get_working_directory() "sysinfo_install_directory": get_working_directory()
} }
network_info = get_network_info() network_info = get_network_info(all=True)
if isinstance(network_info, dict): if isinstance(network_info, list) and len(network_info) > 0:
infos["sysinfo_network_interface"] = network_info['interface'] infos["sysinfo_network_interface"] = ", ".join([iface['interface'] for iface in network_info])
infos["sysinfo_mac_address"] = network_info['mac_address'] infos["sysinfo_mac_address"] = ", ".join([iface['mac_address'] for iface in network_info])
infos["sysinfo_ip_address"] = network_info['ip_address'] infos["sysinfo_ip_address"] = ", ".join([iface['ip_address'] for iface in network_info])
else: else:
infos["sysinfo_ip_address"] = 'common_unknown_ipaddr' infos["sysinfo_ip_address"] = 'common_unknown_ipaddr'

5
views/player/default.jinja.html
View File

@ -89,8 +89,9 @@
}; };
const addIp = function(ip, $container) { const addIp = function(ip, $container) {
const href = manage_url_template.replace('%ipaddr%', '<span>'+ip+'</span>'); const href_label = manage_url_template.replace('%ipaddr%', '<span>'+ip+'</span>');
const link = '<a href="' + href + '" target="_blank">' + href + '</a>'; const href = manage_url_template.replace('%ipaddr%', ip);
const link = '<a href="' + href + '" target="_blank">' + href_label + '</a>';
const $ipaddr = document.createElement('li'); const $ipaddr = document.createElement('li');
Object.assign($ipaddr, { className: 'ipaddr'}); Object.assign($ipaddr, { className: 'ipaddr'});
$ipaddr.innerHTML = link; $ipaddr.innerHTML = link;