From eecc7f302aa10a7b614fef246f61054e0f00f46e Mon Sep 17 00:00:00 2001
From: xunbu <xunbu3@qq.com>
Date: Sun, 11 May 2025 22:48:04 +0800
Subject: [PATCH] small fix

---
 .gitignore                  |  1 -
 .idea/workspace.xml         |  4 +-
 app.spec                    | 76 +++++++++++++++++++++++++++++++++++++
 docutranslate/translater.py |  8 ++--
 4 files changed, 81 insertions(+), 8 deletions(-)
 create mode 100644 app.spec

diff --git a/.gitignore b/.gitignore
index 3622162..8491508 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,4 +10,3 @@ tests/
 docutranslate/output/
 # Virtual environments
 .venv
-app.spec
diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 9a67959..d4915a3 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,9 +5,7 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b18b44a-df57-4212-a857-9e291ebe5dd2" name="更改" comment="">
-      <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/README.md" beforeDir="false" afterPath="$PROJECT_DIR$/README.md" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/docutranslate/__init__.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docutranslate/translater.py" beforeDir="false" afterPath="$PROJECT_DIR$/docutranslate/translater.py" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
     <option name="HIGHLIGHT_CONFLICTS" value="true" />
diff --git a/app.spec b/app.spec
new file mode 100644
index 0000000..7a79a30
--- /dev/null
+++ b/app.spec
@@ -0,0 +1,76 @@
+# -*- mode: python ; coding: utf-8 -*-
+
+from PyInstaller.utils.hooks import collect_data_files, collect_submodules
+
+# 收集 easyocr 的数据文件和子模块
+datas_easyocr = collect_data_files('easyocr', include_py_files=True)
+hiddenimports_easyocr = collect_submodules('easyocr')
+
+# 收集 docling 的数据文件和子模块 (如果 docling 本身有数据文件)
+# datas_docling = collect_data_files('docling', include_py_files=True) # 示例，如果 docling 有数据
+hiddenimports_docling = collect_submodules('docling')
+
+
+a = Analysis(
+    ['docutranslate\\app.py'],
+    pathex=[],
+    binaries=[],
+    datas=[
+        ('C:\\Users\\jxgm\\Desktop\\FileTranslate\\.venv\\Lib\\site-packages\\docling_parse\\pdf_resources_v2', 'docling_parse/pdf_resources_v2'),
+        # *datas_docling, # 取消注释如果 docling 有自己的数据文件
+        *datas_easyocr
+    ],
+    hiddenimports=[
+        'easyocr',
+        *hiddenimports_easyocr, # 确保 easyocr 的所有子模块都被包含
+        'docling',
+        *hiddenimports_docling, # 确保 docling 的所有子模块都被包含
+        'docling.datamodel.pipeline_options', # 非常重要，为了 EasyOcrOptions
+        'docling.models.easyocr_model', # 猜测的路径，你需要确认 docling 中 easyocr 集成模型的实际模块路径
+        # 根据需要添加 easyocr 的其他依赖，例如：
+        'cv2',
+        'torch',
+        'torchvision',
+        'skimage',
+        'yaml',
+        'PIL',
+        # 添加任何其他 docling 可能动态加载的模块或工厂类中引用的模块
+    ],
+    # collect_submodules 已经通过上面的 collect_submodules() 函数处理并添加到 hiddenimports
+    # 所以这里可以简化，或者保留你原来的方式，但上面的方式更明确
+    # collect_submodules=['docling','easyocr'],
+    hookspath=[],
+    hooksconfig={},
+    runtime_hooks=[],
+    excludes=[],
+    noarchive=False,
+    optimize=0,
+)
+pyz = PYZ(a.pure)
+
+exe = EXE(
+    pyz,
+    a.scripts,
+    [],
+    exclude_binaries=True,
+    name='app',
+    debug=False, # 编译时可以设为 True 或 '--debug=all' 运行打包后的程序以获取更多信息
+    bootloader_ignore_signals=False,
+    strip=False,
+    upx=True,
+    console=False,
+    disable_windowed_traceback=False,
+    argv_emulation=False,
+    target_arch=None,
+    codesign_identity=None,
+    entitlements_file=None,
+)
+coll = COLLECT(
+    exe,
+    a.binaries,
+    a.datas,
+    strip=False,
+    upx=True,
+    upx_exclude=[],
+    name='app',
+)
\ No newline at end of file
diff --git a/docutranslate/translater.py b/docutranslate/translater.py
index 477a4c5..7589644 100644
--- a/docutranslate/translater.py
+++ b/docutranslate/translater.py
@@ -76,7 +76,7 @@ class FileTranslater:
         }
         return result
 
-    def read_bytes(self, name: str, file: bytes, formula=False, code=False, save=False,
+    def read_bytes(self, name: str, file: bytes, formula=True, code=True, save=False,
              save_format: Literal["markdown", "html"] = "markdown", refine=False,
              refine_agent: Agent | None = None):
         ds = DocumentStream(name=name, stream=BytesIO(file))
@@ -95,7 +95,7 @@ class FileTranslater:
                 self.save_as_markdown(filename=f"{file_path.stem}.md")
         return self
 
-    def read_file(self, file_path: Path | str | None = None, formula=False, code=False, save=False,
+    def read_file(self, file_path: Path | str | None = None, formula=True, code=True, save=False,
                   save_format: Literal["markdown", "html"] = "markdown", refine=False,
                   refine_agent: Agent | None = None):
         if file_path is None:
@@ -266,8 +266,8 @@ class FileTranslater:
         return self
 
     def translate_bytes(self, name:str,file: bytes, to_lang="中文", output_dir="./output",
-                       formula=False,
-                       code=False, output_format: Literal["markdown", "html"] = "markdown", refine=False,
+                       formula=True,
+                       code=True, output_format: Literal["markdown", "html"] = "markdown", refine=False,
                        refine_agent: Agent | None = None, translate_agent: Agent | None = None,save=True):
         self.read_bytes(name=name,file=file, formula=formula, code=code)
         if refine: