diff --git a/module/config/argument/args.json b/module/config/argument/args.json index 226bd9e33..54575278b 100644 --- a/module/config/argument/args.json +++ b/module/config/argument/args.json @@ -361,9 +361,14 @@ "Restart": { "Scheduler": { "Enable": { - "type": "checkbox", + "type": "state", "value": true, - "display": "disabled" + "option": [ + true + ], + "option_bold": [ + true + ] }, "NextRun": { "type": "datetime", @@ -404,7 +409,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -777,7 +786,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -1150,7 +1163,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -1523,7 +1540,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -1656,6 +1677,10 @@ "event_20231026_cn" ], "display": "hide", + "option_bold": [ + "event_20201229_cn", + "event_20231026_cn" + ], "cn": "event_20231026_cn", "en": "event_20231026_cn", "jp": "event_20231026_cn", @@ -1880,7 +1905,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -1914,7 +1943,7 @@ "value": "12-4" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "event_20200227_cn", @@ -1978,7 +2007,10 @@ "event_20230914_cn", "event_20231026_cn" ], - "display": "disabled", + "option_bold": [ + "event_20201229_cn", + "event_20231026_cn" + ], "cn": "event_20231026_cn", "en": "event_20231026_cn", "jp": "event_20231026_cn", @@ -2318,7 +2350,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -2352,7 +2388,7 @@ "value": "12-4" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "event_20200227_cn", @@ -2416,7 +2452,10 @@ "event_20230914_cn", "event_20231026_cn" ], - "display": "disabled", + "option_bold": [ + "event_20201229_cn", + "event_20231026_cn" + ], "cn": "event_20231026_cn", "en": "event_20231026_cn", "jp": "event_20231026_cn", @@ -2756,7 +2795,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -2807,7 +2850,7 @@ "display": "hide" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "raid_20200624", @@ -2818,7 +2861,10 @@ "raid_20230118", "raid_20230629" ], - "display": "disabled", + "option_bold": [ + "raid_20230629", + "raid_20221027" + ], "cn": "raid_20230629", "en": "raid_20230629", "jp": "raid_20230629", @@ -2990,7 +3036,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -3024,12 +3074,14 @@ "value": "12-4" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "coalition_20230323" ], - "display": "disabled", + "option_bold": [ + "coalition_20230323" + ], "cn": "coalition_20230323", "en": "coalition_20230323", "jp": "coalition_20230323", @@ -3211,7 +3263,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -3258,7 +3314,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -3319,6 +3379,10 @@ "war_archives_20220210_cn", "war_archives_20220414_cn" ], + "option_bold": [ + "war_archives_20201229_cn", + "war_archives_20220414_cn" + ], "cn": "war_archives_20201229_cn", "en": "war_archives_20201229_cn", "jp": "war_archives_20201229_cn", @@ -3658,7 +3722,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -3703,7 +3771,7 @@ "display": "hide" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "event_20200227_cn", @@ -3767,7 +3835,10 @@ "event_20230914_cn", "event_20231026_cn" ], - "display": "disabled", + "option_bold": [ + "event_20201229_cn", + "event_20231026_cn" + ], "cn": "event_20231026_cn", "en": "event_20231026_cn", "jp": "event_20231026_cn", @@ -4113,7 +4184,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -4158,7 +4233,7 @@ "display": "hide" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "event_20200227_cn", @@ -4222,7 +4297,10 @@ "event_20230914_cn", "event_20231026_cn" ], - "display": "disabled", + "option_bold": [ + "event_20201229_cn", + "event_20231026_cn" + ], "cn": "event_20231026_cn", "en": "event_20231026_cn", "jp": "event_20231026_cn", @@ -4568,7 +4646,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -4613,7 +4695,7 @@ "display": "hide" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "event_20200227_cn", @@ -4677,7 +4759,10 @@ "event_20230914_cn", "event_20231026_cn" ], - "display": "disabled", + "option_bold": [ + "event_20201229_cn", + "event_20231026_cn" + ], "cn": "event_20231026_cn", "en": "event_20231026_cn", "jp": "event_20231026_cn", @@ -5023,7 +5108,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -5068,7 +5157,7 @@ "display": "hide" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "event_20200227_cn", @@ -5132,7 +5221,10 @@ "event_20230914_cn", "event_20231026_cn" ], - "display": "disabled", + "option_bold": [ + "event_20201229_cn", + "event_20231026_cn" + ], "cn": "event_20231026_cn", "en": "event_20231026_cn", "jp": "event_20231026_cn", @@ -5478,7 +5570,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -5513,7 +5609,7 @@ "display": "hide" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "event_20200227_cn", @@ -5577,7 +5673,10 @@ "event_20230914_cn", "event_20231026_cn" ], - "display": "disabled", + "option_bold": [ + "event_20201229_cn", + "event_20231026_cn" + ], "cn": "event_20231026_cn", "en": "event_20231026_cn", "jp": "event_20231026_cn", @@ -5924,7 +6023,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -5965,7 +6068,7 @@ "display": "hide" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "raid_20200624", @@ -5976,7 +6079,10 @@ "raid_20230118", "raid_20230629" ], - "display": "disabled", + "option_bold": [ + "raid_20230629", + "raid_20221027" + ], "cn": "raid_20230629", "en": "raid_20230629", "jp": "raid_20230629", @@ -6149,7 +6255,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -6184,12 +6294,14 @@ "display": "hide" }, "Event": { - "type": "select", + "type": "state", "value": "campaign_main", "option": [ "coalition_20230323" ], - "display": "disabled", + "option_bold": [ + "coalition_20230323" + ], "cn": "coalition_20230323", "en": "coalition_20230323", "jp": "coalition_20230323", @@ -6372,7 +6484,12 @@ "Enable": { "type": "lock", "value": true, - "display": "disabled" + "option": [ + true + ], + "option_bold": [ + true + ] }, "NextRun": { "type": "datetime", @@ -6435,7 +6552,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": true + "value": true, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -6526,7 +6647,12 @@ "Enable": { "type": "lock", "value": true, - "display": "disabled" + "option": [ + true + ], + "option_bold": [ + true + ] }, "NextRun": { "type": "datetime", @@ -6630,7 +6756,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": true + "value": true, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -6685,7 +6815,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": true + "value": true, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -6762,7 +6896,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": true + "value": true, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -6844,7 +6982,12 @@ "Enable": { "type": "lock", "value": true, - "display": "disabled" + "option": [ + true + ], + "option_bold": [ + true + ] }, "NextRun": { "type": "datetime", @@ -6907,7 +7050,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7094,7 +7241,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7149,7 +7300,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7237,7 +7392,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7300,7 +7459,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7559,7 +7722,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7664,7 +7831,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7742,7 +7913,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": true + "value": true, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7832,7 +8007,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7917,7 +8096,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -7984,7 +8167,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8031,7 +8218,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8102,7 +8293,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8149,7 +8344,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8196,7 +8395,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8263,7 +8466,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8326,7 +8533,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8379,7 +8590,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8436,7 +8651,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8489,7 +8708,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8554,7 +8777,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8632,7 +8859,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", @@ -8701,7 +8932,11 @@ "Scheduler": { "Enable": { "type": "checkbox", - "value": false + "value": false, + "option": [ + true, + false + ] }, "NextRun": { "type": "datetime", diff --git a/module/config/argument/argument.yaml b/module/config/argument/argument.yaml index 90fb09770..17d827514 100644 --- a/module/config/argument/argument.yaml +++ b/module/config/argument/argument.yaml @@ -5,7 +5,10 @@ # ==================== Alas ==================== Scheduler: - Enable: false + Enable: + type: checkbox + value: false + option: [ true, false ] NextRun: 2020-01-01 00:00:00 Command: Alas SuccessInterval: diff --git a/module/config/argument/override.yaml b/module/config/argument/override.yaml index 064440d13..665cdc4d0 100644 --- a/module/config/argument/override.yaml +++ b/module/config/argument/override.yaml @@ -7,8 +7,10 @@ Restart: Scheduler: Enable: + type: state value: true - display: disabled + option: [ true, ] + option_bold: [ true, ] SuccessInterval: 0 FailureInterval: 0 ServerUpdate: 00:00 @@ -51,13 +53,13 @@ Event: Campaign: Mode: normal Event: - display: disabled + type: state AmbushEvade: true Event2: Campaign: Mode: normal Event: - display: disabled + type: state AmbushEvade: true EventA: Scheduler: @@ -67,7 +69,7 @@ EventA: Campaign: Name: dynamic Event: - display: disabled + type: state Mode: normal Use2xBook: false AmbushEvade: true @@ -85,7 +87,7 @@ EventB: Campaign: Name: dynamic Event: - display: disabled + type: state Mode: normal Use2xBook: false AmbushEvade: true @@ -103,7 +105,7 @@ EventC: Campaign: Name: dynamic Event: - display: disabled + type: state Mode: normal Use2xBook: false AmbushEvade: true @@ -121,7 +123,7 @@ EventD: Campaign: Name: dynamic Event: - display: disabled + type: state Mode: normal Use2xBook: false AmbushEvade: true @@ -139,7 +141,7 @@ EventSp: Campaign: Name: sp Event: - display: disabled + type: state Mode: normal Use2xBook: false AmbushEvade: true @@ -155,7 +157,7 @@ Raid: Campaign: Name: dynamic Event: - display: disabled + type: state Mode: normal UseClearMode: true UseFleetLock: true @@ -181,7 +183,7 @@ RaidDaily: Campaign: Name: dynamic Event: - display: disabled + type: state Mode: normal UseClearMode: true UseFleetLock: true @@ -212,7 +214,7 @@ Coalition: ServerUpdate: 00:00 Campaign: Event: - display: disabled + type: state Mode: normal UseClearMode: true UseFleetLock: true @@ -238,7 +240,7 @@ CoalitionSp: Campaign: Name: sp Event: - display: disabled + type: state Mode: normal UseClearMode: true UseFleetLock: true @@ -262,8 +264,10 @@ CoalitionSp: Commission: Scheduler: Enable: - value: true type: lock + value: true + option: [ true, ] + option_bold: [ true, ] SuccessInterval: 30-60 FailureInterval: 30-60 ServerUpdate: 00:00 @@ -275,8 +279,10 @@ Tactical: Research: Scheduler: Enable: - value: true type: lock + value: true + option: [ true, ] + option_bold: [ true, ] SuccessInterval: 30-60 FailureInterval: 30-60 ServerUpdate: 00:00 @@ -298,8 +304,10 @@ Guild: Reward: Scheduler: Enable: - value: true type: lock + value: true + option: [ true, ] + option_bold: [ true, ] SuccessInterval: 120-240 FailureInterval: 120-240 ServerUpdate: 00:00 diff --git a/module/config/config_generated.py b/module/config/config_generated.py index a8dec3a26..8e800493a 100644 --- a/module/config/config_generated.py +++ b/module/config/config_generated.py @@ -10,7 +10,7 @@ class GeneratedConfig: """ # Group `Scheduler` - Scheduler_Enable = False + Scheduler_Enable = False # True, False Scheduler_NextRun = datetime.datetime(2020, 1, 1, 0, 0) Scheduler_Command = 'Alas' Scheduler_SuccessInterval = 0 diff --git a/module/config/config_updater.py b/module/config/config_updater.py index 1e760c38a..7e05966c0 100644 --- a/module/config/config_updater.py +++ b/module/config/config_updater.py @@ -66,6 +66,9 @@ class Event: def __lt__(self, other): return str(self) < str(other) + def __hash__(self): + return hash(str(self)) + class ConfigGenerator: @cached_property @@ -202,8 +205,11 @@ class ConfigGenerator: if not check_override(p, v): continue if isinstance(v, dict): - if deep_get(v, keys='type') in ['lock']: - deep_default(v, keys='display', value="disabled") + typ = v.get('type') + if typ == 'state': + pass + elif typ == 'lock': + pass elif deep_get(v, keys='value') is not None: deep_default(v, keys='display', value='hide') for arg_k, arg_v in v.items(): @@ -428,6 +434,8 @@ class ConfigGenerator: latest = {} for server in ARCHIVES_PREFIX.keys(): latest[server] = deep_pop(self.args, keys=f'{task}.Campaign.Event.{server}', default='') + bold = list(set(latest.values())) + deep_set(self.args, keys=f'{task}.Campaign.Event.option_bold', value=bold) for server, event in latest.items(): deep_set(self.args, keys=f'{task}.Campaign.Event.{server}', value=event) @@ -584,7 +592,10 @@ class ConfigUpdater: def deep_load(keys): data = deep_get(self.args, keys=keys, default={}) value = deep_get(old, keys=keys, default=data['value']) - if is_template or value is None or value == '' or data['type'] == 'lock' or data.get('display') == 'hide': + typ = data['type'] + display = data.get('display') + if is_template or value is None or value == '' \ + or typ in ['lock', 'state'] or (display == 'hide' and typ != 'stored'): value = data['value'] value = parse_value(value, data=data) deep_set(new, keys=keys, value=value) diff --git a/module/config/i18n/en-US.json b/module/config/i18n/en-US.json index f11524c6b..629e52b7f 100644 --- a/module/config/i18n/en-US.json +++ b/module/config/i18n/en-US.json @@ -270,7 +270,9 @@ }, "Enable": { "name": "Enable Task", - "help": "Join this task to scheduler.\nTask commission, research, reward are force to enable." + "help": "Join this task to scheduler.\nTask commission, research, reward are force to enable.", + "True": "Enabled", + "False": "False" }, "NextRun": { "name": "Next Run", diff --git a/module/config/i18n/ja-JP.json b/module/config/i18n/ja-JP.json index 106a732a6..15534728f 100644 --- a/module/config/i18n/ja-JP.json +++ b/module/config/i18n/ja-JP.json @@ -270,7 +270,9 @@ }, "Enable": { "name": "Scheduler.Enable.name", - "help": "Scheduler.Enable.help" + "help": "Scheduler.Enable.help", + "True": "True", + "False": "False" }, "NextRun": { "name": "Scheduler.NextRun.name", diff --git a/module/config/i18n/zh-CN.json b/module/config/i18n/zh-CN.json index 696d395b1..d23f7c7e1 100644 --- a/module/config/i18n/zh-CN.json +++ b/module/config/i18n/zh-CN.json @@ -270,7 +270,9 @@ }, "Enable": { "name": "启用该功能", - "help": "将这个任务加入调度器\n委托、科研、收获任务是强制打开的" + "help": "将这个任务加入调度器\n委托、科研、收获任务是强制打开的", + "True": "已启用", + "False": "False" }, "NextRun": { "name": "下一次运行时间", diff --git a/module/config/i18n/zh-TW.json b/module/config/i18n/zh-TW.json index cda583a11..dd6adf198 100644 --- a/module/config/i18n/zh-TW.json +++ b/module/config/i18n/zh-TW.json @@ -270,7 +270,9 @@ }, "Enable": { "name": "啟用該功能", - "help": "將這個任務加入調度器\n委託、科研、收穫任務是強制打開的" + "help": "將這個任務加入調度器\n委託、科研、收穫任務是強制打開的", + "True": "已啟用", + "False": "False" }, "NextRun": { "name": "下一次執行時間",