Update app.py

app.py

@@ -1,16 +1,14 @@
 from flask import Flask, render_template, request, jsonify
 import requests, time, json, os, threading
 from bs4 import BeautifulSoup
+from urllib.parse import urljoin
 
 app = Flask(__name__)
 
 DATA_FILE = "/tmp/urls.json"
-ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD")
+ADMIN_PASSWORD = os.environ.get("ADMIN_PASSWORD", "admin")
 
-if not ADMIN_PASSWORD:
-    raise RuntimeError("ADMIN_PASSWORD not set")
-
-# ---------------- STORAGE ----------------
+# ---------- STORAGE ----------
 if not os.path.exists(DATA_FILE):
     with open(DATA_FILE, "w") as f:
         json.dump([], f)
@@ -23,77 +21,79 @@ def save_urls(data):
     with open(DATA_FILE, "w") as f:
         json.dump(data, f, indent=2)
 
-# ---------------- CHECKER ----------------
+# ---------- IMAGE FETCH ----------
+def fetch_site_image(url):
+    try:
+        r = requests.get(url, timeout=10)
+        soup = BeautifulSoup(r.text, "html.parser")
+
+        # og:image
+        og = soup.find("meta", property="og:image")
+        if og and og.get("content"):
+            return urljoin(url, og["content"])
+
+        # favicon
+        return url.rstrip("/") + "/favicon.ico"
+    except:
+        return ""
+
+# ---------- CHECKER ----------
 def check_sites():
     while True:
-        urls = load_urls()
+        sites = load_urls()
         now = time.time()
 
-        for site in urls:
-            if now >= site["next_check"]:
-                site["total_checks"] += 1
-                ping = None
+        for s in sites:
+            if now >= s["next_check"]:
+                s["total_checks"] += 1
                 up = False
+                ping = None
                 try:
-                    r = requests.get(site["url"], timeout=10)
+                    r = requests.get(s["url"], timeout=10)
                     ping = round(r.elapsed.total_seconds() * 1000, 2)
                     up = r.status_code == 200
                 except:
-                    ping = None
-                    up = False
-
-                site["status"] = "UP" if up else "DOWN"
-                site["last_ping"] = ping
+                    pass
 
                 if up:
-                    site["up_checks"] += 1
+                    s["up_checks"] += 1
 
-                # history
-                site["history"].append({
+                s["status"] = "UP" if up else "DOWN"
+                s["last_ping"] = ping
+                s["history"].append({
                     "time": int(now),
                     "uptime": 100 if up else 0,
                     "ping": ping
                 })
-                site["history"] = site["history"][-50:]
-
-                site["last_check"] = now
-                site["next_check"] = now + site["interval"]
+                s["history"] = s["history"][-50:]
+                s["last_check"] = now
+                s["next_check"] = now + s["interval"]
 
-        save_urls(urls)
+        save_urls(sites)
         time.sleep(5)
 
-# ---------------- OG IMAGE FETCH ----------------
-def fetch_og_image(url):
-    try:
-        r = requests.get(url, timeout=10)
-        soup = BeautifulSoup(r.text, "html.parser")
-        tag = soup.find("meta", property="og:image")
-        if tag and tag.get("content"):
-            return tag["content"]
-    except:
-        pass
-    return ""  # fallback empty
-
-# ---------------- ROUTES ----------------
+# ---------- ROUTES ----------
 @app.route("/")
 def index():
     return render_template("index.html")
 
 @app.route("/data")
 def data():
-    urls = load_urls()
+    sites = load_urls()
     now = time.time()
-    for u in urls:
-        u["remaining"] = max(0, int(u["next_check"] - now))
-        total_sec = int(now - u["first_added"])
-        d, rem = divmod(total_sec, 86400)
+
+    for s in sites:
+        s["remaining"] = max(0, int(s["next_check"] - now))
+        total = int(now - s["first_added"])
+        d, rem = divmod(total, 86400)
         h, rem = divmod(rem, 3600)
-        m, s = divmod(rem, 60)
-        u["uptime_str"] = f"{d}d {h}h {m}m {s}s"
-        u["uptime_percent"] = round(
-            (u["up_checks"] / u["total_checks"])*100,2
-        ) if u["total_checks"] else 0
-    return jsonify(urls)
+        m, sec = divmod(rem, 60)
+        s["uptime_str"] = f"{d}d {h}h {m}m {sec}s"
+        s["uptime_percent"] = round(
+            (s["up_checks"] / s["total_checks"]) * 100, 2
+        ) if s["total_checks"] else 0
+
+    return jsonify(sites)
 
 def auth(req):
     return req.form.get("password") == ADMIN_PASSWORD
@@ -106,13 +106,12 @@ def add():
     now = time.time()
     data = load_urls()
     url = request.form["url"]
-    og_img = fetch_og_image(url)
 
     data.append({
-        "id": int(now*1000),
+        "id": int(now * 1000),
         "name": request.form["name"],
         "url": url,
-        "img": og_img,  # auto fetched
+        "img": fetch_site_image(url),
         "interval": int(request.form["interval"]),
         "status": "UNKNOWN",
         "last_ping": None,
@@ -131,19 +130,34 @@ def edit(id):
     if not auth(request):
         return "Unauthorized", 401
 
-    data = load_urls()
-    for s in data:
+    sites = load_urls()
+    for s in sites:
         if s["id"] == id:
+            old_url = s["url"]
+            new_url = request.form["url"]
+
             s["name"] = request.form["name"]
-            s["url"] = request.form["url"]
-            # update OG image automatically
-            s["img"] = fetch_og_image(s["url"])
+            s["url"] = new_url
             s["interval"] = int(request.form["interval"])
+            s["img"] = fetch_site_image(new_url)
+
+            # 🔥 RESET uptime if URL changed
+            if old_url != new_url:
+                now = time.time()
+                s["first_added"] = now
+                s["total_checks"] = 0
+                s["up_checks"] = 0
+                s["history"] = []
+                s["last_check"] = 0
+                s["next_check"] = now
+                s["status"] = "UNKNOWN"
+                s["last_ping"] = None
             break
-    save_urls(data)
+
+    save_urls(sites)
     return "OK"
 
-# ---------------- MAIN ----------------
+# ---------- START ----------
 if __name__ == "__main__":
     threading.Thread(target=check_sites, daemon=True).start()
     app.run(host="0.0.0.0", port=7860)