Development

docker/routlin-dash/app/pages/ddns/view.py

@@ -1,9 +1,13 @@
 import json
 import re
 import os
-from view_common import load_ddns, public_ip_info, ddns_last_checked, CONFIGS_DIR
+from config_utils import (
+    collect_layout_tokens, load_datasource, CONFIGS_DIR, relative_time,
+)
+from factory import load_ddns, load_json, build_table, table_token_key, iter_table_items, PAGES_DIR
 import validation as validate
 
+
 DDNS_LOG_MAX = 50
 
 
@@ -42,8 +46,47 @@ def _ddns_log_tail():
         return '(error reading log)', ''
 
 
+def _read_cached_ip():
+    try:
+        best_ip, best_mtime = '', 0.0
+        for fname in os.listdir(CONFIGS_DIR):
+            if fname.startswith('.ddns-last-ip-'):
+                path = f'{CONFIGS_DIR}/{fname}'
+                mtime = os.path.getmtime(path)
+                if mtime > best_mtime:
+                    ip = open(path).read().strip()
+                    if ip:
+                        best_ip, best_mtime = ip, mtime
+        return best_ip, (best_mtime if best_ip else None)
+    except Exception:
+        return '', None
+
+
+def public_ip_info(ddns_cfg):
+    from datetime import datetime, timezone
+    enabled_p = [p for p in ddns_cfg.get('providers', []) if p.get('enabled', True)]
+    all_hosts = []
+    for p in enabled_p:
+        all_hosts.extend(p.get('hostnames', p.get('subdomains', [])))
+    domains_sub = ', '.join(all_hosts)
+    ip, mtime = _read_cached_ip()
+    last_obtained = f'Obtained: {relative_time(mtime, datetime.now(tz=timezone.utc).timestamp())} ago' if mtime else ''
+    if ip:
+        return ip, domains_sub, last_obtained
+    return 'Offline', domains_sub, ''
+
+
+def ddns_last_checked():
+    from datetime import datetime, timezone
+    try:
+        mtime = os.path.getmtime(f'{CONFIGS_DIR}/.ddns-last-service')
+        return f'Last checked: {relative_time(mtime, datetime.now(tz=timezone.utc).timestamp())} ago'
+    except OSError:
+        return 'Last checked: ---'
+
+
 def collect_tokens(cfg):
-    tokens = {}
+    tokens = collect_layout_tokens(cfg)
     ddns = load_ddns()
     ddns_gen = ddns.get('general', {})
     tokens['DDNS_TIMER_INTERVAL'] = ddns_gen.get('timer_interval', '-')
@@ -68,4 +111,8 @@ def collect_tokens(cfg):
     tokens['STAT_PUBLIC_IP_LAST_OBTAINED'] = last_obtained
     tokens['STAT_PUBLIC_IP_LAST_CHECKED']  = ddns_last_checked()
     tokens['DDNS_LOG_TAIL'], tokens['DDNS_LOG_SUMMARY'] = _ddns_log_tail()
+    content = load_json(f'{PAGES_DIR}/ddns/content.json')
+    for table_item in iter_table_items(content.get('items', [])):
+        ds = table_item.get('datasource', '')
+        tokens[table_token_key(ds)] = build_table(table_item, tokens, load_datasource(ds))
     return tokens