From aae06c1a17e5e1eb51a2397404c3c77db0d543f6 Mon Sep 17 00:00:00 2001
From: xunbu <xunbu3@qq.com>
Date: Fri, 16 May 2025 19:34:16 +0800
Subject: [PATCH] =?UTF-8?q?=E5=A2=9E=E5=8A=A0=E5=AF=B9=E5=8F=96=E6=B6=88?=
 =?UTF-8?q?=E7=BF=BB=E8=AF=91=E7=9A=84=E8=AF=B4=E6=98=8E?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .idea/workspace.xml  |   2 +-
 docutranslate/app.py | 118 ++++++++++++++++++++++++++++++++++++++++---
 2 files changed, 113 insertions(+), 7 deletions(-)

diff --git a/.idea/workspace.xml b/.idea/workspace.xml
index 13b68ce..bc72b71 100644
--- a/.idea/workspace.xml
+++ b/.idea/workspace.xml
@@ -625,7 +625,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="1747394051219" 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="1747394976334" 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="1747301959211" 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/docutranslate/app.py b/docutranslate/app.py
index 1382cf2..1108a50 100644
--- a/docutranslate/app.py
+++ b/docutranslate/app.py
@@ -128,6 +128,32 @@ HTML_TEMPLATE = """
                             display: none;
                         }
 
+                        /* Styles for drag and drop area */
+                        #fileDropArea {
+                            border: 2px dashed #ccc;
+                            padding: 20px;
+                            text-align: center;
+                            cursor: pointer;
+                            transition: background-color 0.2s ease-in-out, border-color 0.2s ease-in-out;
+                        }
+
+                        #fileDropArea.drag-over {
+                            border-color: #007bff; /* Pico primary color */
+                            background-color: rgba(0, 123, 255, 0.05);
+                        }
+
+                        #fileDropArea p {
+                            margin: 0.5rem 0;
+                            color: #555;
+                        } \
+
+                        #fileNameDisplay {
+                            margin-top: 0.5rem;
+                            font-style: italic;
+                            color: #333;
+                        }
+
+
                         @media (max-width: 768px) {
                             .form-grid {
                                 grid-template-columns: 1fr;
@@ -175,10 +201,17 @@ HTML_TEMPLATE = """
                                 <input type="text" id="model_id" name="model_id" placeholder="模型id" required>
                             </div>
                         </details>
+
+                        <!-- Modified File Input Area -->
                         <div class="form-group">
                             <label for="file">文档选择</label>
-                            <input type="file" id="file" name="file" required>
+                            <div id="fileDropArea">
+                                <input type="file" id="file" name="file" required style="display: none;">
+                                <p>点击此处选择文件，或将文件拖拽到这里</p>
+                                <div id="fileNameDisplay">未选择文件</div>
+                            </div>
                         </div>
+
                         <div class="form-grid">
                             <div class="form-group">
                                 <label for="to_lang">目标语言</label>
@@ -203,7 +236,7 @@ HTML_TEMPLATE = """
                                     <label for="formula_ocr"><input type="checkbox" id="formula_ocr" name="formula_ocr">公式识别</label>
                                     <label for="code_ocr"><input type="checkbox" id="code_ocr" name="code_ocr">代码识别</label>
                                     <label for="refine_markdown"><input type="checkbox" id="refine_markdown"
-                                                                        name="refine_markdown">修正文本</label>
+                                                                        name="refine_markdown">修正文本（耗时）</label>
                                 </div>
                             </div>
                         </div>
@@ -261,6 +294,12 @@ HTML_TEMPLATE = """
                     const closePreviewBtn = document.getElementById('closePreviewBtn');
                     const printFromPreview = document.getElementById('printFromPreview');
 
+                    // File input and drag-drop elements
+                    const fileInput = document.getElementById('file');
+                    const fileDropArea = document.getElementById('fileDropArea');
+                    const fileNameDisplay = document.getElementById('fileNameDisplay');
+
+
                     let logPollIntervalId = null;
                     let statusPollIntervalId = null;
                     let lastLogCount = 0;
@@ -326,6 +365,56 @@ HTML_TEMPLATE = """
                         }
                     });
 
+                    // --- Drag and Drop File Handling ---
+                    fileDropArea.addEventListener('click', () => {
+                        fileInput.click(); // Trigger click on hidden file input
+                    });
+
+                    fileInput.addEventListener('change', () => {
+                        if (fileInput.files.length > 0) {
+                            fileNameDisplay.textContent = `已选择: ${fileInput.files[0].name}`;
+                        } else {
+                            fileNameDisplay.textContent = '未选择文件';
+                        }
+                    });
+
+                    ['dragenter', 'dragover', 'dragleave', 'drop'].forEach(eventName => {
+                        fileDropArea.addEventListener(eventName, preventDefaults, false);
+                    });
+
+                    function preventDefaults(e) {
+                        e.preventDefault();
+                        e.stopPropagation();
+                    }
+
+                    ['dragenter', 'dragover'].forEach(eventName => {
+                        fileDropArea.addEventListener(eventName, () => {
+                            fileDropArea.classList.add('drag-over');
+                        }, false);
+                    });
+
+                    ['dragleave', 'drop'].forEach(eventName => {
+                        fileDropArea.addEventListener(eventName, () => {
+                            fileDropArea.classList.remove('drag-over');
+                        }, false);
+                    });
+
+                    fileDropArea.addEventListener('drop', (e) => {
+                        const dt = e.dataTransfer;
+                        const files = dt.files;
+
+                        if (files.length > 0) {
+                            fileInput.files = files; // Assign dropped files to the input
+                            fileNameDisplay.textContent = `已选择: ${files[0].name}`;
+                            // Manually trigger change event for any listeners on fileInput
+                            const event = new Event('change', {bubbles: true});
+                            fileInput.dispatchEvent(event);
+                        }
+                    }, false); \
+
+                    // --- End Drag and Drop ---
+
+
                     async function pollLogs() {
                         try {
                             const response = await fetch(`/get-logs?since=${lastLogCount}`);
@@ -537,6 +626,17 @@ HTML_TEMPLATE = """
                             return;
                         }
 
+                        // Validate file input
+                        if (fileInput.files.length === 0) {
+                            statusMsg.textContent = '请选择一个文件进行翻译。';
+                            statusMsg.className = 'error-message';
+                            fileNameDisplay.textContent = '请选择文件！';
+                            fileDropArea.classList.add('error-message'); // Optional: add error style to drop area
+                            setTimeout(() => fileDropArea.classList.remove('error-message'), 2000);
+                            return;
+                        }
+
+
                         stopPolling(); // Stop any existing polling
                         submitButton.disabled = true;
                         submitButton.setAttribute('aria-busy', 'true');
@@ -554,7 +654,7 @@ HTML_TEMPLATE = """
                             if (response.ok && result.task_started) {
                                 statusMsg.textContent = result.message || '任务已开始，正在处理...';
                                 statusMsg.className = '';
-                                submitButton.textContent = '取消翻译（pdf转换仍会后台进行）'; // Change button text
+                                submitButton.textContent = '取消翻译'; // Change button text
                                 submitButton.classList.remove('primary');
                                 submitButton.classList.add('secondary'); // Change button style
                                 isTranslating = true; // Set translation flag
@@ -692,7 +792,7 @@ async def _perform_translation(params: Dict[str, Any], file_contents: bytes, ori
         duration = end_time - current_state["task_start_time"]
         translater_logger.info(f"翻译任务 '{original_filename}' 已被取消 (用时 {duration:.2f} 秒).")
         current_state.update({
-            "status_message": f"翻译任务已取消 (用时 {duration:.2f} 秒).",
+            "status_message": f"翻译任务已取消（原先的转换阶段仍会后台进行） (用时 {duration:.2f} 秒).",
             "error_flag": False,
             "download_ready": False,
             "markdown_content": None,
@@ -747,6 +847,12 @@ async def handle_translate(
             content={"task_started": False, "message": "另一个翻译任务正在进行中，请稍后再试。"}
         )
 
+    if not file or not file.filename:  # Check if a file was actually uploaded
+        return JSONResponse(
+            status_code=400,
+            content={"task_started": False, "message": "没有选择文件或文件无效。"}
+        )
+
     current_state["is_processing"] = True  # Set this immediately
     original_filename_for_init = file.filename or "uploaded_file"
 
@@ -769,7 +875,7 @@ async def handle_translate(
 
     try:
         file_contents = await file.read()
-        original_filename = file.filename or "uploaded_file"  # Use the actual filename
+        original_filename = file.filename  # Use the actual filename (already checked it's not None)
         await file.close()
 
         task_params = {
@@ -913,4 +1019,4 @@ def run_app():
 
 
 if __name__ == "__main__":
-    run_app()
+    run_app()
\ No newline at end of file