dfs-sync 1.0.2__tar.gz → 1.0.4__tar.gz

{dfs_sync-1.0.2/dfs_sync.egg-info → dfs_sync-1.0.4}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dfs-sync
-Version: 1.0.2
+Version: 1.0.4
 Summary: 文件传输工具
 Author-email: xigua <2587125111@qq.com>
 License: MIT

{dfs_sync-1.0.2 → dfs_sync-1.0.4}/dfs/__init__.py

@@ -5,7 +5,7 @@ DFS - 分布式文件同步工具
 支持协议: SFTP
 """
 
-__version__ = "1.0.2"
+__version__ = "1.0.4"
 __author__ = "xigua"
 __description__ = "分布式文件同步工具 - 高性能并发文件传输"
 

{dfs_sync-1.0.2 → dfs_sync-1.0.4}/dfs/core/transfer_manager.py

@@ -365,9 +365,10 @@ class TransferManager:
             if file_info.is_directory:
                 continue
             
-            # 计算本地文件路径
-            rel_path = os.path.relpath(file_info.path, remote_path)
-            local_file_path = self.path_handler.join_paths(local_path, rel_path)
+            # 计算本地文件路径（Windows 下自动净化非法字符）
+            local_file_path = self.path_handler.remote_to_local_path(
+                file_info.path, remote_path, local_path
+            )
             
             # 应用文件过滤器
             if self.file_filter.should_ignore(file_info.path, remote_path):
@@ -437,9 +438,10 @@ class TransferManager:
                 if not file_info or file_info.is_directory:
                     continue
                 
-                # 计算本地文件路径
-                rel_path = os.path.relpath(file_path, remote_path)
-                local_file_path = self.path_handler.join_paths(local_path, rel_path)
+                # 计算本地文件路径（Windows 下自动净化非法字符）
+                local_file_path = self.path_handler.remote_to_local_path(
+                    file_path, remote_path, local_path
+                )
                 
                 # 直接创建任务（使用已获取的基础信息）
                 await self._add_file_task_with_basic_info(

{dfs_sync-1.0.2 → dfs_sync-1.0.4}/dfs/utils/path_handler.py

@@ -411,6 +411,57 @@ class PathHandler:
         """
         return os.path.expanduser(path)
     
+    @staticmethod
+    def sanitize_windows_filename(name: str) -> str:
+        """
+        将文件名组件中 Windows 不支持的字符替换为百分号编码形式。
+        Windows 文件名非法字符（不含路径分隔符）: : * ? " < > |
+        """
+        replacements = {
+            ':': '%3A',
+            '*': '%2A',
+            '?': '%3F',
+            '"': '%22',
+            '<': '%3C',
+            '>': '%3E',
+            '|': '%7C',
+        }
+        for char, encoded in replacements.items():
+            name = name.replace(char, encoded)
+        return name
+
+    def remote_to_local_path(self, remote_file_path: str, remote_base: str, local_base: str) -> str:
+        """
+        将远程文件路径转换为本地路径，在 Windows 上自动净化非法字符。
+
+        Args:
+            remote_file_path: 远程文件完整路径（使用正斜杠）
+            remote_base: 远程基础目录路径
+            local_base: 本地基础目录路径
+
+        Returns:
+            适合当前操作系统的本地文件路径
+        """
+        remote_file_norm = remote_file_path.replace('\\', '/')
+        remote_base_norm = remote_base.replace('\\', '/')
+        if not remote_base_norm.endswith('/'):
+            remote_base_norm += '/'
+
+        if remote_file_norm.startswith(remote_base_norm):
+            rel_str = remote_file_norm[len(remote_base_norm):]
+        else:
+            rel_str = os.path.relpath(remote_file_path, remote_base).replace('\\', '/')
+
+        components = [c for c in rel_str.split('/') if c]
+        if not components:
+            return local_base
+
+        if platform.system() == 'Windows':
+            components = [self.sanitize_windows_filename(c) for c in components]
+
+        local_rel = os.path.join(*components)
+        return os.path.join(local_base, local_rel)
+
     def get_path_type(self, path: str) -> str:
         """
         获取路径类型

{dfs_sync-1.0.2 → dfs_sync-1.0.4}/dfs/utils/progress_display.py

@@ -9,13 +9,22 @@
 """
 
 import os
-import sys
 import time
 import threading
 from typing import Dict, Optional
 from ..protocols.base import TransferProgress, TransferStatus
 
 
+_ICONS = {
+    'upload':   '↑ ',
+    'download': '↓ ',
+    'skip':     '» ',
+    'ok':       '✓ ',
+    'fail':     '✗ ',
+    'other':    '- ',
+}
+
+
 class SimpleProgressDisplay:
     """简化的进度显示器"""
     
@@ -207,19 +216,19 @@ class SimpleProgressDisplay:
         Returns:
             格式化的进度行字符串
         """
-        # 状态图标（统一在此处配置）
+        # 状态图标
         if progress.status == TransferStatus.UPLOADING:
-            icon = "⬆️ "
+            icon = _ICONS['upload']
         elif progress.status == TransferStatus.DOWNLOADING:
-            icon = "⬇️ "
+            icon = _ICONS['download']
         elif progress.status == TransferStatus.COMPLETED and progress.is_skipped:
-            icon = "⏭️ "
+            icon = _ICONS['skip']
         elif progress.status == TransferStatus.COMPLETED:
-            icon = "✅"
+            icon = _ICONS['ok']
         elif progress.status == TransferStatus.FAILED:
-            icon = "❌"
+            icon = _ICONS['fail']
         else:
-            icon = "📁"
+            icon = _ICONS['other']
 
         # 分配任务序号（首次出现时）；调用方已持有 _lock
         file_path = progress.file_path

{dfs_sync-1.0.2 → dfs_sync-1.0.4/dfs_sync.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: dfs-sync
-Version: 1.0.2
+Version: 1.0.4
 Summary: 文件传输工具
 Author-email: xigua <2587125111@qq.com>
 License: MIT