Update sync.py

sync.py

@@ -1,102 +1,43 @@
 import os
 import sys
 import tarfile
-import shutil
-from pathlib import Path
 from huggingface_hub import HfApi, hf_hub_download
-from huggingface_hub.utils import HfHubHTTPError, RepositoryNotFoundError, EntryNotFoundError
 
 api = HfApi()
 repo_id = os.getenv("HF_DATASET")
 token = os.getenv("HF_TOKEN")
 FILENAME = "latest_backup.tar.gz"
-OPENCLAW_DIR = "/root/.openclaw"
-
-def is_safe_path(base_dir: str, target_path: str) -> bool:
-    base_abs = os.path.abspath(base_dir)
-    target_abs = os.path.abspath(target_path)
-    return os.path.commonpath([base_abs]) == os.path.commonpath([base_abs, target_abs])
 
 def restore():
     try:
         if not repo_id or not token:
             print("Skip Restore: HF_DATASET or HF_TOKEN not set")
             return
-
-        print(f"[Restore] Downloading {FILENAME} from {repo_id}...")
-        download_path = hf_hub_download(
-            repo_id=repo_id,
-            filename=FILENAME,
-            repo_type="dataset",
-            token=token,
-            force_download=True
-        )
-
-        print(f"[Restore] Download OK ({os.path.getsize(download_path)} bytes). Starting restore...")
-
-        os.makedirs(OPENCLAW_DIR, exist_ok=True)
-
-        extracted_count = 0
-        sessions_files = 0
-
-        with tarfile.open(download_path, "r:gz") as tar:
-            for member in tar.getmembers():
-                member_path = os.path.join(OPENCLAW_DIR, member.name)
-                if not is_safe_path(OPENCLAW_DIR, member_path):
-                    print(f"[Restore] Skipping unsafe path: {member.name}")
-                    continue
-
-                tar.extract(member, path=OPENCLAW_DIR)
-                extracted_count += 1
-
-                if "sessions" in member.name and member.name.endswith((".json", ".jsonl")):
-                    sessions_files += 1
-
-        print(f"[Restore] ✅ Extracted {extracted_count} files, including {sessions_files} session files.")
-
-        # 恢复后详细诊断（重点看 agents/main/sessions）
-        print("\n[Restore] Post-restore check:")
-        for p in [
-            OPENCLAW_DIR,
-            os.path.join(OPENCLAW_DIR, "agents", "main", "sessions"),
-            os.path.join(OPENCLAW_DIR, "sessions")
-        ]:
-            if os.path.exists(p):
-                files = list(os.listdir(p))
-                print(f"   ✓ {p} → {len(files)} items")
-                if "sessions" in p and any(f.endswith(".jsonl") for f in files[:10]):
-                    print(f"      (contains .jsonl transcripts)")
-            else:
-                print(f"   ✗ {p} missing")
-
-        print("[Restore] Restore finished. Now running openclaw doctor --fix...")
-
+        
+        # 直接下载最新文件
+        print(f"Downloading {FILENAME} from {repo_id}...")
+        path = hf_hub_download(repo_id=repo_id, filename=FILENAME, repo_type="dataset", token=token)
+        
+        # 修改为完整恢复 /root/.openclaw 下所有内容
+        with tarfile.open(path, "r:gz") as tar:
+            tar.extractall(path="/root/.openclaw/")
+        print(f"Success: Restored from {FILENAME}")
         return True
-
-    except (RepositoryNotFoundError, EntryNotFoundError):
-        print("[Restore] No backup found yet (normal on first run).")
     except Exception as e:
-        print(f"[Restore] Error: {e}")
-    finally:
-        if 'download_path' in locals() and os.path.exists(download_path):
-            try:
-                os.remove(download_path)
-            except:
-                pass
+        # 如果是第一次运行，仓库里没文件，报错是正常的
+        print(f"Restore Note: No existing backup found or error: {e}")
 
 def backup():
     try:
         if not repo_id or not token:
-            print("Skip Backup")
-            return
-        if not os.path.exists(OPENCLAW_DIR):
-            print("No data to backup")
+            print("Skip Backup: HF_DATASET or HF_TOKEN not set")
             return
 
-        print(f"[Backup] Backing up entire {OPENCLAW_DIR}...")
+        # 修改为备份 /root/.openclaw 下全部文件和文件夹
         with tarfile.open(FILENAME, "w:gz") as tar:
-            tar.add(OPENCLAW_DIR, arcname=os.path.basename(OPENCLAW_DIR))
+            tar.add("/root/.openclaw", arcname=".")
 
+        # 上传并覆盖
         api.upload_file(
             path_or_fileobj=FILENAME,
             path_in_repo=FILENAME,
@@ -104,15 +45,9 @@ def backup():
             repo_type="dataset",
             token=token
         )
-        print("[Backup] ✅ Success")
+        print(f"Backup {FILENAME} Success (Overwritten).")
     except Exception as e:
-        print(f"[Backup] Error: {e}")
-    finally:
-        if os.path.exists(FILENAME):
-            try:
-                os.remove(FILENAME)
-            except:
-                pass
+        print(f"Backup Error: {e}")
 
 if __name__ == "__main__":
     if len(sys.argv) > 1 and sys.argv[1] == "backup":