Update app.py

app.py

@@ -1,13 +1,15 @@
+# app.py
 import os, shutil, zipfile, threading, time
 from flask import Flask, request, render_template_string
 import gdown
 from huggingface_hub import HfApi, login, upload_folder
 
-# Environment variables (set them in HF Spaces settings)
+# Environment variables (set these in your Space settings)
 FOLDER_URL = os.getenv("FOLDER_URL")
 REPO_ID    = os.getenv("REPO_ID")
 TOKEN      = os.getenv("HF_TOKEN")
 
+# Directories in writable tmp
 DOWNLOAD_DIR = "/tmp/backups"
 EXTRACT_DIR  = "/tmp/extracted_backups"
 
@@ -17,95 +19,106 @@ schedule_interval = 0
 
 app = Flask(__name__)
 
-# Backup logic
+# Backup logic with detailed logging
 def run_backup():
     global last_backup_time
+    log_entries = []
     try:
+        log_entries.append("Starting backup process...")
+        # Clean previous
         shutil.rmtree(DOWNLOAD_DIR, ignore_errors=True)
         shutil.rmtree(EXTRACT_DIR, ignore_errors=True)
         os.makedirs(DOWNLOAD_DIR, exist_ok=True)
         os.makedirs(EXTRACT_DIR, exist_ok=True)
+        log_entries.append(f"Directories reset: {DOWNLOAD_DIR}, {EXTRACT_DIR}")
 
-        gdown.download_folder(
-            url=FOLDER_URL,
-            output=DOWNLOAD_DIR,
-            use_cookies=False,
-            quiet=False
-        )
+        # Download from Google Drive
+        log_entries.append(f"Downloading from: {FOLDER_URL}")
+        gdown.download_folder(url=FOLDER_URL, output=DOWNLOAD_DIR, use_cookies=False, quiet=True)
+        log_entries.append("Download complete.")
 
+        # Extract all zip files
         for root, _, files in os.walk(DOWNLOAD_DIR):
             for f in files:
                 if f.endswith(".zip"):
                     zp = os.path.join(root, f)
                     with zipfile.ZipFile(zp) as z:
                         z.extractall(EXTRACT_DIR)
+                    log_entries.append(f"Extracted: {zp}")
 
-        bad  = os.path.join(EXTRACT_DIR, "world_nither")
+        # Fix potential typo folder
+        bad = os.path.join(EXTRACT_DIR, "world_nither")
         good = os.path.join(EXTRACT_DIR, "world_nether")
         if os.path.exists(bad) and not os.path.exists(good):
             os.rename(bad, good)
+            log_entries.append(f"Renamed folder: {bad} -> {good}")
 
+        # Authenticate and prepare dataset
         login(token=TOKEN)
         api = HfApi()
-        try:
-            api.delete_repo(repo_id=REPO_ID, repo_type="dataset")
-        except Exception as err:
-            print("delete skipped:", err)
-
-        api.create_repo(repo_id=REPO_ID, repo_type="dataset", private=False, exist_ok=True)
+        log_entries.append("Authenticated to Hugging Face.")
+        # Ensure dataset exists
+        api.create_repo(repo_id=REPO_ID, repo_type="dataset", private=False, exist_ok=True, token=TOKEN)
+        log_entries.append(f"Dataset ensured: {REPO_ID}")
 
+        # Upload subfolders
         subfolders = {
             "world": os.path.join(EXTRACT_DIR, "world"),
             "world_nether": os.path.join(EXTRACT_DIR, "world_nether"),
             "world_the_end": os.path.join(EXTRACT_DIR, "world_the_end"),
             "plugins": os.path.join(EXTRACT_DIR, "plugins")
         }
-
         for name, path in subfolders.items():
             if os.path.exists(path):
+                log_entries.append(f"Uploading folder: {name}")
                 upload_folder(
                     repo_id=REPO_ID,
                     folder_path=path,
                     repo_type="dataset",
                     token=TOKEN,
                     path_in_repo=name,
-                    commit_message="add " + name
+                    commit_message=f"add {name}"
                 )
+                log_entries.append(f"Uploaded: {name}")
+            else:
+                log_entries.append(f"Skipped missing folder: {path}")
+
         last_backup_time = time.ctime()
-        return "Backup completed"
+        log_entries.append(f"Backup completed at {last_backup_time}")
     except Exception as e:
-        return f"Error: {str(e)}"
+        log_entries.append(f"Error: {str(e)}")
+    return "<br>".join(log_entries)
 
-# Background timer
+# Background scheduler
 def schedule_loop():
     while True:
         if schedule_interval > 0:
             run_backup()
             time.sleep(schedule_interval * 60)
         else:
-            time.sleep(10)
+            time.sleep(5)
 
-# Start scheduler thread
 threading.Thread(target=schedule_loop, daemon=True).start()
 
-# HTML template
-HTML = """
+# HTML UI template
+HTML = '''
 <!DOCTYPE html>
 <html>
 <head>
-  <title>Minecraft Backup Panel</title>
+  <meta charset="utf-8">
   <meta name="viewport" content="width=device-width, initial-scale=1">
+  <title>Minecraft Backup Panel</title>
   <style>
     body { font-family: sans-serif; padding: 20px; max-width: 600px; margin: auto; }
     h2 { font-size: 24px; }
-    input, button { width: 100%; padding: 10px; margin: 8px 0; font-size: 16px; }
-    .box { background: #f5f5f5; padding: 15px; border-radius: 8px; margin-top: 20px; }
+    input, button { width: 100%; padding: 12px; margin: 8px 0; font-size: 16px; border-radius: 6px; border: 1px solid #ccc; }
+    .box { background: #f5f5f5; padding: 15px; border-radius: 8px; margin-top: 20px; word-wrap: break-word; }
   </style>
 </head>
 <body>
   <h2>Minecraft Backup Controller</h2>
   <form method="post">
-    <label>Set interval (minutes)</label>
+    <label>Set interval (minutes):</label>
     <input type="number" name="interval" value="{{ interval }}" min="1">
     <button type="submit">Set Timer</button>
   </form>
@@ -115,18 +128,18 @@ HTML = """
   </form>
   <div class="box">
     <p><strong>Last Backup:</strong> {{ last_run }}</p>
-    <p><strong>Status:</strong> {{ status }}</p>
+    <p><strong>Status Log:</strong><br>{{ status|safe }}</p>
   </div>
 </body>
 </html>
-"""
+'''
 
 @app.route("/", methods=["GET", "POST"])
 def index():
     global schedule_interval
     status = ""
     if request.method == "POST":
-        if "manual_run" in request.form:
+        if request.form.get("manual_run"):
             status = run_backup()
         else:
             try:
@@ -138,3 +151,11 @@ def index():
 
 if __name__ == "__main__":
     app.run(host="0.0.0.0", port=7860)
+
+# Dockerfile
+# ----------
+# FROM python:3.10
+# WORKDIR /app
+# COPY app.py .
+# RUN pip install flask huggingface_hub gdown
+# CMD ["python", "app.py"]