fix: update assets file

remove its scheduler,
and some minor improvements

assets/gui/css/alas.css

@@ -377,6 +377,7 @@ pre.rich-traceback-code {
 #pywebio-scope-scheduler-bar,
 #pywebio-scope-log-bar,
 #pywebio-scope-log,
+#pywebio-scope-daemon-log-bar,
 #pywebio-scope-daemon-overview #pywebio-scope-groups {
     font-weight: 500;
     margin: 0.3125rem;

assets/gui/css/dark-alas.css

@@ -133,12 +133,13 @@ pre.rich-traceback-code {
     color: #c9d1d9;
 }
 
-#pywebio-scope-scheduler-bar,
-#pywebio-scope-log-bar,
-#pywebio-scope-log,
 #pywebio-scope-running,
 #pywebio-scope-pending,
 #pywebio-scope-waiting,
+#pywebio-scope-scheduler-bar,
+#pywebio-scope-log-bar,
+#pywebio-scope-log,
+#pywebio-scope-daemon-log-bar,
 #pywebio-scope-daemon-overview #pywebio-scope-groups {
     background-color: #2f3136;
     border: 1px solid #21262d;

assets/gui/css/light-alas.css

@@ -133,12 +133,13 @@ pre.rich-traceback-code {
     border: 1px solid lightgrey;
 }
 
-#pywebio-scope-scheduler-bar,
-#pywebio-scope-log-bar,
-#pywebio-scope-log,
 #pywebio-scope-running,
 #pywebio-scope-pending,
 #pywebio-scope-waiting,
+#pywebio-scope-scheduler-bar,
+#pywebio-scope-log-bar,
+#pywebio-scope-log,
+#pywebio-scope-daemon-log-bar,
 #pywebio-scope-daemon-overview #pywebio-scope-groups {
     background-color: white;
     border: 1px solid lightgrey;

config/template.json

@@ -250,11 +250,8 @@
     }
   },
   "Momotalk": {
-    "Scheduler": {
+    "Momotalk": {
-      "Enable": false,
+      "Enable": true
-      "NextRun": "2020-01-01 00:00:00",
-      "Command": "Momotalk",
-      "ServerUpdate": "04:00"
     }
   }
 }

module/config/argument/args.json

@@ -770,7 +770,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -792,7 +793,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -814,7 +816,8 @@
           6,
           7,
           8,
-          9
+          9,
+          10
         ]
       },
       "Count": {
@@ -1059,28 +1062,10 @@
     }
   },
   "Momotalk": {
-    "Scheduler": {
+    "Momotalk": {
       "Enable": {
         "type": "checkbox",
-        "value": false,
+        "value": true,
-        "option": [
-          true,
-          false
-        ]
-      },
-      "NextRun": {
-        "type": "datetime",
-        "value": "2020-01-01 00:00:00",
-        "validate": "datetime"
-      },
-      "Command": {
-        "type": "input",
-        "value": "Momotalk",
-        "display": "hide"
-      },
-      "ServerUpdate": {
-        "type": "input",
-        "value": "04:00",
         "display": "hide"
       }
     }

module/config/argument/argument.yaml

@@ -156,17 +156,17 @@ Bounty:
 Highway:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 DesertRailroad:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 Schoolhouse:
   Stage:
     value: 0
-    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9 ]
+    option: [ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10 ]
   Count: 2
 
 Scrimmage:
@@ -267,3 +267,10 @@ ItemStorage:
     stored: StoredTacticalChallengeTicket
     order: 6
     color: "#7ac8e5"
+
+# ==================== Momotalk ====================
+
+Momotalk:
+  Enable:
+    value: true
+    display: hide

module/config/argument/menu.json

@@ -33,7 +33,13 @@
     "tasks": [
       "Circle",
       "Task",
-      "Mail",
+      "Mail"
+    ]
+  },
+  "Tool": {
+    "menu": "collapse",
+    "page": "tool",
+    "tasks": [
       "Momotalk"
     ]
   }

module/config/argument/task.yaml

@@ -80,5 +80,12 @@ Reward:
       - Scheduler
     Mail:
       - Scheduler
+
+# ==================== Tool ====================
+
+Tool:
+  menu: 'collapse'
+  page: 'tool'
+  tasks:
     Momotalk:
-      - Scheduler
+      - Momotalk

module/config/config_generated.py

@@ -87,15 +87,15 @@ class GeneratedConfig:
     Bounty_OnError = 'skip'  # stop, skip
 
     # Group `Highway`
-    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Highway_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Highway_Count = 2
 
     # Group `DesertRailroad`
-    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    DesertRailroad_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     DesertRailroad_Count = 2
 
     # Group `Schoolhouse`
-    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9
+    Schoolhouse_Stage = 0  # 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10
     Schoolhouse_Count = 2
 
     # Group `Scrimmage`
@@ -166,3 +166,6 @@ class GeneratedConfig:
     ItemStorage_BountyTicket = {}
     ItemStorage_ScrimmageTicket = {}
     ItemStorage_TacticalChallengeTicket = {}
+
+    # Group `Momotalk`
+    Momotalk_Enable = True

module/config/i18n/en-US.json

@@ -15,6 +15,10 @@
     "Reward": {
       "name": "Reward",
       "help": ""
+    },
+    "Tool": {
+      "name": "Tools",
+      "help": ""
     }
   },
   "Task": {
@@ -251,7 +255,7 @@
     },
     "SecondCafe": {
       "name": "Second Floor",
-      "help": "JP server only\nEnable auto switch to second floor and perform interaction"
+      "help": "Enable auto switch to second floor and perform interaction"
     }
   },
   "Invitation": {
@@ -502,7 +506,8 @@
       "6": "06 - Overpass F",
       "7": "07 - Overpass G",
       "8": "08 - Overpass H",
-      "9": "09 - Overpass I"
+      "9": "09 - Overpass I",
+      "10": "10 - Overpass J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -526,7 +531,8 @@
       "6": "06 - Abandoned Train F",
       "7": "07 - Abandoned Train G",
       "8": "08 - Abandoned Train H",
-      "9": "09 - Abandoned Train I"
+      "9": "09 - Abandoned Train I",
+      "10": "10 - Abandoned Train J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -550,7 +556,8 @@
       "6": "06 - Besieged Classroom F",
       "7": "07 - Besieged Classroom G",
       "8": "08 - Besieged Classroom H",
-      "9": "09 - Besieged Classroom I"
+      "9": "09 - Besieged Classroom I",
+      "10": "10 - Besieged Classroom J"
     },
     "Count": {
       "name": "Sweep X times",
@@ -846,6 +853,16 @@
       "help": ""
     }
   },
+  "Momotalk": {
+    "_info": {
+      "name": "Momotalk",
+      "help": "Tools need to stop the scheduler and then run independently"
+    },
+    "Enable": {
+      "name": "",
+      "help": ""
+    }
+  },
   "Gui": {
     "Aside": {
       "Install": "Install",

module/config/i18n/zh-CN.json

@@ -15,6 +15,10 @@
     "Reward": {
       "name": "收菜",
       "help": ""
+    },
+    "Tool": {
+      "name": "工具",
+      "help": ""
     }
   },
   "Task": {
@@ -251,7 +255,7 @@
     },
     "SecondCafe": {
       "name": "第二咖啡厅",
-      "help": "仅支持日服\n自动切换第二咖啡厅进行互动点击"
+      "help": "自动切换第二咖啡厅进行互动点击"
     }
   },
   "Invitation": {
@@ -502,7 +506,8 @@
       "6": "06 - 高架公路 F",
       "7": "07 - 高架公路 G",
       "8": "08 - 高架公路 H",
-      "9": "09 - 高架公路 I"
+      "9": "09 - 高架公路 I",
+      "10": "10 - 高架公路 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -526,7 +531,8 @@
       "6": "06 - 被遗弃的列车 F",
       "7": "07 - 被遗弃的列车 G",
       "8": "08 - 被遗弃的列车 H",
-      "9": "09 - 被遗弃的列车 I"
+      "9": "09 - 被遗弃的列车 I",
+      "10": "10 - 被遗弃的列车 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -550,7 +556,8 @@
       "6": "06 - 被袭击的教室 F",
       "7": "07 - 被袭击的教室 G",
       "8": "08 - 被袭击的教室 H",
-      "9": "09 - 被袭击的教室 I"
+      "9": "09 - 被袭击的教室 I",
+      "10": "10 - 被袭击的教室 J"
     },
     "Count": {
       "name": "扫荡次数",
@@ -846,6 +853,16 @@
       "help": ""
     }
   },
+  "Momotalk": {
+    "_info": {
+      "name": "Momotalk",
+      "help": "工具需要停止调度器再单独运行"
+    },
+    "Enable": {
+      "name": "",
+      "help": ""
+    }
+  },
   "Gui": {
     "Aside": {
       "Install": "安装",

module/ocr/ocr.py

@@ -349,6 +349,11 @@ class DigitCounter(Ocr):
     def __init__(self, button: ButtonWrapper, lang='en', name=None):
         super().__init__(button, lang=lang, name=name)
 
+    def after_process(self, result):
+        result = super().after_process(result)
+        result = result.replace('%', '/')
+        return result
+
     def format_result(self, result) -> tuple[int, int, int]:
         """
         Do OCR on a counter, such as `14/15`, and returns 14, 1, 15
@@ -356,7 +361,7 @@ class DigitCounter(Ocr):
         Returns:
             int:
         """
-        result = super().after_process(result)
+        result = self.after_process(result)
         logger.attr(name=self.name, text=str(result))
 
         res = re.search(r'(\d+)/(\d+)', result)

module/webui/app.py

@@ -611,7 +611,7 @@ class AlasGUI(Frame):
                 [
                     put_scope("scheduler-bar"),
                     put_scope("groups"),
-                    put_scope("log-bar"),
+                    put_scope("daemon-log-bar"),
                     put_scope("log", [put_html("")]),
                 ],
             )
@@ -625,7 +625,7 @@ class AlasGUI(Frame):
                         [
                             put_scope(
                                 "_daemon_upper",
-                                [put_scope("scheduler-bar"), put_scope("log-bar")],
+                                [put_scope("scheduler-bar"), put_scope("daemon-log-bar")],
                             ),
                             put_scope("groups"),
                             put_scope("log", [put_html("")]),
@@ -654,16 +654,17 @@ class AlasGUI(Frame):
             scope="scheduler_btn",
         )
 
-        with use_scope("log-bar"):
+        with use_scope("daemon-log-bar"):
-            put_text(t("Gui.Overview.Log")).style(
+            with use_scope("log-title"):
-                "font-size: 1.25rem; margin: auto .5rem auto;"
+                put_text(t("Gui.Overview.Log")).style(
-            )
+                    "font-size: 1.25rem; margin: auto .5rem auto;"
-            put_scope(
+                )
-                "log-bar-btns",
+                put_scope(
-                [
+                    "log-bar-btns",
-                    put_scope("log_scroll_btn"),
+                    [
-                ],
+                        put_scope("log_scroll_btn"),
-            )
+                    ],
+                )
 
         switch_log_scroll = BinarySwitchButton(
             label_on=t("Gui.Button.ScrollON"),