<feature> improve extraction and support extract _p format (multi-lines)

update version to v2.2.4

src/renpy_extract.py

@@ -61,7 +61,7 @@ def run(self):
                                 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)
+                                                         self.is_gen_empty, global_e)
                                 global_e = global_e | ret_e
 
         except Exception as e:
@@ -77,7 +77,7 @@ def ExtractFromFile(p, is_open_filter, filter_length):
     # print(_read)
     _read_line = _read.split('\n')
     is_in_condition_switch = False
-    for line_content in _read_line:
+    for index, line_content in enumerate(_read_line):
         if 'ConditionSwitch(' in line_content:
             is_in_condition_switch = True
             continue
@@ -90,16 +90,29 @@ def ExtractFromFile(p, is_open_filter, filter_length):
         cmp_line_content = remove_upprintable_chars(line_content.strip())
         if cmp_line_content.startswith('#') or len(line_content.strip()) == 0:
             continue
+
+        if '_p("""' in line_content:
+            position = line_content.find('_p("""')
+            p_content = line_content[position:] + '\n'
+            for idx in range(index + 1, len(_read_line)):
+                content = _read_line[idx]
+                p_content = p_content + content + '\n'
+                if content.endswith('""")'):
+                    p_content = p_content.rstrip('\n')
+                    break
+            #log_print(p_content)
+            e.add(p_content)
+
         if (is_open_filter):
             if cmp_line_content.startswith('label '):
                 continue
-            if cmp_line_content.startswith('define '):
-                continue
-            # if(line_content.strip().startswith('default ')):
-            # 	continue
+            if line_content.strip().startswith('default '):
+            	continue
         # log_print(line_content)
+
         suffix_list = ['.ogg', '.webp', '.png', '.ttf', '.otf', '.webm', '.svg', '.gif', '.jpg', '.wav',
-                       '.mp3']
+                       '.mp3','.rpyc','.rpy','.db']
+        is_add = False
         d = EncodeBracketContent(line_content, '"', '"')
         if 'oriList' in d.keys() and len(d['oriList']) > 0:
             for i in d['oriList']:
@@ -138,8 +151,12 @@ def ExtractFromFile(p, is_open_filter, filter_length):
                             # log_print(len(strip_i),i)
                             continue
                         e.add(i)
+                        is_add = True
                     else:
                         e.add(i)
+                        is_add = True
+        if is_add:
+            continue
         d = EncodeBracketContent(line_content, "'", "'")
         if 'oriList' in d.keys() and len(d['oriList']) > 0:
             for i in d['oriList']:
@@ -220,7 +237,8 @@ def GetExtractedSet(p):
                 lines = f.readlines()
                 f.close()
                 for j in both:
-                    j = '"' + j + '"'
+                    if not j.startswith('_p("""') and not j.endswith('""")'):
+                        j = '"' + j + '"'
                     for index, line in enumerate(lines):
                         if line.startswith('    old ' + j):
                             lines[index] = '\n'
@@ -277,7 +295,8 @@ def WriteExtracted(p, extractedSet, is_open_filter, filter_length, is_gen_empty)
                 head = head + 'new ' + timestamp + '\n\n'
                 f.write(head)
                 for j in eDiff:
-                    j = '"' + j + '"'
+                    if not j.startswith('_p("""') and not j.endswith('""")'):
+                        j = '"' + j + '"'
                     if not is_gen_empty:
                         writeData = '    old ' + j + '\n    new ' + j + '\n'
                     else:
@@ -346,7 +365,8 @@ def ExtractWriteFile(p, tl_name, is_open_filter, filter_length, is_gen_empty, gl
         for j in eDiff:
             if j in global_e:
                 continue
-            j = '"' + j + '"'
+            if not j.startswith('_p("""') and not j.endswith('""")'):
+                j = '"' + j + '"'
             if not is_gen_empty:
                 writeData = '    old ' + j + '\n    new ' + j + '\n'
             else:

src/renpy_translate.py

@@ -333,21 +333,28 @@ def get_rpy_info(p):
         _read_line = _read.split('\n')
         isLastFiltered = False
         isNeedSkip = False
+        is_p = False
         isVoice = False
         unmatch_cnt = 0
         for line_index, line_content in enumerate(_read_line):
-            if (line_content.startswith('translate ')):
+            if line_content.startswith('translate '):
                 isNeedSkip = False
                 split_s = line_content.split(' ')
                 if (len(split_s) > 2):
                     target = split_s[2].strip('\n')
                     if (target == 'python:' or target == 'style'):
                         isNeedSkip = True
                 continue
-            if (isNeedSkip):
+            if line_content.strip().startswith('old _p("""'):
+                is_p = True
+            if is_p:
+                if line_content.endswith('""")'):
+                    is_p = False
+                continue
+            if isNeedSkip:
                 continue
             isNeedSkip = False
-            if (line_content.strip().startswith('#') or line_content.strip().startswith('old ')):
+            if line_content.strip().startswith('#') or line_content.strip().startswith('old '):
                 isLastFiltered = True
                 continue
             if (isLastFiltered):

src/ts/arabic.ts

@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>الإصدار2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>الإصدار2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/bengali.ts

@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>সংস্করণ 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>সংস্করণ 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/chinese.ts

@@ -1178,8 +1178,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>版本 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>版本 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/default.ts

@@ -1253,7 +1253,7 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
+        <source>Version 2.2.4</source>
         <translation type="unfinished"></translation>
     </message>
     <message>

src/ts/french.ts

@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>Version 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>Version 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/german.ts

@@ -1288,8 +1288,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>Version 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>Version 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

src/ts/hindi.ts

@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>संस्करण 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>संस्करण 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/japanese.ts

@@ -1174,8 +1174,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>バージョン2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>バージョン2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/korean.ts

@@ -1288,8 +1288,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>버전 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>버전 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

src/ts/portuguese.ts

@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>Versão 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>Versão 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/russian.ts

@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>Версия 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>Версия 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/spanish.ts

@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>Versión 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>Versión 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

src/ts/turkish.ts

@@ -1265,8 +1265,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>Sürüm 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>Sürüm 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="391"/>

src/ts/urdu.ts

@@ -1180,8 +1180,8 @@
     </message>
     <message>
         <location filename="../ui.ui" line="78"/>
-        <source>Version 2.2.3</source>
-        <translation>ورژن 2.2.3</translation>
+        <source>Version 2.2.4</source>
+        <translation>ورژن 2.2.4</translation>
     </message>
     <message>
         <location filename="../ui.ui" line="113"/>

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.3", None))
+        self.versionLabel.setText(QCoreApplication.translate("MainWindow", u"Version 2.2.4", 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))

src/ui.ui

@@ -75,7 +75,7 @@
        </size>
       </property>
       <property name="text">
-       <string>Version 2.2.3</string>
+       <string>Version 2.2.4</string>
       </property>
      </widget>
     </item>