Update sync_manager.py

sync_manager.py

@@ -15,6 +15,7 @@ TOKEN = os.getenv("HF_TOKEN")
 
 BASE_DIR = Path("/root/.openclaw")
 PREFIX = "openclawai_backup_"
+CONFIG_FILE_NAME = "openclaw.json"
 KEEP_LAST = 5
 
 # กรองเฉพาะไฟล์ที่ต้องการ และตัดไฟล์ระบบ/ไฟล์ชั่วคราวทิ้ง
@@ -28,7 +29,6 @@ def log(msg):
     print(f"[{time.strftime('%H:%M:%S')}] {msg}", flush=True)
 
 def is_valid_file(path: Path):
-    # ต้องมีนามสกุลที่กำหนด และไม่อยู่ในกลุ่ม Ignore
     if path.suffix.lower() not in ALLOWED_EXTENSIONS:
         return False
     if any(pattern in path.name for pattern in IGNORE_PATTERNS):
@@ -54,54 +54,107 @@ def create_zip(zip_path):
 def backup():
     if not REPO_ID or not TOKEN: return log("❌ Config missing")
     
-    zip_name = f"{PREFIX}{time.strftime('%Y%m%d_%H%M%S')}.zip"
+    timestamp = time.strftime("%Y%m%d_%H%M%S")
+    zip_name = f"{PREFIX}{timestamp}.zip"
     zip_path = Path(f"/tmp/{zip_name}")
 
     try:
         if BASE_DIR.exists() and create_zip(zip_path):
-            log(f"📤 Uploading: {zip_name}")
-            api.upload_file(path_or_fileobj=str(zip_path), path_in_repo=zip_name, 
-                            repo_id=REPO_ID, repo_type="dataset", token=TOKEN)
+            log(f"📤 Uploading full backup: {zip_name}")
+            api.upload_file(
+                path_or_fileobj=str(zip_path), 
+                path_in_repo=zip_name, 
+                repo_id=REPO_ID, 
+                repo_type="dataset", 
+                token=TOKEN
+            )
             
-            # Cleanup old backups
-            contents = list_repo_files(REPO_ID, repo_type="dataset", token=TOKEN)
-            old_backups = sorted([f for f in contents if f.startswith(PREFIX)])
-            for old in old_backups[:-KEEP_LAST]:
-                api.delete_file(path_in_repo=old, repo_id=REPO_ID, repo_type="dataset", token=TOKEN)
-                log(f"🗑️ Deleted: {old}")
+            # แถม: อัปโหลด openclaw.json แยกไว้เผื่อ Step 2 ของการ Restore
+            config_file = BASE_DIR / CONFIG_FILE_NAME
+            if config_file.exists():
+                api.upload_file(
+                    path_or_fileobj=str(config_file),
+                    path_in_repo=CONFIG_FILE_NAME,
+                    repo_id=REPO_ID,
+                    repo_type="dataset",
+                    token=TOKEN
+                )
+
+            cleanup_old_backups()
+            log("✅ Backup successful")
     finally:
         if zip_path.exists(): zip_path.unlink()
 
+def cleanup_old_backups():
+    try:
+        contents = list_repo_files(REPO_ID, repo_type="dataset", token=TOKEN)
+        old_backups = sorted([f for f in contents if f.startswith(PREFIX) and f.endswith(".zip")])
+        for old in old_backups[:-KEEP_LAST]:
+            api.delete_file(path_in_repo=old, repo_id=REPO_ID, repo_type="dataset", token=TOKEN)
+            log(f"🗑️ Deleted old backup: {old}")
+    except Exception as e:
+        log(f"⚠️ Cleanup failed: {e}")
+
 def restore():
+    if not REPO_ID or not TOKEN:
+        log("❌ Missing HF config")
+        return False
+    
     try:
         contents = list_repo_files(REPO_ID, repo_type="dataset", token=TOKEN)
-        backups = sorted([f for f in contents if f.startswith(PREFIX)])
-        if not backups: return log("⚠️ No backup found")
+        
+        # 1. Restore Full Backup (ZIP)
+        backups = sorted([f for f in contents if f.startswith(PREFIX) and f.endswith(".zip")])
+        if backups:
+            latest = backups[-1]
+            log(f"📥 Step 1: Restoring full backup from {latest}")
+            zip_path = hf_hub_download(
+                repo_id=REPO_ID, filename=latest, repo_type="dataset", token=TOKEN
+            )
+            if BASE_DIR.exists():
+                shutil.rmtree(BASE_DIR)
+            BASE_DIR.mkdir(parents=True)
+            log("📦 Extracting full backup...")
+            with zipfile.ZipFile(zip_path, "r") as z:
+                z.extractall(BASE_DIR)
+            log("✅ Full backup restored.")
+        else:
+            log("⚠️ No full backup found. Skipping Step 1.")
+            BASE_DIR.mkdir(parents=True, exist_ok=True)
 
-        latest = backups[-1]
-        log(f"📥 Restoring: {latest}")
-        zip_path = hf_hub_download(repo_id=REPO_ID, filename=latest, repo_type="dataset", token=TOKEN)
+        # 2. Restore openclaw.json (แยกไฟล์ - เผื่อกรณีไฟล์ใน ZIP เก่ากว่า)
+        if CONFIG_FILE_NAME in contents:
+            log(f"📥 Step 2: Restoring {CONFIG_FILE_NAME} from Dataset")
+            try:
+                config_path = hf_hub_download(
+                    repo_id=REPO_ID, filename=CONFIG_FILE_NAME, repo_type="dataset", token=TOKEN
+                )
+                shutil.copy(config_path, BASE_DIR / CONFIG_FILE_NAME)
+                log("✅ Config file restored.")
+            except Exception as e:
+                log(f"⚠️ Failed to restore config: {e}")
+        else:
+            log("⚠️ No separate openclaw.json found. Step 2 skipped.")
 
-        if BASE_DIR.exists(): shutil.rmtree(BASE_DIR)
-        BASE_DIR.mkdir(parents=True, exist_ok=True)
-        
-        with zipfile.ZipFile(zip_path, "r") as z:
-            z.extractall(BASE_DIR)
-        log("✅ Restore successful!")
+        return True
     except Exception as e:
         log(f"❌ Restore failed: {e}")
+        return False
 
 # =========================
 # MAIN
 # =========================
 if __name__ == "__main__":
+    # รับ action จาก command line (default: restore)
     action = sys.argv[1].lower() if len(sys.argv) > 1 else "restore"
 
     if action == "backup":
         log("🔄 Backup loop active (Hourly at :00)")
         while True:
             now = time.localtime()
-            time.sleep(max(0, (60 - now.tm_min) * 60 - now.tm_sec))
+            # รอจนถึงต้นชั่วโมงถัดไป
+            wait_sec = (60 - now.tm_min) * 60 - now.tm_sec
+            time.sleep(max(0, wait_sec))
             backup()
     else:
         restore()