<feature> fix duplicate extraction when extract from directory(s)

update version to v2.2.2
anonymousException · Apr 23, 2024 · 4f3ff33 · 4f3ff33
1 parent 1fff8ab
commit 4f3ff33
Show file tree

Hide file tree

Showing 32 changed files with 59 additions and 54 deletions.
diff --git a/src/extraction_form.py b/src/extraction_form.py
@@ -91,28 +91,29 @@ def extract(self):
                     if len(tl_name) == 0:
                         log_print('tl name is empty skip extract file(s)')
                         continue
-                    t = extractThread(threadID=cnt, p=i, tl_name=tl_name, dir=None, tl_dir=None,
+                    t = extractThread(threadID=cnt, p=i, tl_name=tl_name, dirs=None, tl_dir=None,
                                       is_open_filter=self.filterCheckBox.isChecked(),
                                       filter_length=int(self.filterLengthLineEdit.text()),
                                       is_gen_empty=self.emptyCheckBox.isChecked())
                     extract_threads.append(t)
                     cnt = cnt + 1
             select_dirs = self.selectDirsText.toPlainText().split('\n')
+            _dirs = []
             for i in select_dirs:
                 i = i.replace('file:///', '')
                 if len(i) > 0:
-                    tl_name = self.tlNameText.toPlainText()
-                    if len(tl_name) == 0:
-                        log_print('tl name is empty skip extract directory(s)')
-                        continue
-                    t = extractThread(threadID=cnt, p=None, tl_name=tl_name, dir=i, tl_dir=None,
+                    _dirs.append(i)
+            if len(_dirs) > 0:
+                tl_name = self.tlNameText.toPlainText()
+                if len(tl_name) == 0:
+                    log_print('tl name is empty skip extract directory(s)')
+                else:
+                    t = extractThread(threadID=cnt, p=None, tl_name=tl_name, dirs=_dirs, tl_dir=None,
                                       is_open_filter=self.filterCheckBox.isChecked(),
                                       filter_length=int(self.filterLengthLineEdit.text()),
                                       is_gen_empty=self.emptyCheckBox.isChecked())
                     extract_threads.append(t)
                     cnt = cnt + 1
-                pass
-
             select_dir = self.selectDirText_2.toPlainText()
             if len(select_dir) > 0:
                 select_dir = select_dir.replace('file:///', '')
@@ -122,7 +123,7 @@ def extract(self):
                 else:
                     if select_dir[len(select_dir) - 1] != '/' and select_dir[len(select_dir) - 1] != '\\':
                         select_dir = select_dir + '/'
-                    t = extractThread(threadID=cnt, p=None, tl_name=tl_name, dir=None, tl_dir=select_dir,
+                    t = extractThread(threadID=cnt, p=None, tl_name=tl_name, dirs=None, tl_dir=select_dir,
                                       is_open_filter=self.filterCheckBox.isChecked(),
                                       filter_length=int(self.filterLengthLineEdit.text()),
                                       is_gen_empty=self.emptyCheckBox.isChecked())

diff --git a/src/one_key_translate_form.py b/src/one_key_translate_form.py
@@ -258,7 +258,7 @@ def extract(self):
                 else:
                     if select_dir[len(select_dir) - 1] != '/' and select_dir[len(select_dir) - 1] != '\\':
                         select_dir = select_dir + '/'
-                    t = renpy_extract.extractThread(threadID=0, p=None, tl_name=tl_name, dir=None, tl_dir=select_dir,
+                    t = renpy_extract.extractThread(threadID=0, p=None, tl_name=tl_name, dirs=None, tl_dir=select_dir,
                                                     is_open_filter=self.filterCheckBox.isChecked(),
                                                     filter_length=int(self.filterLengthLineEdit.text()),
                                                     is_gen_empty=False)

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/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/renpy_extract.py b/src/renpy_extract.py
@@ -21,12 +21,12 @@
 
 
 class extractThread(threading.Thread):
-    def __init__(self, threadID, p, tl_name, dir, tl_dir, is_open_filter, filter_length, is_gen_empty):
+    def __init__(self, threadID, p, tl_name, dirs, tl_dir, is_open_filter, filter_length, is_gen_empty):
         threading.Thread.__init__(self)
         self.threadID = threadID
         self.p = p
         self.tl_name = tl_name
-        self.dir = dir
+        self.dirs = dirs
         self.tl_dir = tl_dir
         self.is_open_filter = is_open_filter
         self.filter_length = filter_length
@@ -47,17 +47,19 @@ def run(self):
                     log_print(self.p + ' begin extract!')
                     ExtractWriteFile(self.p, self.tl_name, self.is_open_filter, self.filter_length, self.is_gen_empty,
                                      set())
-                if self.dir is not None:
-                    log_print(self.dir + ' begin extract!')
-                    paths = os.walk(self.dir, topdown=False)
+                if self.dirs is not None:
                     global_e = set()
-                    for path, dir_lst, file_lst in paths:
-                        for file_name in file_lst:
-                            i = os.path.join(path, file_name)
-                            if not file_name.endswith("rpy"):
-                                continue
-                            global_e = ExtractWriteFile(i, self.tl_name, self.is_open_filter, self.filter_length,
-                                                        self.is_gen_empty, global_e)
+                    for _dir in self.dirs:
+                        log_print(_dir + ' begin extract!')
+                        paths = os.walk(_dir, topdown=False)
+                        for path, dir_lst, file_lst in paths:
+                            for file_name in file_lst:
+                                i = os.path.join(path, file_name)
+                                if not file_name.endswith("rpy"):
+                                    continue
+                                ret_e = ExtractWriteFile(i, self.tl_name, self.is_open_filter, self.filter_length,
+                                                            self.is_gen_empty, global_e)
+                                global_e = global_e | ret_e
 
         except Exception as e:
             msg = traceback.format_exc()
@@ -322,10 +324,9 @@ def ExtractWriteFile(p, tl_name, is_open_filter, filter_length, is_gen_empty, gl
     if (os.path.isfile(target) == False):
         open(target, 'w').close()
     e = ExtractFromFile(p, is_open_filter, filter_length)
-    global_e = global_e | e
     extractedSet = ExtractFromFile(target, False, 9999)
-    eDiff = global_e - extractedSet
-    if (len(eDiff) > 0):
+    eDiff = e - extractedSet
+    if len(eDiff) > 0:
         f = io.open(target, 'a+', encoding='utf-8')
         f.write('\ntranslate ' + tl_name + ' strings:\n')
         lock.acquire()
@@ -340,13 +341,16 @@ def ExtractWriteFile(p, tl_name, is_open_filter, filter_length, is_gen_empty, gl
         head = head + 'new ' + timestamp + '\n\n'
         f.write(head)
         for j in eDiff:
+            if j in global_e:
+                continue
             j = '"' + j + '"'
             if not is_gen_empty:
                 writeData = '    old ' + j + '\n    new ' + j + '\n'
             else:
                 writeData = '    old ' + j + '\n    new ' + '""' + '\n'
             f.write(writeData + '\n')
         f.close()
+    global_e = global_e | e
     global_e = global_e | extractedSet
     log_print(target + ' extracted success!')
     return global_e

diff --git a/src/ts/arabic.ts b/src/ts/arabic.ts
@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.1</source>
-        <translation>الإصدار2.2.1</translation>
+        <source>Version 2.2.2</source>
+        <translation>الإصدار2.2.2</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

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

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

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

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

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

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

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

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

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

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

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

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

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

diff --git a/src/ui.py b/src/ui.py
@@ -380,7 +380,7 @@ def retranslateUi(self, MainWindow):
         self.actionpack_game_files.setText(QCoreApplication.translate("MainWindow", u"pack game files", 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.2.1", None))
+        self.versionLabel.setText(QCoreApplication.translate("MainWindow", u"Version 2.2.2", 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.2.1</string>
+       <string>Version 2.2.2</string>
       </property>
      </widget>
     </item>