fix: bug #5 #6 #7

Author: dfface

epub_browser/library.py

@@ -92,6 +92,17 @@ def add_book(self, epub_path):
 
             # 存储书籍信息
             book_info = processor.get_book_info()
+            
+            # 如果同一路径之前已有旧记录，先清理旧记录
+            # （用于处理覆盖同名 EPUB 文件的情况，旧 hash 与新 hash 不同）
+            origin_path = book_info['origin_file_path']
+            if origin_path in self.file2hash:
+                old_hash = self.file2hash[origin_path]
+                new_hash = book_info['hash']
+                if old_hash != new_hash and old_hash in self.books:
+                    print(f"[Add] Replacing old version: {self.books[old_hash]['title']} (hash: {old_hash})")
+                    self.remove_book(old_hash)
+            
             self.books[book_info['hash']] = {
                 'temp_dir': book_info['temp_dir'],
                 'title': book_info['title'],
@@ -102,7 +113,7 @@ def add_book(self, epub_path):
                 'processor': processor,
                 'origin_file_path': book_info['origin_file_path']
             }
-            self.file2hash[book_info['origin_file_path']] = book_info['hash']
+            self.file2hash[origin_path] = book_info['hash']
 
             # print(f"Successfully added book: {book_info['title']} (Hash: {book_info['hash']})")
             return True, book_info
@@ -240,7 +251,8 @@ def create_library_home(self):
             cur_tags = book_info['tags']
             if cur_tags:
                 for cur_tag in cur_tags:
-                    all_tags.add(cur_tag)
+                    if isinstance(cur_tag, str) and cur_tag.strip():
+                        all_tags.add(cur_tag.strip())
 
         library_html += f"""
     <div class="container">
@@ -276,7 +288,7 @@ def create_library_home(self):
                 <div class="tag-cloud-item active" data-id="All">All</div>
                 <div class="tag-cloud-item" data-id="NoTag">NoTag</div>
 """
-        for tag in sorted(all_tags):
+        for tag in sorted(t for t in all_tags if isinstance(t, str) and t.strip()):
             library_html += f"""<div class="tag-cloud-item" data-id="{tag}">{tag}</div>"""
         library_html += """
             </div>
@@ -505,12 +517,20 @@ def move_book(self, book_hash):
     def remove_book(self, book_hash):
         book_path = os.path.join(self.base_directory, "book")
         cur_path = os.path.join(book_path, book_hash)
+        
+        # Clean up file2hash mapping
+        if book_hash in self.books:
+            origin_path = self.books[book_hash].get('origin_file_path')
+            if origin_path and origin_path in self.file2hash:
+                del self.file2hash[origin_path]
+        
         if os.path.exists(cur_path):
             try:
                 shutil.rmtree(cur_path)
-                self.books.pop(book_hash)
             except Exception as e:
                 print(f"remove {cur_path} failed, err: {e}")
+        
+        self.books.pop(book_hash, None)
 
     def reorganize_files(self):
         """按照 href 的格式组织目录"""

epub_browser/watch.py

@@ -183,9 +183,27 @@ def _handle_move_source(self, src_path, book_hash, book_info):
     def _handle_move_destination(self, dest_path):
         """处理移动操作目标文件的后台任务"""
         try:
-            print(f"[{str(datetime.now())}][Move] Wait for 3 seconds to allow the file to stabilize before adding it: {dest_path}")
-            time.sleep(3)  # 等待文件稳定
-            print(f"[{str(datetime.now())}][Move] Processing destination addition: {dest_path}")
+            # Wait for the file to stabilize (rclone/WebDAV uploads may need extra time)
+            print(f"[{str(datetime.now())}][Move] Waiting for file to stabilize: {dest_path}")
+            stable = False
+            last_size = -1
+            for attempt in range(10):  # up to ~5 seconds of stabilization
+                if not os.path.exists(dest_path):
+                    print(f"[{str(datetime.now())}][Move] File not found, waiting: {dest_path}")
+                    time.sleep(0.5)
+                    continue
+                current_size = os.path.getsize(dest_path)
+                if current_size == last_size and current_size > 0:
+                    stable = True
+                    break
+                last_size = current_size
+                time.sleep(0.5)
+            
+            if not stable:
+                print(f"[{str(datetime.now())}][Move] File did not stabilize, skipping: {dest_path}")
+                return
+            
+            print(f"[{str(datetime.now())}][Move] File stabilized ({last_size} bytes), processing: {dest_path}")
             with self.library_lock:
                 ok, book_info = self.library.add_book(dest_path)
                 if ok:
@@ -200,27 +218,38 @@ def _handle_move_destination(self, dest_path):
             sys.stderr.flush()
 
     def on_moved(self, event):
-        if not event.is_directory and event.src_path.endswith('.epub'):
-            print(f"[{str(datetime.now())}][Move] EPUB file detected: from {event.src_path} to {event.dest_path}")
-            # 处理源文件删除（如果存在）
-            if event.src_path in self.library.file2hash:
-                book_hash = self.library.file2hash[event.src_path]
-                if book_hash in self.library.books:
-                    book_info = self.library.books[book_hash]
-                    # 提交源文件处理到线程池
-                    task_id = f"move_src_{event.src_path}"
-                    self._submit_task(task_id, self._handle_move_source, event.src_path, book_hash, book_info)
-            
-            # 处理目标文件添加
-            if event.dest_path.endswith('.epub'):
-                if (not os.path.basename(event.dest_path).startswith(".")) and (not self.has_hidden_component(event.dest_path)):
-                    dest_path = event.dest_path
-                    if (os.path.basename(dest_path).startswith(".")) or (self.has_hidden_component(dest_path)):
-                        print(f"[{str(datetime.now())}][Move] Hidden file will not be processed: {dest_path}")
-                        return
-                    # 提交目标文件处理到线程池
-                    task_id = f"move_dest_{dest_path}"
-                    self._submit_task(task_id, self._handle_move_destination, dest_path)
+        if event.is_directory:
+            return
+
+        dest_is_epub = event.dest_path.endswith('.epub')
+        src_is_epub = event.src_path.endswith('.epub')
+
+        # Handle .partial → .epub rename (common with rclone/WebDAV uploads)
+        if not src_is_epub and dest_is_epub:
+            # e.g. file.epub..partial → file.epub
+            if not os.path.basename(event.dest_path).startswith(".") and not self.has_hidden_component(event.dest_path):
+                print(f"[{str(datetime.now())}][Move] EPUB file detected (partial rename): from {event.src_path} to {event.dest_path}")
+                task_id = f"move_dest_{event.dest_path}"
+                self._submit_task(task_id, self._handle_move_destination, event.dest_path)
+            return
+
+        if not src_is_epub:
+            return
+
+        print(f"[{str(datetime.now())}][Move] EPUB file detected: from {event.src_path} to {event.dest_path}")
+        # Handle source deletion (if existed)
+        if event.src_path in self.library.file2hash:
+            book_hash = self.library.file2hash[event.src_path]
+            if book_hash in self.library.books:
+                book_info = self.library.books[book_hash]
+                task_id = f"move_src_{event.src_path}"
+                self._submit_task(task_id, self._handle_move_source, event.src_path, book_hash, book_info)
+
+        # Handle destination addition
+        if dest_is_epub:
+            if not os.path.basename(event.dest_path).startswith(".") and not self.has_hidden_component(event.dest_path):
+                task_id = f"move_dest_{event.dest_path}"
+                self._submit_task(task_id, self._handle_move_destination, event.dest_path)
 
     def shutdown(self):
         """关闭线程池"""

setup.py

@@ -6,7 +6,7 @@
 
 setup(
     name="epub-browser",  # 在PyPI上显示的项目名称
-    version="1.9.1",      # 初始版本号
+    version="1.9.2",      # 初始版本号
     author="dfface",   # 作者名
     author_email="dfface@sina.com",  # 作者邮箱
     keywords="epub reader html export browser convert calibre-web calibre kindle web server local",