· 增加了对.lang文件的支持

Author: zack-zzq

dist/ui/translation.png

@@ -0,0 +1,11 @@
+def loadLang(langFile):
+    readLang = langFile.readlines()
+
+    output = {}
+    for item in readLang:
+        if item[0] != '#' and '=' in item:
+            items = item.split('=')
+            if items[1][-1] == '\n':
+                items[1] = items[1][: -1]
+            output[items[0]] = items[1]
+    return output

run/lang.py

@@ -23,7 +23,9 @@ def __init__(self):
     def setConfigStatus(self, status):
         self.progressBar.setValue(1)
         if not status:
-            QMessageBox.critical(self, '错误', 'config文件不存在，已重新创建，请填写后重新打开应用', QMessageBox.StandardButton.Ok)
+            QMessageBox.critical(self, '错误', 'config文件不存在，已重新创建，请填写后重新打开应用',
+                                 QMessageBox.StandardButton.Ok)
+            self.close()
             return
         self.progressBar.setValue(2)
         self.progressLabel.setText('API鉴权中...')

run/progress.py

@@ -14,24 +14,27 @@ def translation(jar, word, authToken):
         'q': word
     }
     transHost = 'https://aip.baidubce.com/rpc/2.0/mt/texttrans/v1?access_token=' + authToken
-    while True:
+    for i in range(3):
         transResponse = post(transHost, headers=header, params=params)
         if transResponse.status_code != 200:
-            jar.addStatus('请求失败，请检查网络情况，5秒后重试')
+            jar.addStatus('请求失败，请检查网络情况，5秒后重试...({}/3)'.format(i + 1))
             QApplication.processEvents()
             sleep(5)
             continue
         if 'error_code' in transResponse.json().keys():
-            jar.addStatus('翻译错误: {}: {}'.format(transResponse.json()['error_code'], transResponse.json()['error_msg']))
-            return False
+            jar.addStatus('翻译错误: {}: {}, 5秒后重试...({}/3)'.format(transResponse.json()['error_code'],
+                                                                transResponse.json()['error_msg'], i + 1))
+            continue
         return transResponse.json()['result']['trans_result'][0]
 
 
 def transJson(jar, js, authToken):
     outputJson = {}
-    jar.addStatus('正在翻译，请稍等')
-    QApplication.processEvents()
+    processNow = 0
     for key in js:
+        processNow += 1
+        jar.addStatus('正在翻译...({}/{})'.format(processNow, len(js)))
+        QApplication.processEvents()
         outputJson[key] = translation(jar, js[key], authToken)
     jar.addStatus('翻译完成')
     QApplication.processEvents()

run/request.py

@@ -6,6 +6,7 @@
 
 from PyQt6.QtWidgets import QMainWindow, QFileDialog, QApplication
 
+from run.lang import loadLang
 from run.request import transJson
 from ui.MainWindow import Ui_MainWindow
 
@@ -21,8 +22,9 @@ def __init__(self, authBack):
         self.fileName = None
         self.workDir = None
         self.unzipDir = None
-        self.originWork = 'en_us.json'
-        self.oldWork = 'zh_cn.json'
+        self.workType = ['.json', '.lang']
+        self.originWork = 'en_us'
+        self.oldWork = 'zh_cn'
         self.hasOldWork = False
         self.exportWork = join(getcwd(), 'export.json')
         self.authToken = authBack
@@ -53,18 +55,26 @@ def isTranslatable(self):
         for root, _, files in walk(self.unzipDir):
             for filesIndex in range(len(files)):
                 files[filesIndex] = files[filesIndex].lower()
-            if self.originWork in files:
-                self.originWork = join(root, self.originWork)
-                if not self.isRestarted:
-                    if self.oldWork in files:
-                        self.oldWork = join(root, self.oldWork)
-                        self.hasOldWork = True
-                        self.addStatus('已找到\'zh_cn.json\'文件')
-                        QApplication.processEvents()
-                self.addStatus('已找到\'en_us.json\'文件')
-                QApplication.processEvents()
-                return True
+            for fileType in self.workType:
+                thisOriginWork = self.originWork + fileType
+                thisOldWork = self.oldWork + fileType
+                if thisOriginWork in files:
+                    self.originWork = thisOriginWork
+                    self.workType = fileType
+                    self.addStatus('已找到\'{}\'文件'.format(self.originWork))
+                    QApplication.processEvents()
+                    self.originWork = join(root, self.originWork)
+                    if not self.isRestarted:
+                        if thisOldWork in files:
+                            self.oldWork = thisOldWork
+                            self.addStatus('已找到\'{}\'文件'.format(self.oldWork))
+                            QApplication.processEvents()
+                            self.oldWork = join(root, self.oldWork)
+                            self.hasOldWork = True
+                    return True
         self.addStatus('未找到可翻译文件')
+        QApplication.processEvents()
+        self.ImportJar.setEnabled(True)
         return False
 
     def nextItem(self):
@@ -98,6 +108,12 @@ def getTranslated(self):
     def setUnchecked(self, number):
         self.Unchecked.setText('还剩 {} 个未校对'.format(number))
 
+    def autoLoad(self, file):
+        if self.workType == '.json':
+            return load(file)
+        else:
+            return loadLang(file)
+
     def onClickNext(self):
         if self.getTag():
             self.receiveChecked([self.getTag(), self.getTranslated()])
@@ -116,7 +132,7 @@ def onClickFinish(self):
         self.Finish.setDisabled(True)
         if self.hasOldWork:
             oldFile = open(self.oldWork, 'r', encoding='UTF-8')
-            oldJson = load(oldFile)
+            oldJson = self.autoLoad(oldFile)
             oldFile.close()
             for key in self.checkedJson:
                 oldJson[key] = self.checkedJson[key]
@@ -151,11 +167,11 @@ def selectFile(self):
                 return
             if self.isTranslatable():
                 originFile = open(self.originWork, 'r', encoding='UTF-8')
-                originJson = load(originFile)
+                originJson = self.autoLoad(originFile)
                 originFile.close()
                 if self.hasOldWork:
                     oldFile = open(self.oldWork, 'r', encoding='UTF-8')
-                    oldJson = load(oldFile)
+                    oldJson = self.autoLoad(oldFile)
                     oldFile.close()
                     preparedJson = {}
                     for i in originJson:
@@ -178,7 +194,7 @@ def selectFile(self):
                     self.transJson = transJson(self, originJson, self.authToken)
                     dump(self.transJson, exportFile, indent=4)
                     exportFile.close()
-                self.addStatus('共 {} 条需要翻译'.format(self.items))
+                self.addStatus('共 {} 条需要校对'.format(self.items))
                 self.Next.setEnabled(True)
                 self.transList = list(self.transJson.items())
                 self.onClickNext()