Просмотр исходного кода

fix(config): Sometimes str cannot be converted to timedelta type

runhey 3 лет назад
Родитель
Сommit
13417ff743

+ 5 - 1
module/config/config.py

@@ -6,7 +6,7 @@ import datetime
 import operator
 import threading
 
-from datetime import datetime
+from datetime import datetime, timedelta
 from cached_property import cached_property
 
 from module.base.filter import Filter
@@ -25,6 +25,8 @@ from module.logger import logger
 
 
 
+
+
 class Function:
     def __init__(self, key: str, data: dict):
         """
@@ -276,6 +278,8 @@ class Config(ConfigState, ConfigManual, ConfigWatcher, ConfigMenu):
                 if success
                 else scheduler.failure_interval
             )
+            if isinstance(interval, str):
+                interval = timedelta(interval)
             run.append(start_time + interval)
         # if server is not None:
         #     if server:

+ 3 - 1
tasks/Component/config_scheduler.py

@@ -45,7 +45,9 @@ class Scheduler(ConfigBase):
 
 
 if __name__ == "__main__":
-    s = Scheduler(success_interval='1 2:3:4')
+    s = Scheduler(success_interval='00 00:00:10')
+    if isinstance(s.success_interval, TimeDelta):
+        print(s.success_interval.seconds)
     print(s.json())
     print(s.dict())
 

+ 4 - 0
tasks/Restart/login.py

@@ -168,6 +168,10 @@ class LoginHandler(BaseTask, RestartAssets):
             if self.appear_then_click(self.I_HARVEST_AP, interval=1):
                 timer_harvest.reset()
                 continue
+            # 御魂觉醒加成
+            if self.appear_then_click(self.I_HARVEST_SOUL, interval=1):
+                timer_harvest.reset()
+                continue
 
 
             # 红色的关闭

+ 1 - 1
tasks/Restart/script_task.py

@@ -53,7 +53,7 @@ if __name__ == '__main__':
     config = Config('oas1')
     device = Device(config)
     task = ScriptTask(config, device)
-    task.harvest()
+    task.app_start()