From 9a1fe19cc889b7aa996c634f32902d4a6154747e Mon Sep 17 00:00:00 2001
From: Will Miao <13051207myq@gmail.com>
Date: Sat, 15 Mar 2025 14:58:40 +0800
Subject: [PATCH] Enhance DownloadManager and LoraFileHandler to support
 dynamic ignore path management with expiration times. Added handling for
 alternative path formats and improved logging for added and removed paths.

---
 py/services/download_manager.py | 17 ++++++---
 py/services/file_monitor.py     | 61 +++++++++++++++++++++++++++++----
 2 files changed, 66 insertions(+), 12 deletions(-)

diff --git a/py/services/download_manager.py b/py/services/download_manager.py
index b22b99ca..b5d48d6d 100644
--- a/py/services/download_manager.py
+++ b/py/services/download_manager.py
@@ -42,11 +42,18 @@ class DownloadManager:
             save_path = os.path.join(save_dir, file_name)
             file_size = file_info.get('sizeKB', 0) * 1024
 
-            # 4. 通知文件监控系统
-            self.file_monitor.handler.add_ignore_path(
-                save_path.replace(os.sep, '/'),
-                file_size
-            )
+            # 4. 通知文件监控系统 - 使用规范化路径和文件大小
+            if self.file_monitor and self.file_monitor.handler:
+                # Add both the normalized path and potential alternative paths
+                normalized_path = save_path.replace(os.sep, '/')
+                self.file_monitor.handler.add_ignore_path(normalized_path, file_size)
+                
+                # Also add the path with file extension variations (.safetensors)
+                if not normalized_path.endswith('.safetensors'):
+                    safetensors_path = os.path.splitext(normalized_path)[0] + '.safetensors'
+                    self.file_monitor.handler.add_ignore_path(safetensors_path, file_size)
+                
+                logger.debug(f"Added download path to ignore list: {normalized_path} (size: {file_size} bytes)")
 
             # 5. 准备元数据
             metadata = LoraMetadata.from_civitai_info(version_info, file_info, save_path)
diff --git a/py/services/file_monitor.py b/py/services/file_monitor.py
index 33b53448..849ba2a0 100644
--- a/py/services/file_monitor.py
+++ b/py/services/file_monitor.py
@@ -20,29 +20,76 @@ class LoraFileHandler(FileSystemEventHandler):
         self.pending_changes = set()  # 待处理的变更
         self.lock = Lock()  # 线程安全锁
         self.update_task = None  # 异步更新任务
-        self._ignore_paths = set()  # Add ignore paths set
+        self._ignore_paths = {}  # Change to dictionary to store expiration times
         self._min_ignore_timeout = 5  # minimum timeout in seconds
         self._download_speed = 1024 * 1024  # assume 1MB/s as base speed
 
     def _should_ignore(self, path: str) -> bool:
         """Check if path should be ignored"""
         real_path = os.path.realpath(path)  # Resolve any symbolic links
-        return real_path.replace(os.sep, '/') in self._ignore_paths
+        normalized_path = real_path.replace(os.sep, '/')
+        
+        # Also check with backslashes for Windows compatibility
+        alt_path = real_path.replace('/', '\\')
+        
+        current_time = asyncio.get_event_loop().time()
+        
+        # Check if path is in ignore list and not expired
+        if normalized_path in self._ignore_paths and self._ignore_paths[normalized_path] > current_time:
+            return True
+        
+        # Also check alternative path format
+        if alt_path in self._ignore_paths and self._ignore_paths[alt_path] > current_time:
+            return True
+            
+        return False
 
     def add_ignore_path(self, path: str, file_size: int = 0):
         """Add path to ignore list with dynamic timeout based on file size"""
         real_path = os.path.realpath(path)  # Resolve any symbolic links
-        self._ignore_paths.add(real_path.replace(os.sep, '/'))
+        normalized_path = real_path.replace(os.sep, '/')
         
-        # Short timeout (e.g. 5 seconds) is sufficient to ignore the CREATE event
-        timeout = 5
+        # Calculate timeout based on file size
+        # For small files, use minimum timeout
+        # For larger files, estimate download time + buffer
+        if file_size > 0:
+            # Estimate download time in seconds (size / speed) + buffer
+            estimated_time = (file_size / self._download_speed) + 10
+            timeout = max(self._min_ignore_timeout, estimated_time)
+        else:
+            timeout = self._min_ignore_timeout
         
+        # Store expiration time instead of just the path
+        current_time = asyncio.get_event_loop().time()
+        expiration_time = current_time + timeout
+        
+        # Store both normalized and alternative path formats
+        self._ignore_paths[normalized_path] = expiration_time
+        
+        # Also store with backslashes for Windows compatibility
+        alt_path = real_path.replace('/', '\\')
+        self._ignore_paths[alt_path] = expiration_time
+        
+        logger.debug(f"Added ignore path: {normalized_path} (expires in {timeout:.1f}s)")
+        
+        # Schedule cleanup after timeout
         asyncio.get_event_loop().call_later(
             timeout,
-            self._ignore_paths.discard,
-            real_path.replace(os.sep, '/')
+            self._remove_ignore_path,
+            normalized_path
         )
+    
+    def _remove_ignore_path(self, path: str):
+        """Remove path from ignore list after timeout"""
+        if path in self._ignore_paths:
+            del self._ignore_paths[path]
+            logger.debug(f"Removed ignore path: {path}")
         
+        # Also remove alternative path format
+        alt_path = path.replace('/', '\\')
+        if alt_path in self._ignore_paths:
+            del self._ignore_paths[alt_path]
+
     def on_created(self, event):
         if event.is_directory or not event.src_path.endswith('.safetensors'):
             return