fix

HIllya51 · Aug 24, 2024 · 50bb730 · 50bb730
1 parent 5921160
commit 50bb730
Show file tree

Hide file tree

Showing 6 changed files with 47 additions and 12 deletions.
diff --git a/LunaTranslator/LunaTranslator/translator/deepl.py b/LunaTranslator/LunaTranslator/translator/deepl.py
@@ -123,9 +123,6 @@ def translate_deeplx_internal(self, translateText):
             data=postStr,
         ).json()
         try:
-            try:
-                return res["result"]["texts"][0]["alternatives"][0]["text"]
-            except:
-                return res["result"]["texts"][0]["text"]
+            return res["result"]["texts"][0]["text"]
         except:
             raise Exception(res)
diff --git a/...anslator/translator/deeplapi_integrate.py → ...unaTranslator/translator/deeplapi-free.py b/...anslator/translator/deeplapi_integrate.py → ...unaTranslator/translator/deeplapi-free.py
@@ -11,13 +11,13 @@ def langmap(self):
 
     def translate(self, query):
         if self.config["usewhich"] == 0:
-            appid = self.multiapikeycurrent["DeepL-Auth-Key-1"]
+            self.checkempty(["DeepL-Auth-Key"])
+            appid = self.multiapikeycurrent["DeepL-Auth-Key"]
             endpoint = "https://api-free.deepl.com/v2/translate"
-            self.checkempty(["DeepL-Auth-Key-1"])
         elif self.config["usewhich"] == 1:
+            self.checkempty(["DeepL-Auth-Key-2"])
             appid = self.multiapikeycurrent["DeepL-Auth-Key-2"]
             endpoint = "https://api.deepl.com/v2/translate"
-            self.checkempty(["DeepL-Auth-Key-2"])
 
         headers = {
             "Authorization": "DeepL-Auth-Key " + appid,

diff --git a/LunaTranslator/LunaTranslator/translator/yandex.py b/LunaTranslator/LunaTranslator/translator/yandex.py
@@ -0,0 +1,27 @@
+from translator.basetranslator import basetrans
+
+
+class TS(basetrans):
+
+    def translate(self, content):
+
+        headers = {
+            "User-Agent": "Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/124.0.0.0 YaBrowser/24.1.5.825 Yowser/2.5 Safari/537.36"
+        }
+        params = {
+            "lang": "{}-{}".format(self.srclang, self.tgtlang),
+            "text": content,
+        }
+        url = "https://browser.translate.yandex.net/api/v1/tr.json/translate"
+        params = {**{"srv": "browser_video_translation"}, **params}
+        response = self.proxysession.post(
+            url=url,
+            params=params,
+            data={"maxRetryCount": 2, "fetchAbortTimeout": 500},
+            headers=headers,
+        )
+
+        try:
+            return response.json()["text"][0]
+        except:
+            raise Exception(response.text)
diff --git a/LunaTranslator/files/defaultconfig/config.json b/LunaTranslator/files/defaultconfig/config.json
@@ -1843,6 +1843,11 @@
             "color": "blue",
             "name": "yandex api"
         },
+        "yandex": {
+            "use": false,
+            "color": "blue",
+            "name": "yandex"
+        },
         "qqimt": {
             "use": false,
             "color": "blue",
@@ -1894,7 +1899,7 @@
             "color": "blue",
             "name": "sqlite翻译记录"
         },
-        "deeplapi_integrate": {
+        "deeplapi-free": {
             "type": "api",
             "use": false,
             "color": "blue",

diff --git a/LunaTranslator/files/defaultconfig/translatorsetting.json b/LunaTranslator/files/defaultconfig/translatorsetting.json
@@ -7,9 +7,15 @@
 	"deepl": {
 		"args": {
 			"usewhich": 0,
+			"github": "https://github.com/OwO-Network/DeepLX",
 			"api": "http://127.0.0.1:1188/translate"
 		},
 		"argstype": {
+			"github": {
+				"name": "DeepLX Github",
+				"type": "label",
+				"islink": true
+			},
 			"api": {
 				"name": "DeepLX api"
 			},
@@ -66,11 +72,11 @@
 			}
 		}
 	},
-	"deeplapi_integrate": {
+	"deeplapi-free": {
 		"args": {
 			"注册网址": "https://www.deepl.com/translator",
 			"usewhich": 0,
-			"DeepL-Auth-Key-1": "",
+			"DeepL-Auth-Key": "",
 			"DeepL-Auth-Key-2": "",
 			"字数统计": "0"
 		},
@@ -79,7 +85,7 @@
 				"type": "label",
 				"islink": true
 			},
-			"DeepL-Auth-Key-1": {
+			"DeepL-Auth-Key": {
 				"name": "DeepL-Auth-Key Free"
 			},
 			"DeepL-Auth-Key-2": {

diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
@@ -29,7 +29,7 @@ include(generate_product_version)
 
 set(VERSION_MAJOR 5)
 set(VERSION_MINOR 30)
-set(VERSION_PATCH 5)
+set(VERSION_PATCH 6)
 
 add_library(pch pch.cpp)
 target_precompile_headers(pch PUBLIC pch.h)