From e9f90b11eea6eefced5bb992b848c8fa799de1c8 Mon Sep 17 00:00:00 2001
From: xunbu <xunbu3@qq.com>
Date: Mon, 19 May 2025 14:19:37 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=AD=A3=E4=BA=86=E6=89=93=E5=8C=85?=
 =?UTF-8?q?=E7=9A=84=E9=97=AE=E9=A2=98?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml                   | 24 ++++++------------------
 app.spec                              |  3 ++-
 docutranslate/app.py                  |  6 +++---
 docutranslate/utils/resource_utils.py | 15 +++++++++++++++
 pyproject.toml                        |  2 +-
 5 files changed, 27 insertions(+), 23 deletions(-)
 create mode 100644 docutranslate/utils/resource_utils.py

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index a77d0d1..0d6f066 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -5,22 +5,10 @@
   </component>
   <component name="ChangeListManager">
     <list default="true" id="6b18b44a-df57-4212-a857-9e291ebe5dd2" name="更改" comment="">
-      <change afterPath="$PROJECT_DIR$/src/docutranslate/app.py" afterDir="false" />
+      <change afterPath="$PROJECT_DIR$/docutranslate/utils/resource_utils.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/agents/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/agents/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/agents/agent.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/agents/agent.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/agents/markdown_agent.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/agents/markdown_agent.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/app.py" beforeDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/cli.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/cli.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/logger/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/logger/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/logger/logger.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/logger/logger.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/translater.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/translater.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/utils/__init__.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/utils/__init__.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/utils/convert.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/utils/convert.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/utils/docling_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/utils/docling_utils.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/utils/markdown_splitter.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/utils/markdown_splitter.py" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/docutranslate/utils/markdown_utils.py" beforeDir="false" afterPath="$PROJECT_DIR$/src/docutranslate/utils/markdown_utils.py" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app.spec" beforeDir="false" afterPath="$PROJECT_DIR$/app.spec" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/docutranslate/app.py" beforeDir="false" afterPath="$PROJECT_DIR$/docutranslate/app.py" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/pyproject.toml" beforeDir="false" afterPath="$PROJECT_DIR$/pyproject.toml" afterDir="false" />
     </list>
     <option name="SHOW_DIALOG" value="false" />
@@ -31,9 +19,9 @@
   <component name="FileTemplateManagerImpl">
     <option name="RECENT_TEMPLATES">
       <list>
-        <option value="Python Script" />
         <option value="HTML File" />
         <option value="CSS File" />
+        <option value="Python Script" />
       </list>
     </option>
   </component>
@@ -581,7 +569,7 @@
       <workItem from="1747617855241" duration="190000" />
       <workItem from="1747619759939" duration="205000" />
       <workItem from="1747624297447" duration="65000" />
-      <workItem from="1747628254543" duration="4111000" />
+      <workItem from="1747628254543" duration="7231000" />
     </task>
     <servers />
   </component>
@@ -589,7 +577,7 @@
     <option name="version" value="3" />
   </component>
   <component name="com.intellij.coverage.CoverageDataManagerImpl">
-    <SUITE FILE_PATH="coverage/filetranslate$app_test__1_.coverage" NAME="app_test (1) 覆盖结果" MODIFIED="1747631847708" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
+    <SUITE FILE_PATH="coverage/filetranslate$app_test__1_.coverage" NAME="app_test (1) 覆盖结果" MODIFIED="1747634037187" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/filetranslate$test.coverage" NAME="test 覆盖结果" MODIFIED="1747472297913" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/tests" />
     <SUITE FILE_PATH="coverage/filetranslate$convert.coverage" NAME="convert 覆盖结果" MODIFIED="1746963490689" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/docutranslate/utils" />
     <SUITE FILE_PATH="coverage/PDFtranslate$PDFtranslater__1_.coverage" NAME="PDFtranslater (1) 覆盖结果" MODIFIED="1746633258205" SOURCE_PROVIDER="com.intellij.coverage.DefaultCoverageFileProvider" RUNNER="coverage.py" COVERAGE_BY_TEST_ENABLED="false" COVERAGE_TRACING_ENABLED="false" WORKING_DIRECTORY="$PROJECT_DIR$/pdftranslate_packages" />
diff --git a/app.spec b/app.spec
index 5f534f2..935b508 100644
--- a/app.spec
+++ b/app.spec
@@ -1,7 +1,8 @@
 # -*- mode: python ; coding: utf-8 -*-
 from PyInstaller.utils.hooks import collect_all
 
-datas = [('C:\\\\Users\\\\jxgm\\\\Desktop\\\\FileTranslate\\\\.venv\\\\Lib\\\\site-packages\\\\docling_parse\\\\pdf_resources_v2', 'docling_parse/pdf_resources_v2')]
+datas = [('C:/Users/jxgm/Desktop/FileTranslate/.venv/Lib/site-packages/docling_parse/pdf_resources_v2', 'docling_parse/pdf_resources_v2'),
+('C:/Users/jxgm\Desktop/FileTranslate/docutranslate/static', 'docutranslate/static')]
 binaries = []
 hiddenimports = []
 tmp_ret = collect_all('easyocr')
diff --git a/docutranslate/app.py b/docutranslate/app.py
index cb4db9b..3495a9a 100644
--- a/docutranslate/app.py
+++ b/docutranslate/app.py
@@ -13,13 +13,13 @@ from fastapi.templating import Jinja2Templates
 from fastapi.staticfiles import StaticFiles
 from docutranslate import FileTranslater
 from docutranslate.logger import translater_logger
+from docutranslate.utils.resource_utils import resource_path
 
 app = FastAPI()
 
-BASE_DIR = Path(__file__).resolve().parent
-STATIC_DIR=BASE_DIR/"static"
-
+STATIC_DIR=resource_path("static")
 
+# print(f"__file__:{Path(__file__).resolve()}")
 app.mount("/static",StaticFiles(directory=STATIC_DIR), name="static")
 
 # --- 全局配置 ---
diff --git a/docutranslate/utils/resource_utils.py b/docutranslate/utils/resource_utils.py
new file mode 100644
index 0000000..89ca5c2
--- /dev/null
+++ b/docutranslate/utils/resource_utils.py
@@ -0,0 +1,15 @@
+import sys
+from pathlib import Path
+
+def resource_path(relative_path):
+    """ 获取资源的绝对路径，适用于开发环境和 PyInstaller 打包后的环境 """
+    try:
+        base_path = Path(sys._MEIPASS)/"docutranslate"
+    except Exception:
+        base_path = Path(__file__).resolve().parent.parent # 开发时
+        # 更健壮的开发时路径（如果你的资源相对于项目根目录）
+        # base_path = Path(os.path.abspath("."))
+        # 或者，如果你的 static 目录总是和 app.py 在同一级（开发时）
+        # base_path = Path(__file__).resolve().parent
+    # print(f"base_path:{base_path}")
+    return base_path / relative_path
\ No newline at end of file
diff --git a/pyproject.toml b/pyproject.toml
index 928aae0..43d56c2 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -1,6 +1,6 @@
 [project]
 name = "docutranslate"
-version = "0.2.18"
+version = "0.2.19"
 description = "文件翻译工具"
 readme = "README.md"
 requires-python = ">=3.10"