Merge branch 'master' of https://github.com/LmeSzinc/AzurLaneAutoScript

module/config/config_updater.py

@@ -6,10 +6,11 @@ from cached_property import cached_property
 
 from deploy.utils import DEPLOY_TEMPLATE, poor_yaml_read, poor_yaml_write
 from module.base.timer import timer
+from module.config.deep import deep_default, deep_get, deep_iter, deep_pop, deep_set
 from module.config.env import IS_ON_PHONE_CLOUD
-from module.config.redirect_utils.utils import *
 from module.config.server import VALID_CHANNEL_PACKAGE, VALID_PACKAGE, VALID_SERVER_LIST, to_package, to_server
 from module.config.utils import *
+from module.config.redirect_utils.utils import *
 
 CONFIG_IMPORT = '''
 import datetime
@@ -642,8 +643,7 @@ class ConfigUpdater:
         """
         new = {}
 
-        def deep_load(keys):
-            data = deep_get(self.args, keys=keys, default={})
+        for keys, data in deep_iter(self.args, depth=3):
             value = deep_get(old, keys=keys, default=data['value'])
             typ = data['type']
             display = data.get('display')
@@ -653,9 +653,6 @@ class ConfigUpdater:
             value = parse_value(value, data=data)
             deep_set(new, keys=keys, value=value)
 
-        for path, _ in deep_iter(self.args, depth=3):
-            deep_load(path)
-
         # AzurStatsID
         if is_template:
             deep_set(new, 'Alas.DropRecord.AzurStatsID', None)