python's default argument parser is excessively safe..

metasmile · Nov 27, 2015 · dfe8e28 · dfe8e28
1 parent a993c7b
commit dfe8e28
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/strsync/strsync.py b/strsync/strsync.py
@@ -43,6 +43,7 @@ def main():
     __BASE_LANG__ = args['base_lang_name']
     __EXCLUDING_LANGS__ = args['excluding_lang_names'] or []
     __KEYS_FORCE_TRANSLATE__ = args['force_translate_keys']
+    __KEYS_FORCE_TRANSLATE_ALL__ = ('--force-translate-keys' in sys.argv or '-f' in sys.argv) and not __KEYS_FORCE_TRANSLATE__
     __KEYS_FOLLOW_BASE__ = args['following_base_keys'] or []
     __BASE_RESOUCE_DIR__ = None
 
@@ -169,7 +170,8 @@ def insert_or_translate(target_file, lc):
         for item in base_content:
             base_kv[item['key']] = item['value']
 
-        adding_keys = list(((set(base_kv.keys()) - set(target_kv.keys())) | (set(base_kv.keys()) & set(__KEYS_FORCE_TRANSLATE__ or base_kv.keys()))) - set(__KEYS_FOLLOW_BASE__))
+        force_adding_keys = base_kv.keys() if __KEYS_FORCE_TRANSLATE_ALL__ else __KEYS_FORCE_TRANSLATE__
+        adding_keys = list(((set(base_kv.keys()) - set(target_kv.keys())) | (set(base_kv.keys()) & set(force_adding_keys))) - set(__KEYS_FOLLOW_BASE__))
         removing_keys = list(set(target_kv.keys()) - set(base_kv.keys()))
         existing_keys = list(set(base_kv.keys()) - (set(adding_keys) | set(removing_keys)))
         updated_keys = []