迁移支持

Author: tsosunchia

main.py

@@ -91,30 +91,36 @@ def process(rawData: dict, filename=str(int(datetime.datetime.now().timestamp())
     # print(rawData)
     urlPrefix = "https://assets.nxtrace.org/tracemap/"
     coordinatesList = []
-    for k in rawData['Hops']:
-        for j in k:
-            if j['Success']:
-                if 'lat' not in j['Geo']:
+    for hop_group in rawData.get('Hops', []):
+        if not hop_group:
+            continue
+        for j in hop_group:
+            if not j or not isinstance(j, dict):
+                continue
+            if j.get('Success'):
+                geo = j.get('Geo') or {}
+                if 'lat' not in geo:
                     return "不受支持的版本，请更新至最新版本NextTrace。"
-                if j['Geo']['lat'] == 0 and j['Geo']['lng'] == 0:
+                if geo.get('lat') == 0 and geo.get('lng') == 0:
                     continue
-                if j['Geo']['prov'] == "" and j['Geo']['country'] in ['中国', '美国', '俄罗斯']:
+                if geo.get('prov') == "" and geo.get('country') in ['中国', '美国', '俄罗斯']:
                     continue
                 tmpCity = ''
-                if j['Geo']['country'] != '':
-                    tmpCity = j['Geo']['country']
-                if j['Geo']['prov'] != '':
-                    tmpCity = j['Geo']['prov']
-                if j['Geo']['city'] != '':
-                    tmpCity = j['Geo']['city']
+                if geo.get('country'):
+                    tmpCity = geo['country']
+                if geo.get('prov'):
+                    tmpCity = geo['prov']
+                if geo.get('city'):
+                    tmpCity = geo['city']
+                address = j.get('Address') or {}
                 coordinatesList.append(
                     [
-                        j['Geo']['lat'],
-                        j['Geo']['lng'],
+                        geo.get('lat'),
+                        geo.get('lng'),
                         tmpCity,
-                        j['Geo']['owner'],
-                        j['Geo']['asnumber'] if 'asnumber' in j['Geo'] else '',
-                        j['Address']['IP'] if 'IP' in j['Address'] else '',
+                        geo.get('owner', ''),
+                        geo['asnumber'] if 'asnumber' in geo else '',
+                        address['IP'] if 'IP' in address else '',
                         j['whois'] if 'whois' in j else '',
                         f'{j["TTL"]}' if 'TTL' in j else '',
                         f'{(j["RTT"] / 1_000_000):.2f}' if 'RTT' in j else '',  # unit: ms

regenerate_html.sh

@@ -0,0 +1,61 @@
+#!/usr/bin/env bash
+
+# Regenerate HTML outputs from stored JSON logs.
+# Processes each ./log/*.json through main.process() and writes ./html/<name>.html.
+
+set -euo pipefail
+
+SCRIPT_DIR="$(cd "$(dirname "${BASH_SOURCE[0]}")" && pwd)"
+REPO_ROOT="${SCRIPT_DIR}"
+LOG_DIR="${REPO_ROOT}/log"
+HTML_DIR="${REPO_ROOT}/html"
+
+if [[ ! -d "${LOG_DIR}" ]]; then
+  echo "Log directory not found: ${LOG_DIR}" >&2
+  exit 1
+fi
+
+mkdir -p "${HTML_DIR}"
+
+if ! find "${LOG_DIR}" -maxdepth 1 -type f -name '*.json' -print -quit | grep -q .; then
+  echo "No JSON log files found in ${LOG_DIR}; nothing to regenerate." >&2
+  exit 0
+fi
+
+echo "Removing previous HTML outputs in ${HTML_DIR}"
+find "${HTML_DIR}" -maxdepth 1 -type f -name '*.html' -exec rm -f {} +
+
+(
+  cd "${REPO_ROOT}"
+  python3 - "${LOG_DIR}" "${HTML_DIR}" <<'PY'
+import json
+import traceback
+import sys
+from pathlib import Path
+
+from main import process
+
+log_dir = Path(sys.argv[1])
+html_dir = Path(sys.argv[2])
+
+for idx, json_path in enumerate(log_dir.glob("*.json"), start=1):
+    output_name = json_path.stem + ".html"
+    print(f"[{idx}] Generating {output_name} from {json_path.name}", flush=True)
+    try:
+        with json_path.open("r", encoding="utf-8") as fh:
+            data = json.load(fh)
+        result = process(data, filename=output_name)
+        output_file = html_dir / output_name
+
+        if isinstance(result, str) and result.endswith(output_name) and output_file.exists():
+            continue
+        if output_file.exists():
+            continue
+        print(f"Skipping {json_path.name}; process() returned: {result}", file=sys.stderr, flush=True)
+    except Exception as exc:
+        print(f"Skipping {json_path.name}; error encountered: {exc}", file=sys.stderr, flush=True)
+        traceback.print_exc()
+
+print(f"HTML regeneration complete. Files saved to {html_dir}")
+PY
+)