update

KenyonY · KenyonY · commit ba73e9b91df1 · 2025-11-17T00:55:54.000+08:00
diff --git a/flaxfile/src/flaxfile/cli.py b/flaxfile/src/flaxfile/cli.py
@@ -660,11 +660,9 @@ def pull(
             password: 密码（可选）
 
         示例:
-            flaxfile sync pull myproject
-            flaxfile sync pull myproject /path/to/download
-            flaxfile sync pull myproject /path/to/download --server prod
-
-        注意: 当前版本暂不支持，待实现
+            flaxfile sync pull my_project
+            flaxfile sync pull my_project /path/to/download
+            flaxfile sync pull my_project /path/to/download --server prod
         """
         from .sync import pull_directory
 
diff --git a/flaxfile/src/flaxfile/client.py b/flaxfile/src/flaxfile/client.py
@@ -373,6 +373,37 @@ async def delete_file(self, file_key: str) -> bool:
 
         return frames[1] == b'OK'
 
+    async def list_files(self, prefix: str = "") -> list:
+        """
+        列出服务器上的文件
+
+        Args:
+            prefix: 文件前缀（可选，用于过滤）
+
+        Returns:
+            文件列表，每个文件包含 key, size, mtime
+        """
+        await self.connect()
+
+        await self.socket.send_multipart([b'', b'LIST', prefix.encode('utf-8')])
+        frames = await self.socket.recv_multipart()
+
+        if len(frames) < 2:
+            raise Exception("服务器响应无效")
+
+        if frames[1] == b'ERROR':
+            error_msg = frames[2].decode('utf-8') if len(frames) > 2 else "Unknown error"
+            raise Exception(f"列出文件失败: {error_msg}")
+
+        if frames[1] != b'OK':
+            raise Exception(f"列出文件失败: {frames[1]}")
+
+        # 解析文件列表
+        files_json = frames[2].decode('utf-8')
+        files = json.loads(files_json)
+
+        return files
+
     async def close(self):
         """关闭连接"""
         if self.socket:
@@ -432,6 +463,10 @@ def delete_file(self, file_key: str) -> bool:
         """删除文件 (同步)"""
         return asyncio.run(self.async_client.delete_file(file_key))
 
+    def list_files(self, prefix: str = "") -> list:
+        """列出文件 (同步)"""
+        return asyncio.run(self.async_client.list_files(prefix))
+
     def close(self):
         """关闭连接 (同步)"""
         asyncio.run(self.async_client.close())
diff --git a/flaxfile/src/flaxfile/server.py b/flaxfile/src/flaxfile/server.py
@@ -143,6 +143,9 @@ async def handle_command(self, identity: bytes, command: bytes, args: list):
             elif command == b'DELETE':
                 await self.handle_delete(identity, args)
 
+            elif command == b'LIST':
+                await self.handle_list(identity, args)
+
             else:
                 logger.warning(f"未知命令: {command}")
                 await self.socket.send_multipart([identity, b'', b'ERROR', b'Unknown command'])
@@ -323,6 +326,44 @@ async def handle_delete(self, identity: bytes, args: list):
             logger.error(f"删除失败: {e}")
             await self.socket.send_multipart([identity, b'', b'ERROR', str(e).encode('utf-8')])
 
+    async def handle_list(self, identity: bytes, args: list):
+        """列出指定前缀下的所有文件"""
+        # 获取前缀（可选）
+        prefix = args[0].decode('utf-8') if args else ""
+
+        try:
+            files_info = []
+
+            # 遍历存储目录
+            for file_path in STORAGE_DIR.rglob('*'):
+                if file_path.is_file():
+                    # 计算相对路径
+                    relative_path = file_path.relative_to(STORAGE_DIR)
+                    key = str(relative_path)
+
+                    # 如果指定了前缀，只返回匹配的文件
+                    if prefix and not key.startswith(prefix):
+                        continue
+
+                    # 获取文件信息
+                    stat = file_path.stat()
+                    files_info.append({
+                        'key': key,
+                        'size': stat.st_size,
+                        'mtime': stat.st_mtime
+                    })
+
+            # 序列化文件列表
+            import json
+            files_json = json.dumps(files_info).encode('utf-8')
+
+            logger.info(f"📋 列出文件: 前缀='{prefix}', 数量={len(files_info)}")
+            await self.socket.send_multipart([identity, b'', b'OK', files_json])
+
+        except Exception as e:
+            logger.error(f"列出文件失败: {e}")
+            await self.socket.send_multipart([identity, b'', b'ERROR', str(e).encode('utf-8')])
+
     async def stop(self):
         """停止服务器"""
         # 关闭所有活跃的上传
diff --git a/flaxfile/src/flaxfile/sync.py b/flaxfile/src/flaxfile/sync.py
@@ -179,7 +179,12 @@ def push_directory(
     console.print(f"[cyan]📊 总大小: {total_bytes / (1024*1024):.2f} MB")
     console.print()
 
-    # 3. 上传所有文件
+    # 3. 先连接到服务器（在显示进度条之前完成密码输入）
+    console.print("[cyan]🔗 连接到服务器...")
+    client.connect()
+    console.print()
+
+    # 4. 上传所有文件
     uploaded = 0
     failed = 0
     failed_files = []
@@ -264,9 +269,6 @@ def pull_directory(
     """
     从服务器下载目录到本地
 
-    注意：当前实现需要客户端维护远程文件列表
-    后续可以添加服务器端 LIST 命令来优化
-
     Args:
         client: FlaxFileClient 实例
         remote_dir: 远程目录名称
@@ -277,12 +279,143 @@ def pull_directory(
     Returns:
         同步结果统计
     """
-    console.print("[yellow]⚠️  pull 功能需要服务器支持文件列表功能")
-    console.print("[yellow]   当前版本暂不支持，请等待后续更新")
+    # 1. 先连接到服务器（在显示进度条之前完成密码输入）
+    console.print("[cyan]🔗 连接到服务器...")
+    client.connect()
+    console.print()
+
+    # 2. 列出远程文件
+    console.print(f"[cyan]📋 获取远程文件列表: {remote_dir}/")
+
+    try:
+        files = client.list_files(prefix=remote_dir)
+    except Exception as e:
+        console.print(f"[red]✗ 获取文件列表失败: {e}")
+        return {
+            'total_files': 0,
+            'downloaded': 0,
+            'failed': 0,
+            'total_bytes': 0
+        }
+
+    if not files:
+        console.print("[yellow]⚠️  远程目录为空或不存在")
+        return {
+            'total_files': 0,
+            'downloaded': 0,
+            'failed': 0,
+            'total_bytes': 0
+        }
+
+    console.print(f"[green]✓ 发现 {len(files)} 个文件")
+
+    # 3. 计算总大小
+    total_bytes = sum(f['size'] for f in files)
+    console.print(f"[cyan]📊 总大小: {total_bytes / (1024*1024):.2f} MB")
+    console.print()
+
+    # 4. 创建本地目录
+    local_dir_path = Path(local_dir)
+    local_dir_path.mkdir(parents=True, exist_ok=True)
+
+    # 5. 下载所有文件
+    downloaded = 0
+    failed = 0
+    failed_files = []
+
+    if show_progress:
+        with Progress(
+            SpinnerColumn(),
+            TextColumn("[bold blue]{task.description}"),
+            BarColumn(),
+            TaskProgressColumn(),
+            TransferSpeedColumn(),
+            TimeRemainingColumn(),
+            console=console,
+        ) as progress:
+            main_task = progress.add_task(
+                f"[cyan]下载 {remote_dir}/",
+                total=len(files)
+            )
+
+            for file_info in files:
+                remote_key = file_info['key']
+
+                # 计算本地路径（移除远程目录前缀）
+                if remote_key.startswith(remote_dir + '/'):
+                    rel_path = remote_key[len(remote_dir) + 1:]
+                elif remote_key.startswith(remote_dir):
+                    rel_path = remote_key[len(remote_dir):]
+                else:
+                    rel_path = remote_key
+
+                local_path = local_dir_path / rel_path
+
+                try:
+                    # 更新当前文件描述
+                    progress.update(
+                        main_task,
+                        description=f"[cyan]下载: {rel_path}"
+                    )
+
+                    # 创建父目录
+                    local_path.parent.mkdir(parents=True, exist_ok=True)
+
+                    # 下载文件（不显示单文件进度，避免刷屏）
+                    client.download_file(remote_key, str(local_path), show_progress=False)
+                    downloaded += 1
+
+                except Exception as e:
+                    failed += 1
+                    failed_files.append((rel_path, str(e)))
+                    console.print(f"[red]✗ 下载失败: {rel_path} - {e}")
+
+                # 更新进度
+                progress.update(main_task, advance=1)
+
+    else:
+        # 无进度条模式
+        for file_info in files:
+            remote_key = file_info['key']
+
+            # 计算本地路径
+            if remote_key.startswith(remote_dir + '/'):
+                rel_path = remote_key[len(remote_dir) + 1:]
+            elif remote_key.startswith(remote_dir):
+                rel_path = remote_key[len(remote_dir):]
+            else:
+                rel_path = remote_key
+
+            local_path = local_dir_path / rel_path
+
+            try:
+                console.print(f"[cyan]下载: {rel_path}")
+
+                # 创建父目录
+                local_path.parent.mkdir(parents=True, exist_ok=True)
+
+                # 下载文件
+                client.download_file(remote_key, str(local_path), show_progress=False)
+                downloaded += 1
+
+            except Exception as e:
+                failed += 1
+                failed_files.append((rel_path, str(e)))
+                console.print(f"[red]✗ 下载失败: {rel_path} - {e}")
+
+    # 6. 显示结果
+    console.print()
+    if failed == 0:
+        console.print(f"[bold green]✓ 同步完成! 成功下载 {downloaded} 个文件到 {local_dir}")
+    else:
+        console.print(f"[yellow]⚠️  同步完成，但有 {failed} 个文件失败:")
+        for rel_path, error in failed_files:
+            console.print(f"  [red]✗ {rel_path}: {error}")
 
     return {
-        'total_files': 0,
-        'downloaded': 0,
-        'failed': 0,
-        'total_bytes': 0
+        'total_files': len(files),
+        'downloaded': downloaded,
+        'failed': failed,
+        'failed_files': failed_files,
+        'total_bytes': total_bytes
     }
