v10.4.1

Author: hgjazhgj

Dockerfile

@@ -1,11 +1,13 @@
 # docker build -t hgjazhgj/fgo-py:latest .
-# docker run -v $PWD/FGO-py:/FGO-py -p 5000:5000 --name fgo-py -it hgjazhgj/fgo-py
+# docker run -v $PWD/FGO-py:/FGO-py -p 5000:5000 --name fgo-py -it --rm hgjazhgj/fgo-py
 
 FROM python:3.9-slim
 WORKDIR /FGO-py
 #&& python3.9 -m pip config set global.index-url https://mirrors.aliyun.com/pypi/simple/ \
 #&& python3.9 -m pip config set install.trusted-host mirrors.aliyun.com \
-RUN pip install airtest flask \
+RUN ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime \
+ && echo 'Asia/Shanghai' > /etc/timezone \
+ && pip install airtest flask tqdm \
  && pip uninstall -y opencv-contrib-python \
  && pip install opencv-contrib-python-headless \
  && rm -r ~/.cache/pip

FGO-py/fgoCli.py

@@ -1,7 +1,7 @@
 import argparse,cmd,json,os,platform,re,signal,time
 import fgoDevice
 import fgoKernel
-from functools import wraps
+from functools import reduce,wraps
 from fgoLogging import getLogger,color
 from fgoTeamupParser import IniParser
 logger=getLogger('Cli')
@@ -137,7 +137,7 @@ def do_continue(self,line):
         arg=parser_battle.parse_args(line.split())
         assert fgoDevice.device.available
         assert not fgoKernel.lock.locked()
-        countdown(arg.sleep)
+        countdown(reduce(lambda x,y:x*60+int(y),arg.sleep.split(':'),0))
         try:
             signal.signal(signal.SIGINT,lambda*_:fgoKernel.schedule.stop())
             if platform.system()=='Windows':signal.signal(signal.SIGBREAK,lambda*_:fgoKernel.schedule.pause())
@@ -226,12 +226,12 @@ class ArgParser(argparse.ArgumentParser):
     def exit(self,status=0,message=None):raise ArgError(message)
 
 parser_battle=ArgParser(prog='battle',description=Cmd.do_battle.__doc__)
-parser_battle.add_argument('-s','--sleep',help='Sleep before run (default: %(default)s)',type=validator(float,lambda x:x>=0,'nonnegative'),default=0)
+parser_battle.add_argument('-s','--sleep',help='Sleep before run (default: %(default)s)',type=validator(str,lambda x:re.match(r'\d+(:\d+)*$',x),'timedelta'),default='0')
 
 parser_main=ArgParser(prog='main',description=Cmd.do_main.__doc__)
 parser_main.add_argument('appleCount',help='Apple Count (default: %(default)s)',type=validator(int,lambda x:x>=0,'nonnegative int'),default=0,nargs='?')
 parser_main.add_argument('appleKind',help='Apple Kind (default: %(default)s)',type=str.lower,choices=['gold','silver','bronze','quartz'],default='gold',nargs='?')
-parser_main.add_argument('-s','--sleep',help='Sleep several seconds before run (default: %(default)s)',type=validator(float,lambda x:x>=0,'nonnegative'),default=0)
+parser_main.add_argument('-s','--sleep',help='Sleep before run (default: %(default)s)',type=validator(str,lambda x:re.match(r'\d+(:\d+)*$',x),'timedelta'),default='0')
 parser_main.add_argument('-a','--appoint',help='Battle count limit (default: %(default)s for no limit)',type=validator(int,lambda x:x>=0,'nonnegative int'),default=0)
 
 parser_connect=ArgParser(prog='connect',description=Cmd.do_connect.__doc__)
@@ -259,7 +259,7 @@ def exit(self,status=0,message=None):raise ArgError(message)
 
 parser_call=ArgParser(prog='call',description=Cmd.do_call.__doc__)
 parser_call.add_argument('func',help='Additional feature name',choices=['gacha','lottery','mail','synthesis','gachaHistory'])
-parser_call.add_argument('-s','--sleep',help='Sleep several seconds before run (default: %(default)s)',type=validator(float,lambda x:x>=0,'nonnegative'),default=0)
+parser_call.add_argument('-s','--sleep',help='Sleep before run (default: %(default)s)',type=validator(str,lambda x:re.match(r'\d+(:\d+)*$',x),'timedelta'),default='0')
 
 parser_169=ArgParser(prog='169',description=Cmd.do_169.__doc__)
 parser_169.add_argument('action',help='Action',type=str.lower,choices=['invoke','revoke'])

FGO-py/fgoConst.py

@@ -1,4 +1,4 @@
-VERSION='v10.4.0'
+VERSION='v10.4.1'
 CONFIG={
 'runOnce':'',
 'device':'',

FGO-py/fgoLogging.py

@@ -5,7 +5,7 @@
 if platform.system()=='Windows':(lambda k:k.SetConsoleMode(k.GetStdHandle(-11),7))(__import__('ctypes').windll.kernel32) # -11:STD_OUTPUT_HANDLE, 7:ENABLE_VIRTUAL_TERMINAL_PROCESSING
 monoFormatter=logging.Formatter('[%(asctime)s][%(levelname)s]<%(name)s> %(message)s')
 if os.getenv('NO_COLOR'):
-    def color(c=None,f='38'):return''
+    def color(*_,**__):return''
     coloredFormatter=monoFormatter
 else:
     def color(c=None,f='38'):return'\033[0m'if c is None else f'\033[{f};2;{c>>16&0xFF};{c>>8&0xFF};{c&0xFF}m'

readme.md

@@ -266,6 +266,12 @@ Add:onepush
 
 # 版本记录 Version Logs
 
+## 2023/02/16 v10.4.1
+
+Opt:cli下-s sleep允许输入\[\[hh:\]mm:\]ss时间格式  
+就是解析了一个冒分60进制数,因此可以有多段,每段亦可大于60  
+Opt:dockerfile  
+
 ## 2023/01/29 v10.4.0
 
 Add:NO_COLOR