mgrotke/linuxrouter
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Development

Browse source
This commit is contained in:
Matthew Grotke 2026-06-07 00:21:08 -04:00
parent 563d82daf3
commit 70ccfe2c29
48 changed files with 549 additions and 578 deletions
Download patch file Download diff file Expand all files Collapse all files

30
docker/routlin-dash/app/pages/dhcpleases/view.py
View file

@ -3,10 +3,8 @@ import json
import os
import glob
from datetime import datetime, timezone
from config_utils import collect_layout_tokens, load_config, relative_time
from factory import (
load_json, build_table, table_token_key, iter_table_items, PAGES_DIR, e,
)
import config_utils
import factory
try:
import manuf as _manuf_mod
@ -42,8 +40,8 @@ def _vendor_cell(vendor):
if not display:
return '-'
if long:
return f'<span data-vendor-long="{e(long)}">{e(display)}</span>'
return e(display)
return f'<span data-vendor-long="{factory.e(long)}">{factory.e(display)}</span>'
return factory.e(display)
def _get_arp_table():
@ -93,7 +91,7 @@ def _parse_lease_secs(s):
def live_dhcp_leases():
rows = []
now = int(datetime.now(tz=timezone.utc).timestamp())
cfg = load_config()
cfg = config_utils.load_config()
vlans = cfg.get('vlans', [])
arp_table = _get_arp_table()
lease_macs = set()
@ -130,9 +128,9 @@ def live_dhcp_leases():
if obtained_ts is None:
lease_renewed = '-'
elif obtained_ts <= now:
lease_renewed = relative_time(obtained_ts, now, short=True) + ' ago'
lease_renewed = config_utils.relative_time(obtained_ts, now, short=True) + ' ago'
elif renews_ts and renews_ts > now:
lease_renewed = 'ETA ' + relative_time(renews_ts, now, short=True)
lease_renewed = 'ETA ' + config_utils.relative_time(renews_ts, now, short=True)
else:
lease_renewed = 'ETA soon'
mac_norm = parts[1].lower()
@ -141,8 +139,8 @@ def live_dhcp_leases():
desc = mac_to_desc.get(mac_norm)
name = res_h or device_h
if name:
desc_attr = f' data-hostname-desc="{e(desc)}"' if desc else ''
hostname_html = f'<span{desc_attr}>{e(name)}</span>' if desc_attr else e(name)
desc_attr = f' data-hostname-desc="{factory.e(desc)}"' if desc else ''
hostname_html = f'<span{desc_attr}>{factory.e(name)}</span>' if desc_attr else factory.e(name)
else:
hostname_html = '-'
arp_entry = arp_table.get(mac_norm, {})
@ -154,7 +152,7 @@ def live_dhcp_leases():
'vendor': _vendor_cell(_get_vendor(parts[1])),
'vlan_name': vlan_name,
'lease_renewed': lease_renewed,
'renews': 'in ' + relative_time(renews_ts or expiry, now, short=True),
'renews': 'in ' + config_utils.relative_time(renews_ts or expiry, now, short=True),
'status': _status_badge(arp_entry.get('state', '')),
})
except Exception:
@ -178,16 +176,16 @@ def live_dhcp_leases():
def collect_tokens(cfg):
tokens = collect_layout_tokens(cfg)
tokens = config_utils.collect_layout_tokens(cfg)
vlans = cfg.get('vlans', [])
vlan_names = [v.get('name', '') for v in vlans]
filter_opts = '<option value="all">All VLANs</option>' + ''.join(
f'<option value="{n}">{n}</option>' for n in vlan_names
)
tokens['VLAN_FILTER_OPTIONS'] = filter_opts
content = load_json(f'{PAGES_DIR}/dhcpleases/content.json')
for table_item in iter_table_items(content.get('items', [])):
content = factory.load_json(f'{factory.PAGES_DIR}/dhcpleases/content.json')
for table_item in factory.iter_table_items(content.get('items', [])):
ds = table_item.get('datasource', '')
rows = live_dhcp_leases() if ds == 'live:dhcp_leases' else []
tokens[table_token_key(ds)] = build_table(table_item, tokens, rows)
tokens[factory.table_token_key(ds)] = factory.build_table(table_item, tokens, rows)
return tokens