Update remote_uploader.py

remote_uploader.py

@@ -1,4 +1,3 @@
-# remote_uploader.py
 import requests
 import argparse
 import os
@@ -13,6 +12,26 @@ class FileUploadHandler(FileSystemEventHandler):
         self.space_id = space_id
         self.uploaded_files = set()  # 跟踪已上传的文件
         
+    def send_log(self, message):
+        """发送日志到服务器"""
+        try:
+            log_url = f"{self.server_url.rstrip('/')}/api/remote_log"
+            headers = {
+                'X-API-Key': self.api_key,
+                'Content-Type': 'application/json'
+            }
+            data = {
+                'space_id': self.space_id,
+                'message': message,
+                'timestamp': time.time()
+            }
+            
+            response = requests.post(log_url, headers=headers, json=data, timeout=5)
+            if response.status_code != 200:
+                print(f"发送日志失败: {response.status_code}")
+        except Exception as e:
+            print(f"发送日志异常: {e}")
+        
     def on_created(self, event):
         """当新文件被创建时触发"""
         if not event.is_directory:
@@ -30,7 +49,9 @@ class FileUploadHandler(FileSystemEventHandler):
     def upload_file(self, file_path):
         """上传单个文件"""
         if not os.path.exists(file_path):
-            print(f"文件不存在: {file_path}")
+            message = f"文件不存在: {file_path}"
+            print(message)
+            self.send_log(message)
             return
         
         filename = os.path.basename(file_path)
@@ -39,8 +60,13 @@ class FileUploadHandler(FileSystemEventHandler):
         if file_path in self.uploaded_files:
             return
             
-        print(f"检测到新文件: {filename}")
-        print(f"正在上传到服务器...")
+        message = f"检测到新文件: {filename}"
+        print(message)
+        self.send_log(message)
+        
+        message = f"正在上传到服务器..."
+        print(message)
+        self.send_log(message)
         
         # 构建完整的 API 端点 URL
         upload_url = f"{self.server_url.rstrip('/')}/api/remote_upload"
@@ -64,22 +90,36 @@ class FileUploadHandler(FileSystemEventHandler):
                 response = requests.post(upload_url, headers=headers, data=data, files=files)
                 
                 # 打印服务器响应
-                print(f"服务器响应 ({response.status_code}):")
+                message = f"服务器响应 ({response.status_code}):"
+                print(message)
+                self.send_log(message)
+                
                 try:
                     result = response.json()
                     print(result)
+                    self.send_log(str(result))
+                    
                     if response.status_code == 200:
                         self.uploaded_files.add(file_path)
-                        print(f"✅ 文件 '{filename}' 上传成功!")
+                        success_msg = f"✅ 文件 '{filename}' 上传成功!"
+                        print(success_msg)
+                        self.send_log(success_msg)
                     else:
-                        print(f"❌ 上传失败: {result.get('error', '未知错误')}")
+                        error_msg = f"❌ 上传失败: {result.get('error', '未知错误')}"
+                        print(error_msg)
+                        self.send_log(error_msg)
                 except requests.exceptions.JSONDecodeError:
                     print(response.text)
+                    self.send_log(response.text)
                     
         except IOError as e:
-            print(f"读取文件时出错: {e}")
+            error_msg = f"读取文件时出错: {e}"
+            print(error_msg)
+            self.send_log(error_msg)
         except requests.exceptions.RequestException as e:
-            print(f"请求时出错: {e}")
+            error_msg = f"请求时出错: {e}"
+            print(error_msg)
+            self.send_log(error_msg)
 
 def monitor_directory(watch_dir, server_url, api_key, space_id):
     """监听目录变化"""
@@ -87,21 +127,40 @@ def monitor_directory(watch_dir, server_url, api_key, space_id):
         print(f"创建监听目录: {watch_dir}")
         os.makedirs(watch_dir, exist_ok=True)
     
-    print(f"🔍 开始监听目录: {watch_dir}")
-    print(f"📡 服务器地址: {server_url}")
-    print(f"🔑 Space ID: {space_id}")
-    print("等待新文件...")
+    handler = FileUploadHandler(server_url, api_key, space_id)
+    
+    start_msg = f"🔍 开始监听目录: {watch_dir}"
+    print(start_msg)
+    handler.send_log(start_msg)
+    
+    server_msg = f"📡 服务器地址: {server_url}"
+    print(server_msg)
+    handler.send_log(server_msg)
+    
+    space_msg = f"🔑 Space ID: {space_id}"
+    print(space_msg)
+    handler.send_log(space_msg)
+    
+    wait_msg = "等待新文件..."
+    print(wait_msg)
+    handler.send_log(wait_msg)
+    
     print("-" * 50)
+    handler.send_log("-" * 50)
     
     # 首先上传目录中已���在的文件
-    handler = FileUploadHandler(server_url, api_key, space_id)
     existing_files = [f for f in os.listdir(watch_dir) if os.path.isfile(os.path.join(watch_dir, f))]
     if existing_files:
-        print(f"发现 {len(existing_files)} 个已存在的文件，开始上传...")
+        existing_msg = f"发现 {len(existing_files)} 个已存在的文件，开始上传..."
+        print(existing_msg)
+        handler.send_log(existing_msg)
+        
         for filename in existing_files:
             file_path = os.path.join(watch_dir, filename)
             handler.upload_file(file_path)
+        
         print("-" * 50)
+        handler.send_log("-" * 50)
     
     # 创建观察者并开始监听
     observer = Observer()
@@ -112,7 +171,9 @@ def monitor_directory(watch_dir, server_url, api_key, space_id):
         while True:
             time.sleep(1)
     except KeyboardInterrupt:
-        print("\n停止监听...")
+        stop_msg = "\n停止监听..."
+        print(stop_msg)
+        handler.send_log(stop_msg)
         observer.stop()
     
     observer.join()