Update app.py

app.py

@@ -1,6 +1,5 @@
 from flask import Flask, render_template, request, jsonify
 import requests, time, json, os, threading
-from urllib.parse import urlparse
 
 app = Flask(__name__)
 
@@ -11,7 +10,6 @@ if not ADMIN_PASSWORD:
     raise RuntimeError("ADMIN_PASSWORD not set")
 
 # ---------------- STORAGE ----------------
-
 if not os.path.exists(DATA_FILE):
     with open(DATA_FILE, "w") as f:
         json.dump([], f)
@@ -25,14 +23,6 @@ def save_urls(data):
         json.dump(data, f, indent=2)
 
 # ---------------- CHECKER ----------------
-
-def get_favicon(url):
-    try:
-        parsed = urlparse(url)
-        return f"{parsed.scheme}://{parsed.netloc}/favicon.ico"
-    except:
-        return None
-
 def check_sites():
     while True:
         urls = load_urls()
@@ -43,7 +33,6 @@ def check_sites():
                 site["total_checks"] += 1
                 ping = None
                 up = False
-
                 try:
                     r = requests.get(site["url"], timeout=10)
                     ping = round(r.elapsed.total_seconds() * 1000, 2)
@@ -58,7 +47,7 @@ def check_sites():
                 if up:
                     site["up_checks"] += 1
 
-                # update history
+                # history
                 site["history"].append({
                     "time": int(now),
                     "uptime": 100 if up else 0,
@@ -66,10 +55,6 @@ def check_sites():
                 })
                 site["history"] = site["history"][-50:]
 
-                # fetch favicon if not exist
-                if not site.get("favicon"):
-                    site["favicon"] = get_favicon(site["url"])
-
                 site["last_check"] = now
                 site["next_check"] = now + site["interval"]
 
@@ -77,7 +62,6 @@ def check_sites():
         time.sleep(5)
 
 # ---------------- ROUTES ----------------
-
 @app.route("/")
 def index():
     return render_template("index.html")
@@ -86,22 +70,19 @@ def index():
 def data():
     urls = load_urls()
     now = time.time()
-
-    # total uptime calculation (sum of uptime in seconds)
-    total_seconds = sum([u["uptime_seconds"] if "uptime_seconds" in u else (now - u["first_added"]) for u in urls])
-    total_uptime_str = str(int(total_seconds // 86400)) + "d " + \
-                       str(int((total_seconds % 86400) // 3600)) + "h " + \
-                       str(int((total_seconds % 3600) // 60)) + "m " + \
-                       str(int(total_seconds % 60)) + "s"
-
     for u in urls:
         u["remaining"] = max(0, int(u["next_check"] - now))
-        u["uptime_seconds"] = int(now - u["first_added"])
+        # formatted uptime string
+        total_sec = int(now - u["first_added"])
+        d, rem = divmod(total_sec, 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
+            (u["up_checks"] / u["total_checks"])*100,2
         ) if u["total_checks"] else 0
-
-    return jsonify({"total_uptime": total_uptime_str, "sites": urls})
+    return jsonify(urls)
 
 def auth(req):
     return req.form.get("password") == ADMIN_PASSWORD
@@ -113,11 +94,11 @@ def add():
 
     now = time.time()
     data = load_urls()
-
     data.append({
-        "id": int(now * 1000),
+        "id": int(now*1000),
         "name": request.form["name"],
         "url": request.form["url"],
+        "img": request.form.get("img", ""),  # optional image URL
         "interval": int(request.form["interval"]),
         "status": "UNKNOWN",
         "last_ping": None,
@@ -126,10 +107,8 @@ def add():
         "first_added": now,
         "total_checks": 0,
         "up_checks": 0,
-        "favicon": None,
         "history": []
     })
-
     save_urls(data)
     return "OK"
 
@@ -143,14 +122,13 @@ def edit(id):
         if s["id"] == id:
             s["name"] = request.form["name"]
             s["url"] = request.form["url"]
+            s["img"] = request.form.get("img", "")
             s["interval"] = int(request.form["interval"])
             break
-
     save_urls(data)
     return "OK"
 
 # ---------------- MAIN ----------------
-
 if __name__ == "__main__":
     threading.Thread(target=check_sites, daemon=True).start()
     app.run(host="0.0.0.0", port=7860)