Update remote_uploader.py

remote_uploader.py

@@ -2,71 +2,21 @@ import requests
 import argparse
 import os
 import time
-from watchdog.observers import Observer
-from watchdog.events import FileSystemEventHandler
 
-class FileUploadHandler(FileSystemEventHandler):
+class FileUploader:
     def __init__(self, server_url, api_key, space_id):
         self.server_url = server_url
         self.api_key = api_key
         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:
-            # 等待一段时间确保文件写入完成
-            time.sleep(1)
-            self.upload_file(event.src_path)
-    
-    def on_modified(self, event):
-        """当文件被修改时触发"""
-        if not event.is_directory:
-            # 等待一段时间确保文件写入完成
-            time.sleep(1)
-            self.upload_file(event.src_path)
-    
     def upload_file(self, file_path):
         """上传单个文件"""
         if not os.path.exists(file_path):
-            message = f"文件不存在: {file_path}"
-            print(message)
-            self.send_log(message)
-            return
+            print(f"文件不存在: {file_path}")
+            return False
         
         filename = os.path.basename(file_path)
-        
-        # 避免重复上传同一个文件
-        if file_path in self.uploaded_files:
-            return
-            
-        message = f"检测到新文件: {filename}"
-        print(message)
-        self.send_log(message)
-        
-        message = f"正在上传到服务器..."
-        print(message)
-        self.send_log(message)
+        print(f"正在上传文件: {filename}")
         
         # 构建完整的 API 端点 URL
         upload_url = f"{self.server_url.rstrip('/')}/api/remote_upload"
@@ -90,102 +40,85 @@ class FileUploadHandler(FileSystemEventHandler):
                 response = requests.post(upload_url, headers=headers, data=data, files=files)
                 
                 # 打印服务器响应
-                message = f"服务器响应 ({response.status_code}):"
-                print(message)
-                self.send_log(message)
-                
+                print(f"服务器响应 ({response.status_code}):")
                 try:
                     result = response.json()
                     print(result)
-                    self.send_log(str(result))
-                    
                     if response.status_code == 200:
-                        self.uploaded_files.add(file_path)
-                        success_msg = f"✅ 文件 '{filename}' 上传成功!"
-                        print(success_msg)
-                        self.send_log(success_msg)
+                        print(f"✅ 文件 '{filename}' 上传成功!")
+                        return True
                     else:
-                        error_msg = f"❌ 上传失败: {result.get('error', '未知错误')}"
-                        print(error_msg)
-                        self.send_log(error_msg)
+                        print(f"❌ 上传失败: {result.get('error', '未知错误')}")
+                        return False
                 except requests.exceptions.JSONDecodeError:
                     print(response.text)
-                    self.send_log(response.text)
+                    return False
                     
         except IOError as e:
-            error_msg = f"读取文件时出错: {e}"
-            print(error_msg)
-            self.send_log(error_msg)
+            print(f"读取文件时出错: {e}")
+            return False
         except requests.exceptions.RequestException as e:
-            error_msg = f"请求时出错: {e}"
-            print(error_msg)
-            self.send_log(error_msg)
+            print(f"请求时出错: {e}")
+            return False
 
-def monitor_directory(watch_dir, server_url, api_key, space_id):
-    """监听目录变化"""
+def upload_directory_once(watch_dir, server_url, api_key, space_id):
+    """一次性扫描并上传目录中的所有文件"""
     if not os.path.exists(watch_dir):
-        print(f"创建监听目录: {watch_dir}")
-        os.makedirs(watch_dir, exist_ok=True)
+        print(f"目录不存在: {watch_dir}")
+        return
     
-    handler = FileUploadHandler(server_url, api_key, space_id)
+    print(f"🔍 开始扫描目录: {watch_dir}")
+    print(f"📡 服务器地址: {server_url}")
+    print(f"🔑 Space ID: {space_id}")
+    print("-" * 50)
     
-    start_msg = f"🔍 开始监听目录: {watch_dir}"
-    print(start_msg)
-    handler.send_log(start_msg)
+    uploader = FileUploader(server_url, api_key, space_id)
     
-    server_msg = f"📡 服务器地址: {server_url}"
-    print(server_msg)
-    handler.send_log(server_msg)
+    # 获取所有文件
+    all_files = []
+    for root, dirs, files in os.walk(watch_dir):
+        for file in files:
+            file_path = os.path.join(root, file)
+            if os.path.isfile(file_path):
+                all_files.append(file_path)
     
-    space_msg = f"🔑 Space ID: {space_id}"
-    print(space_msg)
-    handler.send_log(space_msg)
+    if not all_files:
+        print("📁 目录中没有找到任何文件")
+        return
     
-    wait_msg = "等待新文件..."
-    print(wait_msg)
-    handler.send_log(wait_msg)
+    print(f"📁 找到 {len(all_files)} 个文件，开始上传...")
     
-    print("-" * 50)
-    handler.send_log("-" * 50)
+    success_count = 0
+    failed_count = 0
     
-    # 首先上传目录中已存在的文件
-    existing_files = [f for f in os.listdir(watch_dir) if os.path.isfile(os.path.join(watch_dir, f))]
-    if 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)
+    for file_path in all_files:
+        try:
+            if uploader.upload_file(file_path):
+                success_count += 1
+            else:
+                failed_count += 1
+            # 稍微延迟一下，避免服务器压力过大
+            time.sleep(0.5)
+        except Exception as e:
+            print(f"上传文件 {file_path} 时发生异常: {e}")
+            failed_count += 1
     
-    # 创建观察者并开始监听
-    observer = Observer()
-    observer.schedule(handler, watch_dir, recursive=False)
-    observer.start()
+    print("-" * 50)
+    print(f"📊 上传完成! 成功: {success_count}, 失败: {failed_count}")
     
-    try:
-        while True:
-            time.sleep(1)
-    except KeyboardInterrupt:
-        stop_msg = "\n停止监听..."
-        print(stop_msg)
-        handler.send_log(stop_msg)
-        observer.stop()
+    if success_count > 0:
+        print("🎉 文件已成功上传到您的网盘!")
     
-    observer.join()
+    return success_count, failed_count
 
 if __name__ == "__main__":
-    parser = argparse.ArgumentParser(description="远程文件监听上传器 - 自动监听 output 文件夹并上传新文件")
+    parser = argparse.ArgumentParser(description="一次性文件上传器 - 扫描并上传指定文件夹中的所有文件")
     parser.add_argument("api_key", help="您的 API 密钥")
     parser.add_argument("space_id", help="Space ID")
     parser.add_argument("--server", default="http://127.0.0.1:5001", help="服务器的 URL 地址 (默认: http://127.0.0.1:5001)")
-    parser.add_argument("--watch-dir", default="output", help="要监听的目录 (默认: output)")
+    parser.add_argument("--upload-dir", default="output", help="要上传的目录 (默认: output)")
     
     args = parser.parse_args()
     
-    # 开始监听目录
-    monitor_directory(args.watch_dir, args.server, args.api_key, args.space_id)
+    # 开始一次性上传
+    upload_directory_once(args.upload_dir, args.server, args.api_key, args.space_id)