fix: Fixed the bug where special characters prevented custom engine t…

…ranslation.
bookfere · Oct 8, 2023 · db916d5 · db916d5
1 parent 8dc8d06
commit db916d5
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 6 deletions.
diff --git a/engines/chatgpt.py b/engines/chatgpt.py
@@ -25,6 +25,7 @@ class ChatgptTranslate(Base):
 
     concurrency_limit = 1
     request_interval = 20
+    request_timeout = 30.0
 
     prompt = (
         'You are a meticulous translator who translates any given content. '

diff --git a/engines/custom.py b/engines/custom.py
@@ -112,7 +112,7 @@ def translate(self, text):
         # to ensure pure Latin-1 (compliance with ISO-8859-1).
         data = data.replace('<source>', self._get_source_code()) \
             .replace('<target>', self._get_target_code()) \
-            .replace('<text>', text.replace('"', '\\"')).encode('utf-8')
+            .replace('<text>', json.dumps(text).strip('"')).encode('utf-8')
         is_json = headers and 'application/json' in headers.values()
         if need_restore and not is_json:
             data = json.loads(data)

diff --git a/tests/test_custom.py b/tests/test_custom.py
@@ -109,13 +109,19 @@ def setUp(self):
         engine_data = """{
     "name": "New Engine",
     "languages": {
-        "source": {"English": "en"},
-        "target": {"Chinese": "zh"}
+        "source": {
+            "English": "en"
+        },
+        "target": {
+            "Chinese": "zh"
+        }
     },
     "request": {
         "url": "https://example.api",
         "method": "POST",
-        "headers": {"Content-Type": "application/json"},
+        "headers": {
+            "Content-Type": "application/json"
+        },
         "data": {
             "source": "<source>",
             "target": "<target>",
@@ -129,13 +135,24 @@ def setUp(self):
         CustomTranslate.set_engine_data(engine_data)
 
     @patch('calibre_plugins.ebook_translator.engines.base.Browser')
-    def test_translate(self, mock_browser):
+    def test_translate_json(self, mock_browser):
         translator = CustomTranslate()
         translator.set_source_lang('English')
         translator.set_target_lang('Chinese')
         mock_browser.return_value.response.return_value.read.return_value \
             .decode.return_value = '{"text": "你好世界！"}'
-        self.assertEqual('你好世界！', translator.translate('Hello World!'))
+        self.assertEqual('你好世界！', translator.translate('HelloWorld!'))
+
+    @patch('calibre_plugins.ebook_translator.engines.base.Browser')
+    def test_translate_urlencoded(self, mock_browser):
+        translator = CustomTranslate()
+        # Mock content type: application/x-www-form-urlencoded
+        del translator.engine_data['request']['headers']
+        translator.set_source_lang('English')
+        translator.set_target_lang('Chinese')
+        mock_browser.return_value.response.return_value.read.return_value \
+            .decode.return_value = '{"text": "你好\\"\\n世界！"}'
+        self.assertEqual('你好\"\n世界！', translator.translate('Hello\"\nWorld!'))
 
     def test_parse(self):
         translator = CustomTranslate()