From a734725678527ce15cf8232b8062ac51c49dad95 Mon Sep 17 00:00:00 2001
From: yoshiko2 <wenead99@gmail.com>
Date: Thu, 14 Jan 2021 16:44:01 +0800
Subject: [PATCH] Remove baidu translate (For users privacy)

---
 ADC_function.py | 42 +++++++++++++++++++++---------------------
 config.ini      |  8 +++-----
 config.py       |  8 ++++----
 core.py         | 20 ++++++++++----------
 4 files changed, 38 insertions(+), 40 deletions(-)

diff --git a/ADC_function.py b/ADC_function.py
index 3aa644d..95bb407 100755
--- a/ADC_function.py
+++ b/ADC_function.py
@@ -490,27 +490,27 @@ def translate(
 
         translate_list = [i["trans"] for i in result.json()["sentences"]]
         trans_result = trans_result.join(translate_list)
-    elif engine == "baidu":
-        url = "https://fanyi-api.baidu.com/api/trans/vip/translate"
-        salt = random.randint(1, 1435660288)
-        sign = app_id + src + str(salt) + key
-        sign = hashlib.md5(sign.encode()).hexdigest()
-        url += (
-            "?appid="
-            + app_id
-            + "&q="
-            + src
-            + "&from=auto&to="
-            + target_language
-            + "&salt="
-            + str(salt)
-            + "&sign="
-            + sign
-        )
-        result = get_html(url=url, return_type="object")
-
-        translate_list = [i["dst"] for i in result.json()["trans_result"]]
-        trans_result = trans_result.join(translate_list)
+    # elif engine == "baidu":
+    #     url = "https://fanyi-api.baidu.com/api/trans/vip/translate"
+    #     salt = random.randint(1, 1435660288)
+    #     sign = app_id + src + str(salt) + key
+    #     sign = hashlib.md5(sign.encode()).hexdigest()
+    #     url += (
+    #         "?appid="
+    #         + app_id
+    #         + "&q="
+    #         + src
+    #         + "&from=auto&to="
+    #         + target_language
+    #         + "&salt="
+    #         + str(salt)
+    #         + "&sign="
+    #         + sign
+    #     )
+    #     result = get_html(url=url, return_type="object")
+    #
+    #     translate_list = [i["dst"] for i in result.json()["trans_result"]]
+    #     trans_result = trans_result.join(translate_list)
     elif engine == "azure":
         url = "https://api.cognitive.microsofttranslator.com/translate?api-version=3.0&to=" + target_language
         headers = {
diff --git a/config.ini b/config.ini
index 3b7a1fa..552a1f6 100644
--- a/config.ini
+++ b/config.ini
@@ -37,13 +37,11 @@ switch=0
 ; 机器翻译
 [transalte]
 switch=0
-;可选项 google-free,baidu,azure
+;可选项 google-free,azure
 engine=google-free
-; 百度翻译app id
-appid=
-; 百度翻译或azure翻译密钥
+; azure翻译密钥
 key=
-; 翻译延迟，用于满足百度不同定价api的QPS要求，单位秒，http://api.fanyi.baidu.com/product/112
+; 翻译延迟
 delay=1
 values=title,outline
 
diff --git a/config.py b/config.py
index 20bcd43..8784dca 100644
--- a/config.py
+++ b/config.py
@@ -75,8 +75,8 @@ class Config:
             self._exit("extrafanart_folder")
     def get_transalte_engine(self) -> str:
         return self.conf.get("transalte","engine")
-    def get_transalte_appId(self) ->str:
-        return self.conf.get("transalte","appid")
+    # def get_transalte_appId(self) ->str:
+    #     return self.conf.get("transalte","appid")
     def get_transalte_key(self) -> str:
         return self.conf.get("transalte","key")
     def get_transalte_delay(self) -> int:
@@ -193,7 +193,7 @@ class Config:
         conf.add_section(sec8)
         conf.set(sec8, "switch", "0")
         conf.set(sec8, "engine", "google-free")
-        conf.set(sec8, "appid", "")
+        # conf.set(sec8, "appid", "")
         conf.set(sec8, "key", "")
         conf.set(sec8, "delay", "1")
         conf.set(sec8, "values", "title,outline")
@@ -242,7 +242,7 @@ if __name__ == "__main__":
     print(config.debug())
     print(config.is_transalte())
     print(config.get_transalte_engine())
-    print(config.get_transalte_appId())
+    # print(config.get_transalte_appId())
     print(config.get_transalte_key())
     print(config.get_transalte_delay())
     print(config.transalte_values())
diff --git a/core.py b/core.py
index c985f91..5dd1af7 100755
--- a/core.py
+++ b/core.py
@@ -231,16 +231,16 @@ def get_data_from_json(file_number, filepath, conf: config.Config):  # 从JSON
         for translate_value in translate_values:
             if json_data[translate_value] == "":
                 continue
-            if conf.get_transalte_engine() == "baidu":
-                json_data[translate_value] = translate(
-                    json_data[translate_value],
-                    target_language="zh",
-                    engine=conf.get_transalte_engine(),
-                    app_id=conf.get_transalte_appId(),
-                    key=conf.get_transalte_key(),
-                    delay=conf.get_transalte_delay(),
-                )
-            elif conf.get_transalte_engine() == "azure":
+            # if conf.get_transalte_engine() == "baidu":
+            #     json_data[translate_value] = translate(
+            #         json_data[translate_value],
+            #         target_language="zh",
+            #         engine=conf.get_transalte_engine(),
+            #         app_id=conf.get_transalte_appId(),
+            #         key=conf.get_transalte_key(),
+            #         delay=conf.get_transalte_delay(),
+            #     )
+            if conf.get_transalte_engine() == "azure":
                 json_data[translate_value] = translate(
                     json_data[translate_value],
                     target_language="zh-Hans",