Release v1.6.7 - 修复多个重要bug

主要修复：
- 修复编辑器预览时AI断句导致横排和竖排文本多余换行的问题
- 修复翻译结束后.env配置更新不生效的问题（清空翻译器缓存）
- 优化异步事件循环清理逻辑，避免资源泄漏

🤖 Generated with [Claude Code](https://claude.com/claude-code)

Co-Authored-By: Claude <noreply@anthropic.com>

Author: hgmzhn

README.md

@@ -149,26 +149,43 @@
 
 **用途**：自定义导出原文的格式，方便使用外部工具翻译
 
-**模版文件位置**：`dict/template_example.txt`
+**模版文件位置**：`examples/translation_template.json`
 
-**模版格式**：
-```
-前缀内容
-<original>原文占位符</original>, <translated>翻译占位符</translated>
-后缀内容
-```
+**模版格式说明**：
+- 使用 JSON 格式
+- 使用 `<original>` 作为原文占位符
+- 使用 `<translated>` 作为译文占位符
+- 可以添加前缀、后缀和自定义分隔符
 
 **示例模版**：
 ```json
-[
-  {"original": "<original>", "translated": "<translated>"},
-]
+{
+    "<original>": "<translated>",
+    "<original>": "<translated>",
+    "<original>": "<translated>"
+}
+```
+
+**三个文本框的具体示例**：
+```json
+{
+    "你好": "Hello",
+    "世界": "World",
+    "欢迎": "Welcome"
+}
 ```
 
+**使用要求**：
+1. 必须使用 `<original>` 和 `<translated>` 作为占位符
+2. 导出时会按照模版中的条目数量进行分组
+3. 每组包含的文本框数量 = 模版中的占位符对数量（本例为 3 个）
+4. 适合批量翻译多个文本框并保持固定格式
+
 **使用方法**：
-1. 编辑 `dict/template_example.txt` 文件
-2. 使用 `<original>` 和 `<translated>` 作为占位符
+1. 编辑 `examples/translation_template.json` 文件
+2. 自定义 JSON 格式和占位符位置
 3. 导出原文时，程序会按照模版格式生成 TXT 文件
+4. 手动翻译后，可以使用"导入翻译并渲染"功能导入
 
 ### AI 断句功能
 
@@ -397,7 +414,7 @@
    - 查看 `ocrs/` 文件夹中的图片，确认每个文本框的内容
    - 查看 `bboxes.png`，确认哪些文本框被成功识别
    - 如果识别率低：降低 **OCR 置信度**，或提高 **Unclip 比例**（让文本框包含更多周边区域）
-   - 如果识别错误多：提高 **OCR 置信度**，或在编辑器中手动调整文本框（确保一个蓝框里只有一行字）
+   - 如果识别错误多：提高 **OCR 置信度**
 
 ---
 

desktop_qt_ui/app_logic.py

@@ -495,6 +495,18 @@ def start_backend_task(self):
         """
         Resolves input paths and uses a 'Worker-to-Thread' model to start the translation task.
         """
+        # 通过调用配置服务的 reload_config 方法，强制全面重新加载所有配置
+        try:
+            self.logger.info("即将开始后台任务，强制重新加载所有配置...")
+            self.config_service.reload_config()
+            self.logger.info("配置已刷新，继续执行任务。")
+        except Exception as e:
+            self.logger.error(f"重新加载配置时发生严重错误: {e}")
+            # 根据需要，这里可以决定是否要中止任务
+            # from PyQt6.QtWidgets import QMessageBox
+            # QMessageBox.critical(None, "配置错误", f"无法加载最新配置: {e}")
+            # return
+
         if self.thread is not None and self.thread.isRunning():
             self.logger.warning("一个任务已经在运行中。")
             return
@@ -636,6 +648,8 @@ def on_task_finished(self, results):
             self.logger.error(f"完成任务状态更新或信号发射时发生致命错误: {e}", exc_info=True)
         finally:
             print("--- DEBUG: on_task_finished step 5: Entering finally block.")
+            if self.thread and self.thread.isRunning():
+                self.thread.quit()
             self.thread = None
             self.worker = None
             print("--- MainAppLogic: Slot on_task_finished finished.")
@@ -832,7 +846,15 @@ async def _do_processing(self):
                 if k in Config.__fields__ and k not in explicit_keys
             }
 
-            render_config_data = self.config_dict.get('render', {})
+            render_config_data = self.config_dict.get('render', {}).copy()
+
+            # 转换 direction 值：'h' -> 'horizontal', 'v' -> 'vertical'
+            if 'direction' in render_config_data:
+                direction_value = render_config_data['direction']
+                if direction_value == 'h':
+                    render_config_data['direction'] = 'horizontal'
+                elif direction_value == 'v':
+                    render_config_data['direction'] = 'vertical'
 
             translator_config_data = self.config_dict.get('translator', {}).copy()
             hq_prompt_path = translator_config_data.get('high_quality_prompt_path')
@@ -980,23 +1002,51 @@ async def _do_processing(self):
         finally:
             manga_logger.removeHandler(log_handler)
 
+            # 翻译结束后清空翻译器缓存，确保下次翻译使用最新的 .env 配置
+            try:
+                from manga_translator.translators import translator_cache
+                translator_cache.clear()
+                self.log_received.emit(f"--- [CLEANUP] Cleared translator cache")
+            except Exception as e:
+                self.log_received.emit(f"--- [CLEANUP] Warning: Failed to clear cache: {e}")
+
     @pyqtSlot()
     def process(self):
+        loop = None
         try:
             import asyncio
             self.log_received.emit("--- [1] THREAD: process() method entered, starting asyncio task.")
 
             # 创建事件循环并保存任务引用
             loop = asyncio.new_event_loop()
             asyncio.set_event_loop(loop)
-            try:
-                self._current_task = loop.create_task(self._do_processing())
-                loop.run_until_complete(self._current_task)
-                self.log_received.emit("--- [END] THREAD: asyncio task finished.")
-            except asyncio.CancelledError:
-                self.log_received.emit("--- [CANCELLED] THREAD: asyncio task was cancelled.")
-            finally:
-                loop.close()
+            
+            self._current_task = loop.create_task(self._do_processing())
+            loop.run_until_complete(self._current_task)
+            self.log_received.emit("--- [END] THREAD: asyncio task finished.")
+
+        except asyncio.CancelledError:
+            self.log_received.emit("--- [CANCELLED] THREAD: asyncio task was cancelled.")
         except Exception as e:
             import traceback
             self.error.emit(f"An error occurred in the asyncio runner: {str(e)}\n{traceback.format_exc()}")
+        finally:
+            if loop:
+                try:
+                    # Cancel all remaining tasks
+                    tasks = asyncio.all_tasks(loop=loop)
+                    for task in tasks:
+                        task.cancel()
+                    
+                    # Gather all tasks to let them finish cancelling
+                    if tasks:
+                        loop.run_until_complete(asyncio.gather(*tasks, return_exceptions=True))
+
+                    # Shutdown async generators
+                    loop.run_until_complete(loop.shutdown_asyncgens())
+                except Exception as e:
+                    self.log_received.emit(f"--- ERROR during asyncio cleanup: {e}")
+                finally:
+                    loop.close()
+                    asyncio.set_event_loop(None)
+                    self.log_received.emit("--- [CLEANUP] THREAD: asyncio loop closed.")

desktop_qt_ui/editor/text_renderer_backend.py

@@ -55,7 +55,10 @@ def render_text_for_region(text_block: TextBlock, dst_points: np.ndarray, transf
         text_block.translation = processed_text
 
         # --- 2. 渲染 ---
-        hyphenate = render_params.get('hyphenate', True)
+        # 正确的逻辑：当AI断句开启(disable_auto_wrap=True)时，关闭内置换行(hyphenate=False)
+        disable_auto_wrap = render_params.get('disable_auto_wrap', False)
+        hyphenate = not disable_auto_wrap
+
         render_params.get('line_spacing')
         disable_font_border = render_params.get('disable_font_border', False)
 
@@ -90,7 +93,7 @@ def render_text_for_region(text_block: TextBlock, dst_points: np.ndarray, transf
         line_spacing_from_params = render_params.get('line_spacing')
 
         if text_block.horizontal:
-            rendered_surface = put_text_horizontal(font_size, text_block.get_translation_for_rendering(), render_w, render_h, text_block.alignment, text_block.direction == 'hl', fg_color, bg_color, text_block.target_lang, hyphenate, line_spacing_from_params, config=config_obj)
+            rendered_surface = put_text_horizontal(font_size, text_block.get_translation_for_rendering(), render_w, render_h, text_block.alignment, text_block.direction == 'hl', fg_color, bg_color, text_block.target_lang, hyphenate, line_spacing_from_params, config=config_obj, region_count=total_regions)
         else:
             rendered_surface = put_text_vertical(font_size, text_block.get_translation_for_rendering(), render_h, text_block.alignment, fg_color, bg_color, line_spacing_from_params, config=config_obj, region_count=total_regions)
 

desktop_qt_ui/services/config_service.py

@@ -179,6 +179,29 @@ def save_config_file(self, config_path: Optional[str] = None) -> bool:
             self.logger.error(f"保存配置文件失败: {e}")
             return False
 
+    def reload_config(self):
+        """
+        强制从 .env 和 JSON 文件完全重新加载配置。
+        这能确保外部对文件的任何修改都能在程序中生效。
+        """
+        self.logger.info("正在强制重新加载配置...")
+        
+        # 1. 重新加载 .env 文件到 os.environ。翻译引擎会自动从此读取。
+        load_dotenv(self.env_path, override=True)
+        self.logger.info(f".env 文件已从 {self.env_path} 重新加载，环境变量已更新。")
+
+        # 2. 重新创建 AppSettings 对象 (用于UI设置)
+        self.current_config = AppSettings()
+
+        # 3. 在新创建的 AppSettings 对象之上，重新应用 JSON 配置文件中的设置
+        config_file_to_load = self.config_path or self.default_config_path
+        if config_file_to_load and os.path.exists(config_file_to_load):
+            self.load_config_file(config_file_to_load)
+
+        # 4. 通知所有监听者配置已更改
+        self.config_changed.emit(self.current_config.dict())
+        self.logger.info("配置重载完成。")
+
     def reload_from_disk(self):
         """
         强制从当前设置的 config_path 重新加载配置, 并通知所有监听者。

examples/config-example.json

@@ -1,21 +1,21 @@
 {
   "app": {
-    "last_open_dir": "D:/xiazai/图片助手(ImageAssistant)_批量图片下载器/午夜心旋律",
+    "last_open_dir": "D:/xiazai/图片助手(ImageAssistant)_批量图片下载器",
     "last_output_path": "D:/xiazai/图片助手(ImageAssistant)_批量图片下载器/output"
   },
   "filter_text": null,
   "kernel_size": 3,
   "mask_dilation_offset": 70,
   "translator": {
-    "translator": "gemini_hq",
+    "translator": "gemini",
     "target_lang": "CHS",
     "no_text_lang_skip": false,
     "gpt_config": "../examples/gpt_config-example.yaml",
     "high_quality_prompt_path": "dict/prompt_example.json"
   },
   "ocr": {
     "use_mocr_merge": false,
-    "ocr": "mocr",
+    "ocr": "paddleocr_korean",
     "use_hybrid_ocr": false,
     "secondary_ocr": "48px",
     "min_text_length": 0,
@@ -76,7 +76,7 @@
     "verbose": true,
     "attempts": -1,
     "ignore_errors": false,
-    "use_gpu": true,
+    "use_gpu": false,
     "use_gpu_limited": false,
     "context_size": 3,
     "format": "不指定",

manga_translator/manga_translator.py

@@ -2561,13 +2561,7 @@ async def _batch_translate_contexts(self, contexts_with_configs: List[tuple], ba
                         region._alignment = config.render.alignment
                         region._direction = config.render.direction
                 results.extend(batch)
-                
-            # 强制垃圾回收以释放内存
-            import gc
-            gc.collect()
-            if torch.cuda.is_available():
-                torch.cuda.empty_cache()
-                
+
         return results
 
     async def _concurrent_translate_contexts(self, contexts_with_configs: List[tuple]) -> List[tuple]:

manga_translator/ocr/model_manga_ocr.py

@@ -126,8 +126,10 @@ async def _load(self, device: str):
 
 
     async def _unload(self):
-        del self.model
-        del self.mocr
+        if hasattr(self, 'model'):
+            del self.model
+        if hasattr(self, 'mocr'):
+            del self.mocr
 
     async def _infer(self, image: np.ndarray, textlines: List[Quadrilateral], config: OcrConfig, verbose: bool = False, ignore_bubble: int = 0) -> List[TextBlock]:
         text_height = 48

manga_translator/rendering/text_render.py

@@ -514,10 +514,13 @@ def put_text_vertical(font_size: int, text: str, h: int, alignment: str, fg: Tup
     bg_size = int(max(font_size * 0.07, 1)) if bg is not None else 0
     spacing_x = int(font_size * (line_spacing or 0.2))
 
-    # Conditional wrapping logic based on the new region_count parameter
+    # Conditional wrapping logic based on disable_auto_wrap and region_count
     effective_max_height = h
-    if config and config.render.layout_mode == 'smart_scaling':
-        if config.render.disable_auto_wrap or region_count <= 1:
+    if config and config.render.disable_auto_wrap:
+        # 当AI断句开启时，使用无限高度，让文本按AI断句标记换行
+        effective_max_height = 99999
+    elif config and config.render.layout_mode == 'smart_scaling':
+        if region_count <= 1:
             effective_max_height = 99999
 
     # Use original font size for line breaking calculation
@@ -714,7 +717,26 @@ def calc_horizontal(font_size: int, text: str, max_width: int, max_height: int,
     whitespace_offset_x = get_char_offset_x(font_size, ' ')
     hyphen_offset_x = get_char_offset_x(font_size, '-')
 
-    words = re.split(r'\s+', text)
+    # 先按换行符分割段落，然后对每段分割单词
+    # 使用特殊标记来保留换行位置
+    paragraphs = text.split('\n')
+    words = []
+    newline_positions = set()  # 记录哪些位置是段落结束（需要强制换行）
+
+    for para_idx, paragraph in enumerate(paragraphs):
+        if paragraph.strip():  # 非空段落
+            para_words = re.split(r'[ \t]+', paragraph)  # 只按空格和制表符分割，不包括 \n
+            words.extend(para_words)
+            if para_idx < len(paragraphs) - 1:  # 不是最后一段
+                newline_positions.add(len(words) - 1)  # 标记这个单词后面需要换行
+        elif para_idx < len(paragraphs) - 1:  # 空段落但不是最后一个
+            # 空行也需要保留
+            words.append('')
+            newline_positions.add(len(words) - 1)
+
+    # 如果没有单词，返回空结果
+    if not words:
+        return [], []
 
     word_widths = []
     for i, word in enumerate(words):
@@ -804,6 +826,9 @@ def get_present_syllables(line_idx, word_pos):
             line_words.append(i)
             line_width += current_width + word_widths[i]
             i += 1
+            # 检查是否需要强制换行（AI 断句）
+            if (i - 1) in newline_positions:
+                break_line()
         elif word_widths[i] > max_width:
             j = 0
             hyphenation_idx = 0
@@ -824,8 +849,18 @@ def get_present_syllables(line_idx, word_pos):
             line_words.append(i)
             line_width += current_width
             i += 1
+            # 检查是否需要强制换行（AI 断句）
+            if (i - 1) in newline_positions:
+                break_line()
         else:
-            break_line()
+            if hyphenate:
+                break_line()
+            else:
+                line_words.append(i)
+                line_width += current_width + word_widths[i]
+                i += 1
+                if (i - 1) in newline_positions:
+                    break_line()
 
 
     # 连字符优化阶段
@@ -1050,16 +1085,23 @@ def put_text_horizontal(font_size: int, text: str, width: int, height: int, alig
     layout_mode = 'default'
     if config:
         layout_mode = config.render.layout_mode
-        # Check for no-wrap condition and handle AI line breaks
-        if layout_mode == 'smart_scaling':
-            # In smart_scaling mode, wrapping is conditional.
-            # It wraps only if manual line breaks ([BR] or \n) are present.
-            # Otherwise, it expands without wrapping.
-            text = re.sub(r'\s*\[BR\]\s*', '\n', text, flags=re.IGNORECASE)
-            if '\n' not in text:
-                # No manual breaks found, so disable wrapping by setting a large width.
-                if config.render.disable_auto_wrap or region_count <= 1:
-                    width = 99999
+
+    # 当AI断句开启时，统一处理换行符并使用无限宽度
+    if config and config.render.disable_auto_wrap:
+        # 统一处理所有类型的AI换行符
+        text = re.sub(r'\s*(\[BR\]|<br>|【BR】)\s*', '\n', text, flags=re.IGNORECASE)
+        # 使用无限宽度，让文本完全按照AI断句标记换行
+        width = 99999
+    elif layout_mode == 'smart_scaling':
+        # In smart_scaling mode, wrapping is conditional.
+        # It wraps only if manual line breaks ([BR] or \n) are present.
+        # Otherwise, it expands without wrapping.
+        # 统一处理所有类型的AI换行符
+        text = re.sub(r'\s*(\[BR\]|<br>|【BR】)\s*', '\n', text, flags=re.IGNORECASE)
+        if '\n' not in text:
+            # No manual breaks found, so disable wrapping by setting a large width.
+            if region_count <= 1:
+                width = 99999
 
     bg_size = int(max(font_size * 0.07, 1)) if bg is not None else 0
     spacing_y = int(font_size * (line_spacing or 0.01))