<fix> fix unable to unpack due to path problem

update version to v2.3.6
anonymousException · Jun 5, 2024 · 8eb2ecf · 8eb2ecf
1 parent 0bab428
commit 8eb2ecf
Show file tree

Hide file tree

Showing 37 changed files with 46 additions and 41 deletions.
diff --git a/src/extraction_official_form.py b/src/extraction_official_form.py
@@ -111,7 +111,7 @@ def get_translate_cmd(game_path, tl_name):
     python_path = get_python_path(game_path)
     py_path = get_py_path(game_path)
     game_dir = os.path.dirname(game_path)
-    command = python_path + ' -O "' + py_path + '" "' + game_dir + '" translate "' + tl_name + '"'
+    command = '"' + python_path + '"' + ' -O "' + py_path + '" "' + game_dir + '" translate "' + tl_name + '"'
     return command
 
 

diff --git a/src/font_replace_form.py b/src/font_replace_form.py
@@ -79,7 +79,7 @@ def openFontStyleFile(self):
             select_dir = select_dir.replace('file:///', '')
             if select_dir[len(select_dir) - 1] != '/' and select_dir[len(select_dir) - 1] != '\\':
                 select_dir = select_dir + '/'
-            command = 'notepad ' + select_dir + 'gui.rpy'
+            command = 'notepad ' + '"' + select_dir + 'gui.rpy' + '"'
             p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
                                  creationflags=0x08000000, text=True, encoding='utf-8')
             p.wait()

diff --git a/src/game_unpacker_form.py b/src/game_unpacker_form.py
@@ -42,7 +42,7 @@ def get_unrpyc_command(game_path):
     python_path = get_python_path(game_path)
     game_dir = os.path.dirname(game_path)
     unrpyc_path = game_dir + '/unrpyc.py'
-    command = python_path + ' -O "' + unrpyc_path + '" "' + game_dir + '"'
+    command = '"' + python_path + '" -O "' + unrpyc_path + '" "' + game_dir + '"'
     return command
 
 
@@ -179,7 +179,7 @@ def unpack(self):
                 f = io.open(hook_script, mode='w', encoding='utf-8')
                 f.writelines(_read_lines)
                 f.close()
-                command = path
+                command = '"' + path + '"'
                 self.path = path
                 f = io.open(dir + finish_flag, 'w')
                 f.write('waiting')

diff --git a/src/main.py b/src/main.py
@@ -3,6 +3,7 @@
 import io
 import multiprocessing
 import os.path
+import shutil
 import subprocess
 import sys
 import time
@@ -488,14 +489,18 @@ def __del__(self):
             self.wait()
 
         def run(self):
-            f = io.open(log_path, 'r+',encoding='utf-8')
+            f = io.open(log_path, 'r+', encoding='utf-8')
             try:
                 self.update_date.emit(f.read())
             except Exception as e:
                 f.close()
+                shutil.copyfile(log_path, log_path + '.error.txt')
                 f = io.open(log_path, 'w')
                 f.write('Log Format UnicodeEncodeError! Log Cleared')
                 f.close()
+                command = 'notepad ' + log_path + '.error.txt'
+                p = subprocess.Popen(command, shell=True, stdout=subprocess.PIPE, stderr=subprocess.STDOUT,
+                                     creationflags=0x08000000, text=True, encoding='utf-8')
                 f = io.open(log_path, 'r+', encoding='utf-8')
             f.close()
 

diff --git a/src/one_key_translate_form.py b/src/one_key_translate_form.py
@@ -372,7 +372,7 @@ def unpack(self):
                 f = io.open(game_unpacker_form.hook_script, mode='w', encoding='utf-8')
                 f.writelines(_read_lines)
                 f.close()
-                command = path
+                command = '"' +path+'"'
                 self.path = path
                 f = io.open(dir + finish_flag, 'w')
                 f.write('waiting')

diff --git a/src/pack_game_form.py b/src/pack_game_form.py
@@ -382,15 +382,15 @@ def pack_from_list(python_path, pack_list, target_path):
         if not os.path.isfile(target_path):
             i = pack_list[0]
             basename = i[len(game_dir):].strip('/').strip('\\')
-            command = python_path + f' -O "{rpa_script_path}" -c "{target_path}" "{basename}"="{i}"'
+            command = '"' + python_path + '"' + f' -O "{rpa_script_path}" -c "{target_path}" "{basename}"="{i}"'
             log_print(command)
             p = subprocess.Popen(command, shell=True, stdout=my_log.f, stderr=my_log.f,
                                  creationflags=0x08000000, text=True, encoding='utf-8')
             p.wait()
             pack_list.pop(0)
         for i in pack_list:
             basename = i[len(game_dir):].strip('/').strip('\\')
-            command = python_path + f' -O "{rpa_script_path}" -a "{target_path}" "{basename}"="{i}"'
+            command = '"' + python_path + '"' + f' -O "{rpa_script_path}" -a "{target_path}" "{basename}"="{i}"'
             log_print(command)
             p = subprocess.Popen(command, shell=True, stdout=my_log.f, stderr=my_log.f,
                                  creationflags=0x08000000, text=True, encoding='utf-8')

diff --git a/src/qm/arabic.qm b/src/qm/arabic.qm
diff --git a/src/qm/bengali.qm b/src/qm/bengali.qm
diff --git a/src/qm/chinese.qm b/src/qm/chinese.qm
diff --git a/src/qm/french.qm b/src/qm/french.qm
diff --git a/src/qm/german.qm b/src/qm/german.qm
diff --git a/src/qm/greek.qm b/src/qm/greek.qm
diff --git a/src/qm/hindi.qm b/src/qm/hindi.qm
diff --git a/src/qm/japanese.qm b/src/qm/japanese.qm
diff --git a/src/qm/korean.qm b/src/qm/korean.qm
diff --git a/src/qm/portuguese.qm b/src/qm/portuguese.qm
diff --git a/src/qm/russian.qm b/src/qm/russian.qm
diff --git a/src/qm/spanish.qm b/src/qm/spanish.qm
diff --git a/src/qm/turkish.qm b/src/qm/turkish.qm
diff --git a/src/qm/urdu.qm b/src/qm/urdu.qm
diff --git a/src/ts/arabic.ts b/src/ts/arabic.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>الإصدار2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>الإصدار2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/bengali.ts b/src/ts/bengali.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>সংস্করণ 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>সংস্করণ 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/chinese.ts b/src/ts/chinese.ts
@@ -1193,8 +1193,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>版本 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>版本 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/default.ts b/src/ts/default.ts
@@ -1268,7 +1268,7 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
+        <source>Version 2.3.6</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

diff --git a/src/ts/french.ts b/src/ts/french.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>Version 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>Version 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/german.ts b/src/ts/german.ts
@@ -1303,8 +1303,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>Version 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>Version 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/greek.ts b/src/ts/greek.ts
@@ -1268,8 +1268,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>Έκδοση 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>Έκδοση 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/hindi.ts b/src/ts/hindi.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>संस्करण 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>संस्करण 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/japanese.ts b/src/ts/japanese.ts
@@ -1189,8 +1189,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>バージョン2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>バージョン2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/korean.ts b/src/ts/korean.ts
@@ -1303,8 +1303,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>버전 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>버전 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/portuguese.ts b/src/ts/portuguese.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>Versão 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>Versão 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/russian.ts b/src/ts/russian.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>Версия 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>Версия 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/spanish.ts b/src/ts/spanish.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>Versión 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>Versión 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ts/turkish.ts b/src/ts/turkish.ts
@@ -1280,8 +1280,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>Sürüm 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>Sürüm 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

diff --git a/src/ts/urdu.ts b/src/ts/urdu.ts
@@ -1195,8 +1195,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.3.5</source>
-        <translation>ورژن 2.3.5</translation>
+        <source>Version 2.3.6</source>
+        <translation>ورژن 2.3.6</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

diff --git a/src/ui.py b/src/ui.py
@@ -156,6 +156,7 @@ def setupUi(self, MainWindow):
         self.actionpack_game_files.setObjectName(u"actionpack_game_files")
         self.actionGreek = QAction(MainWindow)
         self.actionGreek.setObjectName(u"actionGreek")
+        self.actionGreek.setText(u"Greek")
         self.centralwidget = QWidget(MainWindow)
         self.centralwidget.setObjectName(u"centralwidget")
         self.gridLayout = QGridLayout(self.centralwidget)
@@ -381,10 +382,9 @@ def retranslateUi(self, MainWindow):
         self.actionofficial_extraction.setText(QCoreApplication.translate("MainWindow", u"official extraction", None))
         self.actionconvert_txt_to_html.setText(QCoreApplication.translate("MainWindow", u"convert txt to html", None))
         self.actionpack_game_files.setText(QCoreApplication.translate("MainWindow", u"pack game files", None))
-        self.actionGreek.setText(QCoreApplication.translate("MainWindow", u"Greek", None))
         self.clearLogBtn.setText(QCoreApplication.translate("MainWindow", u"clear log", None))
         self.copyrightLabel.setText(QCoreApplication.translate("MainWindow", u"\u00a92024 Last moment,All rights reserved.", None))
-        self.versionLabel.setText(QCoreApplication.translate("MainWindow", u"Version 2.3.5", None))
+        self.versionLabel.setText(QCoreApplication.translate("MainWindow", u"Version 2.3.6", None))
         self.translateBtn.setText(QCoreApplication.translate("MainWindow", u"translate", None))
         self.selectFilesBtn.setText(QCoreApplication.translate("MainWindow", u"...", None))
         self.label_2.setText(QCoreApplication.translate("MainWindow", u"directory", None))

diff --git a/src/ui.ui b/src/ui.ui
@@ -75,7 +75,7 @@
        </size>
       </property>
       <property name="text">
-       <string>Version 2.3.5</string>
+       <string>Version 2.3.6</string>
       </property>
      </widget>
     </item>
@@ -782,7 +782,7 @@
   </action>
   <action name="actionGreek">
    <property name="text">
-    <string>Greek</string>
+    <string notr="true">Greek</string>
    </property>
   </action>
  </widget>