Update app.py

app.py

@@ -7,7 +7,7 @@ import asyncio
 import re
 import time
 from threading import Thread
-from webdav3.client import Client
+from webdav3.client import Client as WebdavClient
 
 app = Flask(__name__)
 
@@ -19,7 +19,7 @@ PHP_PROXY_URL = os.environ.get('PHP_PROXY_URL')
 WEBDAV_URL = os.environ.get('WEBDAV_URL')
 WEBDAV_USERNAME = os.environ.get('WEBDAV_USERNAME')
 WEBDAV_PASSWORD = os.environ.get('WEBDAV_PASSWORD')
-WEBDAV_DIRECTORY = '/tg_bot'
+WEBDAV_DIRECTORY = "/tg_bot"
 
 if not all([TELEGRAM_BOT_TOKEN, AI_API_ENDPOINT, AI_API_KEY, AI_MODEL, WEBDAV_URL, WEBDAV_USERNAME, WEBDAV_PASSWORD]):
     raise ValueError("请设置所有必要的环境变量")
@@ -92,55 +92,55 @@ webdav_options = {
     'webdav_login': WEBDAV_USERNAME,
     'webdav_password': WEBDAV_PASSWORD
 }
-webdav_client = Client(webdav_options)
+webdav_client = WebdavClient(webdav_options)
+
+DATA_KEYS = [
+    "chatHistories",
+    "GROUP_SETTINGS",
+    "USER_SETTINGS",
+    "USER_LAST_ACTIVE",
+    "GROUP_ACTIVE_USERS",
+    "GROUP_INFO",
+    "BANNED_USERS"
+]
 
 def save_data_to_webdav():
-    data = {
-        "chatHistories": chatHistories,
-        "GROUP_SETTINGS": GROUP_SETTINGS,
-        "USER_SETTINGS": USER_SETTINGS,
-        "USER_LAST_ACTIVE": {k: v.isoformat() for k, v in USER_LAST_ACTIVE.items()},
-        "GROUP_ACTIVE_USERS": {k: list(v) for k, v in GROUP_ACTIVE_USERS.items()},
-        "GROUP_INFO": {k: {**v, 'last_active': v['last_active'].isoformat()} for k, v in GROUP_INFO.items()},
-        "BANNED_USERS": {k: v.isoformat() for k, v in BANNED_USERS.items()}
-    }
     try:
-        file_name = f"{WEBDAV_DIRECTORY}/data.json"
-        with open("data.json", "w") as f:
-            json.dump(data, f)
-        
         if not webdav_client.check(WEBDAV_DIRECTORY):
             webdav_client.mkdir(WEBDAV_DIRECTORY)
-
-        webdav_client.upload_sync(remote_path=file_name, local_path="data.json")
-        print(f"数据已上传至 WebDAV: {file_name}")
+            print(f"Created directory: {WEBDAV_DIRECTORY}")
     except Exception as e:
-        print(f"上传数据到 WebDAV 失败: {e}")
+        print(f"Error creating directory: {e}")
+        return
+
+    data_to_save = {key: globals()[key] for key in DATA_KEYS}
+    for key, value in data_to_save.items():
+        try:
+            file_path = f"{WEBDAV_DIRECTORY}/{key}.json"
+            with open(f"{key}.json", "w") as f:
+                json.dump(value, f)
+            webdav_client.upload_sync(remote_path=file_path, local_path=f"{key}.json")
+            os.remove(f"{key}.json")
+            print(f"Data saved to WebDAV: {file_path}")
+        except Exception as e:
+            print(f"Error saving data to WebDAV ({file_path}): {e}")
 
 def load_data_from_webdav():
-    global chatHistories, GROUP_SETTINGS, USER_SETTINGS, USER_LAST_ACTIVE, GROUP_ACTIVE_USERS, GROUP_INFO, BANNED_USERS
-    try:
-        file_name = f"{WEBDAV_DIRECTORY}/data.json"
-        if webdav_client.check(file_name):
-            webdav_client.download_sync(remote_path=file_name, local_path="data.json")
-            with open("data.json", "r") as f:
-                data = json.load(f)
-            chatHistories = data.get("chatHistories", {})
-            GROUP_SETTINGS = data.get("GROUP_SETTINGS", {})
-            USER_SETTINGS = data.get("USER_SETTINGS", {})
-            USER_LAST_ACTIVE = {int(k): datetime.fromisoformat(v) for k, v in data.get("USER_LAST_ACTIVE", {}).items()}
-            GROUP_ACTIVE_USERS = {int(k): set(v) for k, v in data.get("GROUP_ACTIVE_USERS", {}).items()}
-            GROUP_INFO = {int(k): {**v, 'last_active': datetime.fromisoformat(v['last_active'])} for k, v in data.get("GROUP_INFO", {}).items()}
-            BANNED_USERS = {int(k): datetime.fromisoformat(v) for k, v in data.get("BANNED_USERS", {}).items()}
-
-            print(f"从 WebDAV 加载数据成功: {file_name}")
-        else:
-            print("WebDAV 上没有找到数据文件，初始化为空数据。")
-            save_data_to_webdav()
-    except Exception as e:
-        print(f"从 WebDAV 加载数据失败: {e}")
+    for key in DATA_KEYS:
+        try:
+            file_path = f"{WEBDAV_DIRECTORY}/{key}.json"
+            if webdav_client.check(file_path):
+                webdav_client.download_sync(remote_path=file_path, local_path=f"{key}.json")
+                with open(f"{key}.json", "r") as f:
+                    globals()[key] = json.load(f)
+                os.remove(f"{key}.json")
+                print(f"Data loaded from WebDAV: {file_path}")
+            else:
+                print(f"File not found on WebDAV: {file_path}")
+        except Exception as e:
+            print(f"Error loading data from WebDAV ({file_path}): {e}")
 
-def webdav_sync_thread():
+def webdav_sync_loop():
     while True:
         save_data_to_webdav()
         time.sleep(60)
@@ -538,5 +538,5 @@ async def unbanUser(chatId, userId):
 
 if __name__ == '__main__':
     load_data_from_webdav()
-    Thread(target=webdav_sync_thread, daemon=True).start()
+    Thread(target=webdav_sync_loop, daemon=True).start()
     app.run(host='0.0.0.0', port=int(os.environ.get('PORT', 7860)))