13th_fix combine download

app/api/files.py

@@ -606,4 +606,86 @@ def download_batch_files(job_uuid):
             success=False,
             error='SYSTEM_ERROR',
             message='批量下載失敗'
+        )), 500
+
+
+@files_bp.route('/<job_uuid>/download/combine', methods=['GET'])
+@jwt_login_required
+def download_combine_file(job_uuid):
+    """下載合併檔案"""
+    try:
+        # 驗證 UUID 格式
+        validate_job_uuid(job_uuid)
+        
+        # 取得當前用戶
+        current_user_id = g.current_user_id
+        
+        # 查找任務
+        job = TranslationJob.query.filter_by(
+            job_uuid=job_uuid,
+            user_id=current_user_id
+        ).first()
+        
+        if not job:
+            return jsonify(create_response(
+                success=False,
+                error='JOB_NOT_FOUND',
+                message='任務不存在'
+            )), 404
+        
+        # 檢查任務狀態
+        if job.status != 'COMPLETED':
+            return jsonify(create_response(
+                success=False,
+                error='JOB_NOT_COMPLETED',
+                message='任務尚未完成'
+            )), 400
+        
+        # 尋找 combine 檔案
+        combine_file = None
+        for file in job.files:
+            if file.filename.lower().find('combine') != -1 or file.file_type == 'combined':
+                combine_file = file
+                break
+        
+        if not combine_file:
+            return jsonify(create_response(
+                success=False,
+                error='COMBINE_FILE_NOT_FOUND',
+                message='找不到合併檔案'
+            )), 404
+        
+        # 檢查檔案是否存在
+        file_path = Path(combine_file.file_path)
+        if not file_path.exists():
+            return jsonify(create_response(
+                success=False,
+                error='FILE_NOT_FOUND',
+                message='合併檔案已被刪除'
+            )), 404
+        
+        logger.info(f"Combine file downloaded: {job.job_uuid} - {combine_file.filename}")
+        
+        # 發送檔案
+        return send_file(
+            str(file_path),
+            as_attachment=True,
+            download_name=combine_file.filename,
+            mimetype='application/octet-stream'
+        )
+    
+    except ValidationError as e:
+        return jsonify(create_response(
+            success=False,
+            error=e.error_code,
+            message=str(e)
+        )), 400
+    
+    except Exception as e:
+        logger.error(f"Combine file download error: {str(e)}")
+        
+        return jsonify(create_response(
+            success=False,
+            error='SYSTEM_ERROR',
+            message='合併檔案下載失敗'
         )), 500

app/services/notification_service.py

@@ -535,6 +535,41 @@ class NotificationService:
             logger.error(f"發送任務完成資料庫通知失敗: {e}")
             return None
     
+    def send_job_completion_db_notification_direct(self, job: TranslationJob) -> Optional[Notification]:
+        """
+        直接發送任務完成的資料庫通知（不檢查狀態）
+        """
+        try:
+            # 構建通知內容
+            title = "翻譯任務完成"
+            message = f'您的文件「{job.original_filename}」已成功翻譯完成。'
+            
+            # 添加目標語言信息
+            if job.target_languages:
+                languages = ', '.join(job.target_languages)
+                message += f" 目標語言: {languages}"
+            
+            message += " 您可以在任務列表中下載翻譯結果。"
+            
+            # 創建資料庫通知
+            return self.create_db_notification(
+                user_id=job.user_id,
+                title=title,
+                message=message,
+                notification_type=NotificationType.SUCCESS,
+                job_uuid=job.job_uuid,
+                extra_data={
+                    'filename': job.original_filename,
+                    'target_languages': job.target_languages,
+                    'total_cost': float(job.total_cost) if job.total_cost else 0,
+                    'completed_at': job.completed_at.isoformat() if job.completed_at else None
+                }
+            )
+            
+        except Exception as e:
+            logger.error(f"發送任務完成資料庫通知失敗: {e}")
+            return None
+    
     def send_job_failure_db_notification(self, job: TranslationJob, error_message: str = None) -> Optional[Notification]:
         """
         發送任務失敗的資料庫通知

app/services/translation_service.py

@@ -321,7 +321,7 @@ class ExcelParser(DocumentParser):
         
         # For auto-detect, translate if has CJK or meaningful text
         if src_lang.lower() in ('auto', 'auto-detect'):
-            return has_cjk or len(text) > 5
+            return self._has_cjk(text) or len(text) > 5
         
         return True
     

app/tasks/translation.py

@@ -73,13 +73,16 @@ def process_translation_job(self, job_id: int):
             if result['success']:
                 logger.info(f"Translation job completed successfully: {job.job_uuid}")
                 
+                # 重新獲取任務以確保狀態是最新的
+                db.session.refresh(job)
+                
                 # 發送完成通知
                 try:
                     notification_service = NotificationService()
                     # 發送郵件通知
                     notification_service.send_job_completion_notification(job)
-                    # 發送資料庫通知
-                    notification_service.send_job_completion_db_notification(job)
+                    # 發送資料庫通知 - 跳過狀態檢查，直接發送
+                    notification_service.send_job_completion_db_notification_direct(job)
                 except Exception as e:
                     logger.warning(f"Failed to send completion notification: {str(e)}")