Update sync_manager.py

sync_manager.py

@@ -18,7 +18,7 @@ PREFIX = "openclawai_backup_"
 CONFIG_FILE_NAME = "openclaw.json"
 KEEP_LAST = 5
 
-# กรองเฉพาะไฟล์ที่ต้องการ และตัดไฟล์ระบบ/ไฟล์ชั่วคราวทิ้ง
+# กรองเฉพาะไฟล์ที่ต้องการ
 ALLOWED_EXTENSIONS = {'.md', '.json', '.db', '.sqlite', '.py'}
 IGNORE_PATTERNS = {'.lock', '.tmp', '.wal', '.shm', '__pycache__'}
 
@@ -29,6 +29,9 @@ def log(msg):
     print(f"[{time.strftime('%H:%M:%S')}] {msg}", flush=True)
 
 def is_valid_file(path: Path):
+    # รวม openclaw.json เข้าไปใน ZIP ด้วยเพื่อเก็บเป็น Snapshot
+    if path.name == CONFIG_FILE_NAME:
+        return True
     if path.suffix.lower() not in ALLOWED_EXTENSIONS:
         return False
     if any(pattern in path.name for pattern in IGNORE_PATTERNS):
@@ -45,14 +48,14 @@ def create_zip(zip_path):
         log("⚠️ No important files found to backup")
         return False
 
-    log(f"📦 Zipping {len(files)} files...")
+    log(f"📦 Zipping {len(files)} files (including current config snapshot)...")
     with zipfile.ZipFile(zip_path, "w", zipfile.ZIP_DEFLATED) as z:
         for p in files:
             z.write(p, p.relative_to(BASE_DIR))
     return True
 
 def backup():
-    if not REPO_ID or not TOKEN: return log("❌ Config missing")
+    if not REPO_ID or not TOKEN: return log("❌ Config missing (HF_DATASET or HF_TOKEN)")
     
     timestamp = time.strftime("%Y%m%d_%H%M%S")
     zip_name = f"{PREFIX}{timestamp}.zip"
@@ -60,7 +63,7 @@ def backup():
 
     try:
         if BASE_DIR.exists() and create_zip(zip_path):
-            log(f"📤 Uploading full backup: {zip_name}")
+            log(f"📤 Uploading backup snapshot: {zip_name}")
             api.upload_file(
                 path_or_fileobj=str(zip_path), 
                 path_in_repo=zip_name, 
@@ -69,19 +72,11 @@ def backup():
                 token=TOKEN
             )
             
-            # แถม: อัปโหลด 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
-                )
-
+            # หมายเหตุ: จะไม่มีการ upload CONFIG_FILE_NAME แยกต่างหาก 
+            # เพื่อรักษาไฟล์ "Master" บน Cloud ไว้จากการแก้ไขด้วยมือของคุณ
+            
             cleanup_old_backups()
-            log("✅ Backup successful")
+            log("✅ Backup successful. Master config on Cloud remains untouched.")
     finally:
         if zip_path.exists(): zip_path.unlink()
 
@@ -103,38 +98,38 @@ def restore():
     try:
         contents = list_repo_files(REPO_ID, repo_type="dataset", token=TOKEN)
         
-        # 1. Restore Full Backup (ZIP)
+        # --- Step 1: Restore จาก ZIP (Snapshot) ---
         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}")
+            log(f"📥 Step 1: Extracting snapshot 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.")
+            log("📦 Files extracted (includes snapshot config).")
         else:
-            log("⚠️ No full backup found. Skipping Step 1.")
+            log("⚠️ No backup ZIP found.")
             BASE_DIR.mkdir(parents=True, exist_ok=True)
 
-        # 2. Restore openclaw.json (แยกไฟล์ - เผื่อกรณีไฟล์ใน ZIP เก่ากว่า)
+        # --- Step 2: Restore Master Config (ทับไฟล์จาก ZIP) ---
         if CONFIG_FILE_NAME in contents:
-            log(f"📥 Step 2: Restoring {CONFIG_FILE_NAME} from Dataset")
+            log(f"📥 Step 2: Overwriting with Master '{CONFIG_FILE_NAME}' from Cloud")
             try:
-                config_path = hf_hub_download(
+                master_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.")
+                shutil.copy(master_config_path, BASE_DIR / CONFIG_FILE_NAME)
+                log("✅ Master config restored and active.")
             except Exception as e:
-                log(f"⚠️ Failed to restore config: {e}")
+                log(f"⚠️ Failed to restore Master config: {e}")
         else:
-            log("⚠️ No separate openclaw.json found. Step 2 skipped.")
+            log(f"⚠️ Master '{CONFIG_FILE_NAME}' not found on Cloud. Using config from ZIP.")
 
         return True
     except Exception as e:
@@ -145,11 +140,14 @@ def restore():
 # MAIN
 # =========================
 if __name__ == "__main__":
-    # รับ action จาก command line (default: restore)
+    # รับ action จาก command line: 'python script.py backup' หรือ 'python script.py restore'
     action = sys.argv[1].lower() if len(sys.argv) > 1 else "restore"
 
     if action == "backup":
-        log("🔄 Backup loop active (Hourly at :00)")
+        log("🔄 Backup mode started")
+        backup()
+    elif action == "backup_loop":
+        log("🔄 Backup loop active (Hourly)")
         while True:
             now = time.localtime()
             # รอจนถึงต้นชั่วโมงถัดไป
@@ -157,4 +155,5 @@ if __name__ == "__main__":
             time.sleep(max(0, wait_sec))
             backup()
     else:
+        log("🔄 Restore mode started")
         restore()