[fpy] Fix: PEP540 & SpecialDrop & interval regex (#4645)

submodule/AlasFpyBridge/module/FGOpy.py

@@ -63,9 +63,7 @@ class FGOpy(HeadlessCliApplication):
             return
         prompt, datetime, level, module, content = match.groups()
         getattr(logger, level.lower())(content)
-        item = self.counter.get(content)
-        if item:
-            setattr(self.config, item, getattr(self.config, item) - 1)
+        self.counter.get(content, lambda: None)()
 
         if self.first_log:
             self.first_log = False

submodule/AlasFpyBridge/module/config/argument/args.json

@@ -83,7 +83,7 @@
       "Interval": {
         "type": "input",
         "value": "00:05",
-        "validate": "\\d+:\\d"
+        "validate": "\\d+:\\d+"
       }
     },
     "Storage": {
@@ -176,7 +176,7 @@
       "Interval": {
         "type": "input",
         "value": "07:00",
-        "validate": "\\d+:\\d"
+        "validate": "\\d+:\\d+"
       }
     },
     "Storage": {

submodule/AlasFpyBridge/module/config/argument/argument.yaml

@@ -44,7 +44,7 @@ FpyEmulator:
 FpyInterval:
   Interval:
     value: 07:00
-    validate: "\\d+:\\d"
+    validate: "\\d+:\\d+"
 
 FpyTeam:
   Index:

submodule/AlasFpyBridge/module/config/i18n/en-US.json

@@ -20,7 +20,7 @@
   "Task": {
     "Fpy": {
       "name": "FGO-py",
-      "help": "Requries FGO-py v11.2.0 or higher"
+      "help": "Requries FGO-py v20.1.2 or higher"
     },
     "FpyHeartbeat": {
       "name": "Heartbeat",

submodule/AlasFpyBridge/module/config/i18n/ja-JP.json

@@ -20,7 +20,7 @@
   "Task": {
     "Fpy": {
       "name": "FGO-py設定",
-      "help": "FGO-py v11.2.0以降が必要です"
+      "help": "FGO-py v20.1.2以降が必要です"
     },
     "FpyHeartbeat": {
       "name": "心拍",

submodule/AlasFpyBridge/module/config/i18n/zh-CN.json

@@ -20,7 +20,7 @@
   "Task": {
     "Fpy": {
       "name": "FGO-py设置",
-      "help": "需要FGO-py v11.2.0或更高"
+      "help": "需要FGO-py v20.1.2或更高"
     },
     "FpyHeartbeat": {
       "name": "心跳",

submodule/AlasFpyBridge/module/utils/headlessCliApplication.py

@@ -9,7 +9,7 @@ class HeadlessCliApplication:
     """Wrap a cli application to provide programmable interactive access"""
 
     def __init__(self, launch):
-        self.pipe = Popen([launch], stdin=PIPE, stdout=PIPE, stderr=STDOUT, text=True)
+        self.pipe = Popen([launch], stdin=PIPE, stdout=PIPE, stderr=STDOUT, encoding="utf-8", text=True)
 
         def f():
             while True: