Merge pull request #1 from ipcjs/master

update

Author: jss-tg

.gitignore

@@ -1,4 +1,5 @@
 .venv/
 tmp/
 __pycache__/
-*.pyc
+*.pyc
+*.stackdump

.vscode/launch.json

@@ -9,8 +9,23 @@
             "type": "python",
             "request": "launch",
             "program": "${workspaceFolder}/tg.py",
+            "env": {
+                "https_proxy": "http://127.0.0.1:1080",
+                "http_proxy": "http://127.0.0.1:1080",
+            },
             "console": "integratedTerminal"
         },
+        {
+            "name": "selpic.py",
+            "type": "python",
+            "request": "launch",
+            "program": "${workspaceFolder}/selpic.py",
+            "console": "integratedTerminal",
+            "env": {
+                "https_proxy": "http://127.0.0.1:1080",
+                "http_proxy": "http://127.0.0.1:1080",
+            },
+        },
         {
             "name": "Python: Current File",
             "type": "python",

README.md

@@ -3,3 +3,16 @@
 1. export to xls
 2. import from xls
 3. translate by google
+
+## How to set proxy?
+
+```sh
+# replace to you proxy address
+export https_proxy=http://127.0.0.1:1080
+```
+
+## Develop
+
+```sh
+pipenv install
+```

att/__init__.py

@@ -28,9 +28,9 @@ def merge_items(base_items, new_items):
         key_name = ItemsUtil.get_key_name_from_items(new_items)  # 可能为: key/ios_key/web_key
         for key, item in new_items.items():
             for base_item in base_items.values():
-                if not base_item[key_name] and item.all_lang_equals(base_item):
+                if not getattr(base_item, key_name) and item.all_lang_equals(base_item):
                     # base_item不存在[key_name]的情况下, 若所有语言的翻译都相同, 说明是同一个字符串, 给base_item添加[key_name]
-                    base_item[key_name] = item[key_name]
+                    setattr(base_item, key_name, getattr(item, key_name))
                     break
             else:  # 没有找到三语相同的时, 需要添加item
                 items[key] = item
@@ -85,18 +85,15 @@ def process_diff_cover(files, new_items):
                     else:
                         pass
 
-    def process_diff_all(files: typing.Tuple[File, ...], new_items: typing.Dict[str, Item], item_key_name: str):
+    def process_diff_all(files: typing.Tuple[File, ...], new_items: typing.Dict[str, Item]):
         """
         以new_items为准, 处理删除和新增
 
         :param files:
         :param new_items:
-        :param item_key_name:  new_items的key使用的Item的哪个字段; 可选 'key', 'ios_key';
         :return:
         """
         items = ItemsUtil.read_files_to_items(files)
-        if item_key_name:  # 过滤android或ios的item
-            new_items = Dict((k, v) for k, v in new_items.items() if str(k) == v[item_key_name])
         lang_files = list(map(lambda f: (f.lang, f), files))  # (注意: 有可能存在多个file的lang相同的情况...)
         for key, item in items.items():  # 遍历items
             new_item = new_items[key]
@@ -151,7 +148,8 @@ def process_diff_all(files: typing.Tuple[File, ...], new_items: typing.Dict[str,
     # ItemsUtil.cover_items_to_files(ios_files, new_items)
 
     for files in files_tuple:
-        process_diff_all(files, new_items, ItemsUtil.get_key_name_from_files(files))
+        key_class = ItemsUtil.get_key_class_from_files(files)
+        process_diff_all(files, Dict({k: v for k, v in new_items.items() if isinstance(k, key_class)}))
         ItemsUtil.cover_items_to_files(files, new_items)
 
 
@@ -166,8 +164,9 @@ def process_translate(files: typing.Tuple[File, ...], items: typing.Dict[str, It
             has_translate_files = [(lang, f) for lang, f in main_lang_files if item[lang]]
             if len(has_translate_files) > 0 and len(has_translate_files) < len(main_lang_files):
                 source = Dict(lang=has_translate_files[0][0], text=item[has_translate_files[0][0]])  # 将第一个有翻译的语言作为源语言
-                for lang, file in main_lang_files:
-                    try:
+                try:
+                    temp_result = Dict()
+                    for lang, file in main_lang_files:
                         old_text = item[lang]
                         # 因为存在将zh写在en的file里的情况, 故大多数情况下需要把所有的file都翻译一遍
                         if translate_all_lang or not old_text:
@@ -178,12 +177,18 @@ def process_translate(files: typing.Tuple[File, ...], items: typing.Dict[str, It
                                     p('remind', '(translate %s => %s)%s:\n%s\n%s' % (source.lang, lang, key, old_text, new_text))
                                     replace = input('是否修改该字符串:(y)') in 'yY'
                             if replace:
-                                item[lang] = new_text
-                                p('info', 'translate %s => %s >> %s => %s' % (source.lang, lang, source.text, item[lang]))
-                                if not old_text:  # 给file添加空行, see: @add_empty_line_for_cover
-                                    file.add(key, '')
-                    except Exception as e:
-                        p('warn', 'translate %s => %s >> %s =x %s' % (source.lang, lang, source.text, e))
+                                temp_result[lang] = (new_text, old_text, file)
+                    # 翻译结果放在temp_result中去, item的所有语言的翻译完全成功后再应用更改
+                    # 若中途报错, 则item的所有语言翻译都会回退
+                    # 这样做主要是为了防止source是zh写在en的file中时, 第一次是zh翻其他语言,
+                    # 第二次若source已经被翻成了en, 则是en翻其他语言, 会存在结果不一致的问题
+                    for lang, (new_text, old_text, file) in temp_result.items():
+                        item[lang] = new_text
+                        p('info', 'translate %s => %s >> %s => %s' % (source.lang, lang, source.text, item[lang]))
+                        if not old_text:  # 给file添加空行, see: @add_empty_line_for_cover
+                            file.add(key, '')
+                except Exception as e:
+                    p('warn', 'translate %s => ?? >> %s =x %s' % (source.lang, source.text, e))
 
     items = ItemsUtil.read_files_to_items(files)
 

att/files/file.py

@@ -1,5 +1,7 @@
 import typing
 from ..item import *
+import re
+
 
 class File:
     def __init__(self, file, lang, is_main=True, *, keyClass: typing.Type[Key]):
@@ -21,3 +23,28 @@ def to_file(self, file): pass
 
     def save(self):
         self.to_file(self.file)
+
+
+# 除`\n`以外的`\`
+# @text_newline_sep
+REG_BACKSLASH = re.compile(r'\\(?!n)')
+
+
+def convert_string_to_text(string: str) -> str:
+    # string中存在转义:
+    # \' -> '
+    # \" -> "
+    # \\ -> \
+    # \n -> 不处理, item中用`\n`表示换行
+    # @text_newline_sep
+    return string.replace("\\'", "'").replace('\\"', '"').replace('\\\\', '\\')
+
+
+def convert_text_to_string(text: str, replace_single_quote=True, replace_double_quote=True) -> str:
+    # 同上, 反向转换
+    r = re.sub(REG_BACKSLASH, '\\\\', text)
+    if replace_single_quote:
+        r = r.replace("'", "\\'")
+    if replace_double_quote:
+        r = r.replace('"', '\\"')
+    return r

att/files/json_file.py

@@ -8,6 +8,7 @@ class JsonFile(File):
     @staticmethod
     def read(file):
         if not os.path.exists(file):
+            p('warn', '%(file)s no exists.' % {'file': file})
             return {}
         obj = {}
         with open(file, mode='r', encoding='utf-8') as f:
@@ -75,5 +76,5 @@ def to_items(self, items):
     def to_file(self, file):
         if not os.path.exists(file):
             os.makedirs(os.path.dirname(file), exist_ok=True)
-        with open(file, mode='w', encoding='utf-8', newline='\n') as f:
+        with open(file, mode='w', encoding='utf-8', newline=None) as f:
             json.dump(self.dict_to_obj(self._dict), f, indent=2, ensure_ascii=False)

att/files/string_file.py

@@ -4,6 +4,7 @@
 import os
 from .file import *
 
+
 class Line:
     @staticmethod
     def create(text):
@@ -34,13 +35,22 @@ def __init__(self, text, key, value):
         self.key = key
         self.value = value
 
+    def get_normalized_value(self):
+        return convert_string_to_text(self.value)
+
+    def set_normalized_value(self, value):
+        # iOS不需要替换单引号
+        self.value = convert_text_to_string(value, replace_single_quote=False)
+
     def text(self):
         return KeyValueLine.TEXT_FORMAT.format(key=self.key, value=self.value)
 
+
 class StringsFile(File):
     @staticmethod
     def read(file):
         if not os.path.exists(file):
+            p('warn', '%(file)s no exists.' % {'file': file})
             return []
         lines = []
         with open(file, mode='r', encoding='utf-8') as f:
@@ -68,13 +78,13 @@ def cover(self, items):
             key = self.keyClass(line.key)
             item = items[key]
             if item:
-                old_text = line.value
+                old_text = line.get_normalized_value()
                 new_text = item[self.lang]
                 if new_text is None:
                     # @item_lang_is_none
                     p('skip', '   [%(lang)s] %(key)s: new_text is None' % {'key': key, 'lang': self.lang})
                 elif old_text != new_text:
-                    line.value = new_text
+                    line.set_normalized_value(new_text)
 
     def to_items(self, items):
         for line in filter(lambda l: isinstance(l, KeyValueLine), self._lines):
@@ -87,14 +97,14 @@ def to_items(self, items):
                 p('warn', '存在同名key: %(key)s [%(old_value)s=>%(new_value)s] (%(lang)s)' % {
                     'key': key,
                     'old_value': item[self.lang],
-                    'new_value': line.value,
+                    'new_value': line.get_normalized_value(),
                     'lang': self.lang
                 })
-            item[self.lang] = line.value
+            item[self.lang] = line.get_normalized_value()
 
     def to_file(self, file):
         if not os.path.exists(file):
             os.makedirs(os.path.dirname(file), exist_ok=True)
-        with open(file, mode='w', encoding='utf-8', newline='\n') as f:
+        with open(file, mode='w', encoding='utf-8', newline=None) as f:
             for line in self._lines:
                 f.writelines(line.text())

att/files/xml_file.py

@@ -5,7 +5,6 @@
 from ..item import *
 from .file import *
 
-REMIND_WHEN_ESCAPE = True
 REG_QUOTE_TEXT = re.compile(r'^"(?P<content>.*?)\s*"$')
 REG_REF_STRING_TEXT = re.compile(r'@string/\w+')
 
@@ -14,6 +13,7 @@ class XmlFile(File):
     @staticmethod
     def read(file):
         if not os.path.exists(file):
+            p('warn', '%(file)s no exists.' % {'file': file})
             return dom.parseString('<resources>\n</resources>')
         root = dom.parse(file)
         resources_node = root.getElementsByTagName('resources')[0]
@@ -69,7 +69,7 @@ def cover(self, items):
             if text_node:
                 item = items[key]
                 if item:
-                    old_text = text_node.data
+                    old_text = NodeUtil.get_text_in_text_node(text_node)
                     new_text = item[self.lang]
                     # 双引号括住的字符串, 需要特殊处理
                     match = REG_QUOTE_TEXT.fullmatch(old_text)
@@ -81,22 +81,8 @@ def cover(self, items):
                     elif old_text == new_text:  # 文本相同, 不保存
                         pass
                     else:
-                        # `'`和`\`需要转义
-                        if "'" in old_text or '\\' in old_text \
-                                or "'" in new_text or '\\' in new_text:
-                            # 先替换`\`=>`\\`, 再替换`'`=>`\'`
-                            new_text = new_text.replace('\\', '\\\\').replace("'", "\\'")
-                            if new_text != old_text:
-                                if REMIND_WHEN_ESCAPE:
-                                    p('remind', '%s:\n%s\n%s' % (key, old_text, new_text))
-                                    if input('是否修改该字符串:(y)') not in 'yY':  # ''/'y'/'Y'表示'是'
-                                        continue  # 不保存
-                                else:
-                                    p('warn', key, old_text, '=>', new_text)
-                            else:
-                                continue  # 文本相同, 跳过保存
                         # 保存
-                        text_node.data = new_text
+                        NodeUtil.set_text_in_text_node(text_node, new_text)
 
     def to_items(self, items):
         string_nodes = self._dom.getElementsByTagName('string')
@@ -110,7 +96,7 @@ def to_items(self, items):
                                 untranslatable=node.getAttribute('translatable') == 'false',
                                 auto_translate=not (node.getAttribute('translateAuto') == 'false'))
                     items[key] = item
-                item[self.lang] = text_node.data
+                item[self.lang] = NodeUtil.get_text_in_text_node(text_node)
 
     def to_file(self, file):
         str_io = io.StringIO()
@@ -121,7 +107,7 @@ def to_file(self, file):
         content = str_io.getvalue().replace('&quot;', '"').replace('&gt;', '>')
         if not os.path.exists(file):  # 保证目录存在, 方便之后创建文件
             os.makedirs(os.path.dirname(file), exist_ok=True)
-        with open(file, mode='w', encoding='utf-8', newline='\n') as w:
+        with open(file, mode='w', encoding='utf-8', newline=None) as w:
             w.write(content)
 
 
@@ -139,6 +125,15 @@ def get_text_node_in_string(node, log=False):
                 })
             return None
 
+    @staticmethod
+    def get_text_in_text_node(node) -> str:
+        return convert_string_to_text(node.data)
+
+    @staticmethod
+    def set_text_in_text_node(node, text):
+        # xml中双引号不需要转义
+        node.data = convert_text_to_string(text, replace_double_quote=False)
+
     @staticmethod
     def to_text(node: dom.Node) -> str:
         if node.nodeType == node.TEXT_NODE: