feature: Patchouliへの対応

Author: Y-RyuZU

README.md

@@ -3,6 +3,7 @@
 ![image2.png](/docs/assets/image2.png)
 ![image3.png](/docs/assets/image3.png)
 ![image4.png](/docs/assets/image4.png)
+![image4.png](/docs/assets/image5.png)
 
 # **New!! 翻訳に使用するAIをChatGPTに変更しました！API料金が大幅に安くなり(ATM9で0.5ドル以下)、精度も格段に良くなりました！ファイル構造の崩壊、特殊文字無視とはバイバイ！**
 あとBetterQuestingに対応しました。RLCraftとかする人はどうぞ

src/main.py

@@ -80,5 +80,15 @@
                 sg.popup('翻訳失敗')
                 break
 
+
+            # if values['target1']:
+            #     translate_from_jar()
+            # elif values['target2']:
+            #     translate_ftbquests()
+            # elif values['target3']:
+            #     translate_betterquesting()
+            # elif values['target4']:
+            #     translate_patchouli()
+
             sg.popup('翻訳成功！')
             break

src/patchouli.py

@@ -15,51 +15,65 @@ def translate_patchouli():
         if filename.endswith('.jar'):
             process_jar_file(os.path.join(MODS_DIR, filename))
 
+import zipfile
+import os
+import re
+import logging
+
+
 def process_jar_file(jar_path):
     mod_name = get_mod_name_from_jar(jar_path)
     if mod_name is None:
         return
 
-    # パスの定義
-    lang_path_in_jar = f'assets/{mod_name}/patchouli_books/guidebook'
-    en_us_path = f'{lang_path_in_jar}/en_us/'
-    ja_jp_path = f'{lang_path_in_jar}/ja_jp/'
-
-    print(en_us_path)
-    print(ja_jp_path)
+    # Base path in the jar
+    base_path_in_jar = f'assets/{mod_name}/patchouli_books/'
 
     try:
         with zipfile.ZipFile(jar_path, 'r') as jar:
+            # Get list of directories under patchouli_books
+            dirs_in_patchouli = {item.filename.split('/')[3] for item in jar.infolist()
+                                 if item.filename.startswith(base_path_in_jar) and item.is_dir()}
 
-            en_us_exists = any(en_us_path in item.filename for item in jar.infolist())
-            ja_jp_exists = any(ja_jp_path in item.filename for item in jar.infolist())
-
-            if not en_us_exists:
-                return {}
-            if ja_jp_exists:
-                return {}
-
-            logging.info(f"Translate Patchouli in {jar_path}")
+            modification_needed = False
 
             with zipfile.ZipFile(jar_path + '.new', 'w') as new_jar:
                 for item in jar.infolist():
                     data = jar.read(item.filename)
-                    new_jar.writestr(item, data)  # すべての元のファイルをコピー
-                    if item.filename.startswith(en_us_path) and not item.is_dir():
-                        new_filename = item.filename.replace(en_us_path, ja_jp_path)
-
-                        # 翻訳処理
-                        if item.filename.endswith('.json'):
-                            content = data.decode('utf-8')
-                            matches = re.findall(r'"(name|description|title)":\s*"(.*?)(?<!\\)"', content)
-                            extracted_strings = [match[1] for match in matches]
-                            translated_map = prepare_translation(extracted_strings)
-                            for original, translated in translated_map.items():
-                                content = content.replace(f'"{original}"', f'"{translated}"')
-                            new_jar.writestr(new_filename, content.encode('utf-8'))
-
-        # 新しい.jarファイルで古いファイルを置き換え
-        os.replace(jar_path + '.new', jar_path)
+                    new_jar.writestr(item, data)  # Copy all original files
+
+                    if item.filename.startswith(base_path_in_jar) and not item.is_dir():
+                        # Check for en_us and translate to ja_jp for each directory under patchouli_books
+                        for subdir in dirs_in_patchouli:
+                            en_us_path = f'{base_path_in_jar}{subdir}/en_us/'
+                            ja_jp_path = f'{base_path_in_jar}{subdir}/ja_jp/'
+
+                            en_us_exists = any(en_us_path in item.filename for item in jar.infolist())
+                            ja_jp_exists = any(ja_jp_path in item.filename for item in jar.infolist())
+
+                            if en_us_exists and not ja_jp_exists:
+                                modification_needed = True
+
+                                if item.filename.startswith(en_us_path):
+                                    new_filename = item.filename.replace(en_us_path, ja_jp_path)
+
+                                    # Translation processing
+                                    if item.filename.endswith('.json'):
+                                        logging.info(f"Translating Patchouli for {item.filename} in {jar_path}")
+
+                                        content = data.decode('utf-8')
+                                        matches = re.findall(r'"(name|description|title|text)":\s*"(.*?)(?<!\\)"', content)
+                                        extracted_strings = [match[1] for match in matches]
+                                        translated_map = prepare_translation(extracted_strings)
+                                        for original, translated in translated_map.items():
+                                            content = content.replace(f'"{original}"', f'"{translated}"')
+                                        new_jar.writestr(new_filename, content.encode('utf-8'))
 
     except zipfile.BadZipFile:
-        logging.error("Failed to read or write to the jar file.")
+        logging.error("Failed to read or write to the jar file.")
+
+    finally:
+        if modification_needed:
+            os.replace(jar_path + '.new', jar_path)
+        else:
+            os.remove(jar_path + '.new')

src/prepare.py

@@ -31,7 +31,7 @@ def extract_map_from_json(file_path):
 
             # 値が英語でコメント以外のキーのみを保存します。
             for key, value in content.items():
-                if not key.startswith("_comment") and not re.search('[\u3040-\u30FF\u3400-\u4DBF\u4E00-\u9FFF]', value):
+                if not key.startswith("_comment") and isinstance(value, str) and not re.search('[\u3040-\u30FF\u3400-\u4DBF\u4E00-\u9FFF]', value):
                     collected_map[key] = value
 
         except json.JSONDecodeError: