feat: shutdown & multi thread per book

Author: dfface

epub_browser/main.py

@@ -101,33 +101,30 @@ def add_book_thread(filename, pbar):
         return
 
     # 是否需要监控
+    watcher = EPUBWatcher(args.filename, library)
     def watch_changes():
-        watcher = EPUBWatcher(args.filename, library)
-        watcher.watch()
-   
+        try:
+            watcher.watch()
+        except Exception as e:
+            print(f"Error occurred: {e}")  
+
     if args.watch:
         watchdog_thread = threading.Thread(
             target=watch_changes, name="WatchdogThread"
         )
         watchdog_thread.daemon = True # 设置为守护线程（可选，这样主程序退出时线程会自动结束）
         watchdog_thread.start()
-    
+         
     # 创建服务器
+    server_instance = EPUBServer(library, args.log)
     def start_serve():
-        server_instance = EPUBServer(library, args.log)
         try:
             server_instance.start_server(
                 port=args.port, 
                 no_browser=args.no_browser,
             )
-        except KeyboardInterrupt:
-            print("\n\nShutting down server...")
         except Exception as e:
-            print(f"Error occurred: {e}")
-        finally:
-            server_instance.stop_server()
-            if not args.keep_files:
-                library.cleanup()
+            print(f"Error occurred: {e}")   
 
     server_thread = threading.Thread(
         target=start_serve, name="ServerThread"
@@ -142,11 +139,17 @@ def start_serve():
             if not server_thread.is_alive():
                 print("Server down")
                 break
-            if not watchdog_thread.is_alive():
-                print("Watchdog down")
-                break
+            if args.watch and watchdog_thread:
+                if not watchdog_thread.is_alive():
+                    print("Watchdog down")
+                    break
     except KeyboardInterrupt:
         print("\nShutting down...")
+    except Exception as e:
+        print(f"Error occurred: {e}")
+    finally:
+        if not args.keep_files:
+            library.cleanup()
 
 
 if __name__ == '__main__':

epub_browser/processor.py

@@ -7,6 +7,9 @@
 import hashlib
 import json
 import minify_html
+import threading
+
+from concurrent.futures import ThreadPoolExecutor
 from datetime import datetime
 
 class EPUBProcessor:
@@ -566,26 +569,41 @@ def create_index_page(self):
 
     def create_chapter_pages(self):
         """创建章节页面"""
-        for i, chapter in enumerate(self.chapters):
-            chapter_path = os.path.join(self.extract_dir, chapter['path'])
-            
-            if os.path.exists(chapter_path):
-                try:
-                    # 读取章节内容
-                    with open(chapter_path, 'r', encoding='utf-8') as f:
-                        content = f.read()
-                    
-                    # 处理HTML内容，修复资源链接并提取样式
-                    body_content, style_links = self.process_html_content(content, chapter['path'])
-                    
-                    # 创建章节页面
-                    chapter_html = self.create_chapter_template(body_content, style_links, i, chapter['title'])
+        def create_chapter_page(chapter_path, chapter, i):
+            try:
+                # 读取章节内容
+                with open(chapter_path, 'r', encoding='utf-8') as f:
+                    content = f.read()
+                
+                # 处理HTML内容，修复资源链接并提取样式
+                body_content, style_links = self.process_html_content(content, chapter['path'])
+                
+                # 创建章节页面
+                chapter_html = self.create_chapter_template(body_content, style_links, i, chapter['title'])
+                
+                with open(os.path.join(self.web_dir, f'chapter_{i}.html'), 'w', encoding='utf-8') as f:
+                    f.write(chapter_html)
 
-                    with open(os.path.join(self.web_dir, f'chapter_{i}.html'), 'w', encoding='utf-8') as f:
-                        f.write(chapter_html)
-                        
-                except Exception as e:
-                    print(f"Failed to process chapter {chapter['path']}: {e}")
+            except Exception as e:
+                print(f"Failed to process chapter {chapter['path']}: {e}")
+        
+        # 创建并启动线程
+        threads = []
+        with ThreadPoolExecutor(max_workers=10) as executor:  # 限制最大10个并发线程
+            for i, chapter in enumerate(self.chapters):
+                chapter_path = os.path.join(self.extract_dir, chapter['path'])
+                if os.path.exists(chapter_path):
+                    thread = threading.Thread(
+                        target=create_chapter_page,
+                        args=(chapter_path, chapter, i)
+                    )
+                    threads.append(thread)
+                    thread.start()
+
+            # 等待所有线程完成
+            for thread in threads:
+                thread.join()
+                
 
     def process_html_content(self, content, chapter_path):
         """处理HTML内容，修复资源链接并提取样式"""

epub_browser/watch.py

@@ -38,7 +38,7 @@ def on_created(self, event):
                 book_hash = book_info['hash']
                 self.library.move_book(book_hash)
                 self.library.create_library_home()
-                print(f"[Added] book: {book_info['title']}")
+                print(f"Added book: {book_info['title']}")
 
     def on_modified(self, event):
         if not event.is_directory and event.src_path.endswith('.epub'):
@@ -55,7 +55,7 @@ def on_modified(self, event):
                 book_hash = book_info['hash']
                 self.library.move_book(book_hash)
                 self.library.create_library_home()
-                print(f"[Updated] book: {book_info['title']}")
+                print(f"Updated book: {book_info['title']}")
 
     def on_deleted(self, event):
         if not event.is_directory and event.src_path.endswith('.epub'):
@@ -72,11 +72,11 @@ def on_deleted(self, event):
                 book_info = self.library.books[book_hash]
                 self.library.remove_book(book_hash)
                 self.library.create_library_home()
-                print(f"[Deleted] book: {book_info['title']}")
+                print(f"Deleted book: {book_info['title']}")
 
     def on_moved(self, event):
         if not event.is_directory and event.src_path.endswith('.epub'):
-            title = event.src_path
+            title = os.path.basename(event.src_path)
             if event.src_path in self.library.file2hash:
                 book_hash = self.library.file2hash[event.src_path]
                 book_info = self.library.books[book_hash]
@@ -87,15 +87,16 @@ def on_moved(self, event):
                 book_info = self.library.books[book_hash]
                 self.library.remove_book(book_hash)
                 self.library.create_library_home()
-                print(f"[Deleted] book: {book_info['title']}")
+                print(f"Deleted book: {book_info['title']}")
         if event.dest_path.endswith('.epub'):
+            print(f"Waiting to add book...")
             if (not os.path.basename(event.dest_path).startswith(".")) and (not self.has_hidden_component(event.dest_path)):
                 ok, book_info = self.library.add_book(event.dest_path)
                 if ok:
                     book_hash = book_info['hash']
                     self.library.move_book(book_hash)
                     self.library.create_library_home()
-                    print(f"[Added] book: {book_info['title']}")
+                    print(f"Added book: {book_info['title']}")
 
 class EPUBWatcher:
     def __init__(self, paths, library):