sui_feng/AzurLaneAutoScript
1
0
Fork 0
mirror of https://gitee.com/sui-feng-cb/AzurLaneAutoScript1 synced 2026-03-12 19:07:01 +08:00
Code Activity

Fix: fetch remain optput when subprocess exit

Browse Source 
and release mutex especially when errors occur
+ split commandline but no escaping under Windows
+ use platform specified TexoIoWrapper encoding
+ handling multiple prompt in single line due to async output
This commit is contained in:
hgjazhgj
2023-05-09 07:10:15 +08:00
parent 98fb140322
commit 193e6f279f
2 changed files with 22 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
submodule/AlasFpyBridge/module/FGOpy.py
View File

@@ -14,12 +14,14 @@ class FGOpy(HeadlessCliApplication):
self.last_error = ""
self.tracebacking = False
self.log_pattern = re.compile(
r"((?:FGO-py@.*?\(.*?\)> )?)\[(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d,\d\d\d)\]\[(DEBUG|INFO|WARNING|CRITICAL|ERROR)\]<([a-zA-Z0-9_.]+?)> (.*)"
r"((?:FGO-py@.*?\(.*?\)> )*)\[(\d\d\d\d-\d\d-\d\d \d\d:\d\d:\d\d,\d\d\d)\]\[(DEBUG|INFO|WARNING|CRITICAL|ERROR)\]<([a-zA-Z0-9_.]+?)> (.*)"
)
def callback(self, line):
if line == "exited":
self.last_error = "exited"
if self.mutex.locked():
self.mutex.release()
return
if line.startswith("Traceback"):
self.success = False
@@ -37,9 +39,9 @@ class FGOpy(HeadlessCliApplication):
if match is None:
logger.info(f"... {line}")
return
head, datetime, level, module, content = match.groups()
prompt, datetime, level, module, content = match.groups()
getattr(logger, level.lower())(content)
if level == "CRITICAL":
self.last_error = content
return