merge alas

module/config/config_updater.py

@@ -4,11 +4,7 @@ from copy import deepcopy
 
 from cached_property import cached_property
 
-<<<<<<< HEAD
 from deploy.Windows.utils import DEPLOY_TEMPLATE, poor_yaml_read, poor_yaml_write
-=======
-from deploy.utils import DEPLOY_TEMPLATE, poor_yaml_read, poor_yaml_write
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 from module.base.timer import timer
 from module.config.env import IS_ON_PHONE_CLOUD
 from module.config.redirect_utils.utils import *
@@ -34,11 +30,7 @@ ARCHIVES_PREFIX = {
     'tw': '檔案 '
 }
 MAINS = ['Main', 'Main2', 'Main3']
-<<<<<<< HEAD
 EVENTS = ['Event', 'Event2', 'Event3', 'EventA', 'EventB', 'EventC', 'EventD', 'EventSp']
-=======
-EVENTS = ['Event', 'Event2', 'EventA', 'EventB', 'EventC', 'EventD', 'EventSp']
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
 GEMS_FARMINGS = ['GemsFarming']
 RAIDS = ['Raid', 'RaidDaily']
 WAR_ARCHIVES = ['WarArchives']
@@ -156,7 +148,6 @@ class ConfigGenerator:
         return read_file(filepath_argument('gui'))
 
     @cached_property
-<<<<<<< HEAD
     def dashboard(self):
         """
         <dashboard>
@@ -166,8 +157,6 @@ class ConfigGenerator:
 
 
     @cached_property
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     @timer
     def args(self):
         """
@@ -181,19 +170,12 @@ class ConfigGenerator:
         """
         # Construct args
         data = {}
-<<<<<<< HEAD
         # Add dashboard to args
         dashboard_and_task = {**self.task, **self.dashboard}
         for path, groups in deep_iter(dashboard_and_task, depth=3):
             if 'tasks' not in path and 'Dashboard' not in path:
                 continue
             task = path[2] if 'tasks' in path else path[0]
-=======
-        for path, groups in deep_iter(self.task, depth=3):
-            if 'tasks' not in path:
-                continue
-            task = path[2]
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
             # Add storage to all task
             groups.append('Storage')
             for group in groups:
@@ -516,7 +498,6 @@ class ConfigGenerator:
         update('template-linux', linux)
         update('template-linux-cn', linux, cn)
 
-<<<<<<< HEAD
         tpl = {
             'Repository': '{{repository}}',
             'GitExecutable': '{{gitExecutable}}',
@@ -533,8 +514,6 @@ class ConfigGenerator:
 
         update('./webapp/packages/main/public/deploy.yaml.tpl', tpl)
 
-=======
->>>>>>> 24aa3e00bd9af9a6a050df54c6a0cef959a9c6c0
     def insert_package(self):
         option = deep_get(self.argument, keys='Emulator.PackageName.option')
         option += list(VALID_PACKAGE.keys())