diff --git a/.vscode/settings.json b/.vscode/settings.json
index 10055d9..32ac337 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -4,7 +4,7 @@
"python.linting.pylintArgs": [
"--disable=all",
"--enable=E",
- "--extension-pkg-whitelist=PySide2"
+ "--extension-pkg-whitelist=PySide2,PyQt5"
]
}
\ No newline at end of file
diff --git a/UI_MAIN.py b/UI_MAIN.py
index 24dea1f..5d83231 100644
--- a/UI_MAIN.py
+++ b/UI_MAIN.py
@@ -131,7 +131,7 @@ def retranslateUi(self, MainWindow):
self.isAutoTrans.setText(QCoreApplication.translate("MainWindow", u"\ud398\uc774\uc9c0 \ubc14\ub014 \ub54c\ub9c8\ub2e4 \uc790\ub3d9 \ubc88\uc5ed", None))
self.isPrintLog.setText(QCoreApplication.translate("MainWindow", u"\ubc88\uc5ed \ub85c\uadf8 \ucd9c\ub825", None))
self.dev_info.setText(QCoreApplication.translate("MainWindow", u"\uc81c\uc791\uc790: kdr \n"
-" V.210418", None))
+" V.210420", None))
self.go_dev_page.setText(QCoreApplication.translate("MainWindow", u"\uc81c\uc791\uc790\n"
"\ud648\ud398\uc774\uc9c0", None))
# retranslateUi
diff --git a/UI_MAIN.ui b/UI_MAIN.ui
index f3eecc6..f087d31 100644
--- a/UI_MAIN.ui
+++ b/UI_MAIN.ui
@@ -315,7 +315,7 @@
제작자: kdr
- V.210418
+ V.210420
diff --git a/__pycache__/UI_MAIN.cpython-37.pyc b/__pycache__/UI_MAIN.cpython-37.pyc
index 7e7fd1e..a961669 100644
Binary files a/__pycache__/UI_MAIN.cpython-37.pyc and b/__pycache__/UI_MAIN.cpython-37.pyc differ
diff --git a/__pycache__/ehnd_web_translate.cpython-37.pyc b/__pycache__/ehnd_web_translate.cpython-37.pyc
index 14d75c0..ebdedf1 100644
Binary files a/__pycache__/ehnd_web_translate.cpython-37.pyc and b/__pycache__/ehnd_web_translate.cpython-37.pyc differ
diff --git a/ehnd_web_translate.py b/ehnd_web_translate.py
index 3039ab2..e67ee8b 100644
--- a/ehnd_web_translate.py
+++ b/ehnd_web_translate.py
@@ -1,5 +1,6 @@
#-*- coding:utf-8 -*-
+
from module._translate_j2k import t_j2k
from module._requirement_func import *
@@ -12,6 +13,8 @@
from selenium.webdriver.common.keys import Keys
from selenium.common import exceptions
+import threading
+
import asyncio
from UI_MAIN import Ui_MainWindow
@@ -63,20 +66,21 @@ def run(self):
sleep(1)
new_url = self.window.driver.current_url
if current_url != new_url:
- # self.window.show_status.setText("자동 번역 중")
+ self.window.st.stop()
+ self.window.st.isAuto = True
self.window.st.start()
current_url = new_url
class TransThread(QThread):
- def __init__(self, window, isTrans=True):
+ def __init__(self, window, isTrans=True, isAuto=False):
QThread.__init__(self)
- self.working = True
self.window = window
self.isTrans = isTrans
+ self.isAuto = isAuto
self.setTerminationEnabled = True
-
+
def stop(self):
self.window.btnSetting(setNum=1)
@@ -91,7 +95,11 @@ def run(self):
self.window.sec.setText("")
if self.isTrans:
- self.window.show_status.setText("번역 중")
+ if self.isAuto:
+ self.window.show_status.setText("자동 번역 중")
+ else:
+ self.window.show_status.setText("번역 중")
+
a = self.window.driver.find_elements_by_xpath('.//*[normalize-space(text())]')
async_loop(self.rt, a)
self.window.sec.setText(f"{round(time()-start_time, 3)}초")
@@ -102,8 +110,8 @@ def run(self):
self.window.sec.setText("")
self.window.show_status.setText("원본 보기")
- # except:
- # self.window.show_status.setText("번역 실패")
+ except:
+ self.window.show_status.setText("번역 실패")
finally:
self.window.btnSetting(setNum=1)
@@ -133,7 +141,7 @@ async def runTrans(self, i):
k = t_j2k(japanese=ih)
if self.window.isPrintBoth.isChecked():
# k = f"{ih}({k})"
- k = f"{ih}
{k}"
+ k = f"{ih}{k}"
modified_html.append(k)
if self.window.isPrintLog.isChecked():
print("번역O -> ", ih)
@@ -185,7 +193,7 @@ def __init__(self):
chromedriver_autoinstaller.install('./')
self.driver = webdriver.Chrome(options=options)
- self.driver.get("https://syosetu.org/novel/245389/4.html")
+ self.driver.get("https://www.google.com")
self.setupUi(self)
@@ -266,7 +274,7 @@ def btnSetting(self, setNum):
-if __name__ == "__main__":
+if __name__ == '__main__':
import sys
app = QApplication(sys.argv)
et = EhndTrans()
diff --git a/module/__pycache__/_requirement_func.cpython-37.pyc b/module/__pycache__/_requirement_func.cpython-37.pyc
index a665412..5fda887 100644
Binary files a/module/__pycache__/_requirement_func.cpython-37.pyc and b/module/__pycache__/_requirement_func.cpython-37.pyc differ
diff --git a/module/__pycache__/_translate_j2k.cpython-37.pyc b/module/__pycache__/_translate_j2k.cpython-37.pyc
index 1adcb12..19a4d1a 100644
Binary files a/module/__pycache__/_translate_j2k.cpython-37.pyc and b/module/__pycache__/_translate_j2k.cpython-37.pyc differ
diff --git a/module/_translate_j2k.py b/module/_translate_j2k.py
index eeebfb5..7c99f8f 100644
--- a/module/_translate_j2k.py
+++ b/module/_translate_j2k.py
@@ -1,5 +1,6 @@
#-*- coding:utf-8 -*-
+
from ctypes import (
WinDLL,
c_char_p,
diff --git a/utils/Ehnd/PostFilter_@Hdor.txt b/utils/Ehnd/PostFilter_@Hdor.txt
index 01becb7..ece15f1 100644
--- a/utils/Ehnd/PostFilter_@Hdor.txt
+++ b/utils/Ehnd/PostFilter_@Hdor.txt
@@ -1657,6 +1657,7 @@ _TGL _CONN:P7_INA_ 싼데Ⓝp7&INa: 싸구나 12310710 0 //高いな
_TGL _CONN:P7_INA_ 픈데Ⓝp7&INa: 프구나 12310710 0 //哀しいな。
_TGL _CONN:P7_INA_ 한데Ⓝp7&INa: 하구나 12310710 0 //凄いな
_TGL _CONN:P7_INA_ 진데Ⓝp7&INa: 지는구나 12310710 0 //めぼしいな
+_TGL _CONN:P7_INA_ 된데Ⓝp7&INa: 됐구나 12310710 0 //ここまで話せばもういいな？
_TGL _CONN:P7_INA_ Ⓝp7&INa: 12310710 0
//・く + [はも] +
@@ -3797,7 +3798,7 @@ _skip_sub ▂에서도 #M라도 19010099 0
//どうか : "제발"로 번역되는걸 고친다 "부디"로.
//**後生だから。
-제발(?!이니까) 부디 21101100 1 _AUX:제발
+제발(?명사
남고는 남은 것은 10000000 0 //残るは一番奥の部屋だけだった
//함의
-함의(?