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

feat(flutter): Switch from 'time' 'datetime' to 'Time' 'DateTime' Class

huangrunheng 3 лет назад
Родитель
Сommit
5da101c6e7

+ 1 - 1
tasks/ActivityShikigami/config.py

@@ -10,7 +10,7 @@ from tasks.Component.config_base import ConfigBase, TimeDelta
 from tasks.Component.BaseActivity.config_activity import GeneralClimb
 
 class ShikigamiConfig(BaseModel):
-    limit_time: timedelta = Field(default=timedelta(hours=0, minutes=30, seconds=0), description='limit_time_help')
+    limit_time: TimeDelta = Field(default=TimeDelta(hours=0, minutes=30, seconds=0), description='limit_time_help')
     limit_count: int = Field(default=10, description='limit_count_help')
 
 

+ 2 - 2
tasks/BondlingFairyland/config.py

@@ -7,7 +7,7 @@ from datetime import datetime, time
 
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_base import ConfigBase, DateTime, TimeDelta, Time
 from tasks.BondlingFairyland.config_battle import BattleConfig
 
 class BondlingMode(str, Enum):
@@ -31,7 +31,7 @@ class BondlingClass(str, Enum):
 
 class BondlingConfig(ConfigBase):
     bondling_mode: BondlingMode = Field(default=BondlingMode.MODE1, description='bondling_mode_help')
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     limit_count: int = Field(default=30, description='limit_count_help')
     bondling_stone_enable: bool = Field(default=False, description='bondling_stone_enable_help')
     bondling_stone_class: BondlingClass = Field(default=BondlingClass.TOMB_GUARD, description='bondling_stone_class_help')

+ 2 - 2
tasks/Component/BaseActivity/config_activity.py

@@ -7,7 +7,7 @@ from enum import Enum
 
 from module.logger import logger
 
-from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.config_base import ConfigBase, TimeDelta, Time
 
 class ApMode(str, Enum):
     AP_ACTIVITY = 'ap_activity'
@@ -16,7 +16,7 @@ class ApMode(str, Enum):
 
 class GeneralClimb(ConfigBase):
     # 限制执行的时间
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     # 限制执行的次数
     limit_count: int = Field(default=50, description='limit_count_help')
     # 每日使用体力挑战的最大次数,默认是300

+ 1 - 1
tasks/Component/GeneralInvite/config_invite.py

@@ -21,7 +21,7 @@ class InviteConfig(BaseModel):
     friend_1: str = Field(default='', description='friend_name_help')
     friend_2: str = Field(default='', description='friend_2_name_help')
     find_mode: FindMode = Field(default=FindMode.AUTO_FIND, description='find_mode_help')
-    wait_time: time = Field(default=time(minute=2), description='wait_time_help')
+    wait_time: Time = Field(default=Time(minute=2), description='wait_time_help')
     default_invite: bool = Field(default=True, description='default_invite_help')
 
     # @validator('wait_time', pre=False, always=False)

+ 36 - 27
tasks/Component/config_base.py

@@ -3,7 +3,7 @@
 # github https://github.com/runhey
 from typing import Any
 from collections.abc import Callable, Generator
-from datetime import timedelta, time
+from datetime import timedelta, time, datetime
 
 from pydantic import BaseModel, datetime_parse
 from pydantic.fields import ModelField
@@ -16,6 +16,23 @@ def format_timedelta(tdelta: timedelta):
     minutes, seconds = divmod(rem, 60)
     return f"{days:02d} {hours:02d}:{minutes:02d}:{seconds:02d}"
 
+
+class MultiLine(str):
+    # @classmethod
+    # def __get_validators__(cls) -> Generator[Callable, None, None]:
+    #     yield cls.validate
+    #
+    # @classmethod
+    # def validate(cls, value: str, field: ModelField):
+    #     return cls(value)
+
+    @classmethod
+    def __modify_schema__(
+        cls, field_schema: dict[str, Any], field: ModelField | None
+    ):
+        if field:
+            field_schema['type'] = 'multi_line'
+
 class TimeDelta(timedelta):
     def __str__(self):
         return format_timedelta(self)
@@ -30,30 +47,14 @@ class TimeDelta(timedelta):
         if field:
             field_schema['type'] = 'time_delta'
 
-class ConfigBase(BaseModel):
-    # 这个是导出json时候的配置,但是新的是导出dict,所以的无效
-    class Config:
-        json_encoders = {
-            TimeDelta: format_timedelta
-        }
-
-
-
-class MultiLine(str):
-    # @classmethod
-    # def __get_validators__(cls) -> Generator[Callable, None, None]:
-    #     yield cls.validate
-    #
-    # @classmethod
-    # def validate(cls, value: str, field: ModelField):
-    #     return cls(value)
-
+class DateTime(datetime):
     @classmethod
     def __modify_schema__(
-        cls, field_schema: dict[str, Any], field: ModelField | None
+            cls, field_schema: dict[str, Any], field: ModelField | None
     ):
         if field:
-            field_schema['type'] = 'multi_line'
+            field_schema['type'] = 'date_time'
+
 
 class Time(time):
     """
@@ -74,9 +75,17 @@ class Time(time):
         else:
             raise ValueError("Invalid time format")
 
-    # @classmethod
-    # def __modify_schema__(
-    #         cls, field_schema: dict[str, Any], field: ModelField | None
-    # ):
-    #     if field:
-    #         field_schema['type'] = 'time'
+    @classmethod
+    def __modify_schema__(
+            cls, field_schema: dict[str, Any], field: ModelField | None
+    ):
+        if field:
+            field_schema['type'] = 'time'
+
+# ---------------------------------------------------------------------------------------------------------------------
+class ConfigBase(BaseModel):
+    # 这个是导出json时候的配置,但是新的是导出dict,所以的无效
+    class Config:
+        json_encoders = {
+            TimeDelta: format_timedelta
+        }

+ 3 - 3
tasks/Component/config_scheduler.py

@@ -6,16 +6,16 @@ from enum import Enum
 from datetime import datetime, timedelta, time
 from pydantic import BaseModel, ValidationError, validator, Field
 
-from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.config_base import ConfigBase, TimeDelta, DateTime, Time
 
 class Scheduler(ConfigBase):
     enable: bool = Field(default=False, description='enable_help')
-    next_run: datetime = Field(default="2023-01-01 00:00:00", description='next_run_help')
+    next_run: DateTime = Field(default="2023-01-01 00:00:00", description='next_run_help')
     priority: int = Field(default=5, description='priority_help')
 
     success_interval: TimeDelta = Field(default=TimeDelta(days=1), description='success_interval_help')
     failure_interval: TimeDelta = Field(default=TimeDelta(days=1), description='failure_interval_help')
-    server_update: time = Field(default=time(hour=9, minute=0, second=0), description='server_update_help')
+    server_update: Time = Field(default=Time(hour=9, minute=0, second=0), description='server_update_help')
 
     @validator('next_run', pre=True, always=True)
     def parse_next_run(cls, value):

+ 2 - 2
tasks/Duel/config.py

@@ -5,14 +5,14 @@ from pydantic import BaseModel, Field
 from datetime import time
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.GeneralBattle.config_general_battle import GreenMarkType
 
 class DuelConfig(ConfigBase):
     # 一键切换斗技御魂
     switch_all_soul: bool = Field(default=False, description='switch_all_soul_help')
     # 限制时间
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     # 目标分数
     target_score: int = Field(default=2000, description='target_score_help')
     # 刷满荣誉就退出

+ 2 - 2
tasks/EternitySea/config.py

@@ -6,7 +6,7 @@ from enum import Enum
 from datetime import datetime, time
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_base import ConfigBase, Time
 from tasks.Orochi.config import UserStatus
 
 
@@ -22,7 +22,7 @@ class EternitySeaConfig(ConfigBase):
     # 层数
     layer: Layer = Field(default=Layer.FOUR, description='layer_help')
     # 限制时间
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     # 限制次数
     limit_count: int = Field(default=50, description='limit_count_help')
 

+ 2 - 2
tasks/EvoZone/config.py

@@ -6,7 +6,7 @@ from enum import Enum
 from datetime import datetime, time
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.GeneralInvite.config_invite import InviteConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
@@ -44,7 +44,7 @@ class EvoZoneConfig(ConfigBase):
     # 层数
     layer: Layer = Field(default=Layer.TEN, description='layer_help')
     # 限制时间
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     # 限制次数
     limit_count: int = Field(default=30, description='limit_count_help')
     # 是否开启觉醒加成

+ 2 - 2
tasks/FallenSun/config.py

@@ -7,7 +7,7 @@ from datetime import datetime, time
 
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.GeneralInvite.config_invite import InviteConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
@@ -29,7 +29,7 @@ class FallenSunConfig(ConfigBase):
     # 层数
     layer: Layer = Field(default=Layer.THREE, description='layer_help')
     # 限制时间
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     # 限制次数
     limit_count: int = Field(default=50, description='limit_count_help')
 

+ 2 - 2
tasks/GoryouRealm/config.py

@@ -6,7 +6,7 @@ from enum import Enum
 from datetime import datetime, time
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
@@ -19,7 +19,7 @@ class GoryouClass(str, Enum):
 
 class GoryouConfig(ConfigBase):
     # 限制时间
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     # 限制次数
     limit_count: int = Field(default=30, description='limit_count_help')
     # 类型

+ 2 - 2
tasks/MysteryShop/config.py

@@ -5,10 +5,10 @@ from datetime import timedelta, datetime, time
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_base import ConfigBase, Time
 
 class ShopConfig(BaseModel):
-    time_of_mystery: time = Field(default=time(hour=0, minute=0, second=0), description='time_of_mystery_help')
+    time_of_mystery: Time = Field(default=Time(hour=0, minute=0, second=0), description='time_of_mystery_help')
     mystery_amulet: bool = Field(default=False)
     black_daruma_scrap: bool = Field(default=False)
     shop_kaiko_3: bool = Field(default=False)

+ 2 - 2
tasks/Orochi/config.py

@@ -7,7 +7,7 @@ from datetime import datetime, time
 
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.GeneralInvite.config_invite import InviteConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
@@ -38,7 +38,7 @@ class OrochiConfig(ConfigBase):
     # 层数
     layer: Layer = Field(default=Layer.ELEVEN, description='layer_help')
     # 限制时间
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     # 限制次数
     limit_count: int = Field(default=30, description='limit_count_help')
     # 是否开启御魂加成

+ 2 - 2
tasks/Sougenbi/config.py

@@ -6,7 +6,7 @@ from enum import Enum
 from datetime import datetime, time
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase
+from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 
@@ -19,7 +19,7 @@ class SougenbiClass(str, Enum):
 class SougenbiConfig(ConfigBase):
     sougenbi_class: SougenbiClass = Field(default=SougenbiClass.Foolery)
     # 限制时间
-    limit_time: time = Field(default=time(minute=30), description='limit_time_help')
+    limit_time: Time = Field(default=Time(minute=30), description='limit_time_help')
     # 限制次数
     limit_count: int = Field(default=30, description='limit_count_help')
 

+ 2 - 2
tasks/WantedQuests/config.py

@@ -5,13 +5,13 @@ from datetime import timedelta, time
 from pydantic import BaseModel, Field
 
 from tasks.Component.config_scheduler import Scheduler
-from tasks.Component.config_base import ConfigBase, TimeDelta
+from tasks.Component.config_base import ConfigBase, Time
 from tasks.Component.GeneralBattle.config_general_battle import GeneralBattleConfig
 from tasks.Component.SwitchSoul.switch_soul_config import SwitchSoulConfig
 
 
 class WantedQuestsConfig(BaseModel):
-    before_end: time = Field(default=time(0, 0, 0), description='before_end_help')
+    before_end: Time = Field(default=Time(0, 0, 0), description='before_end_help')
 
 
 class WantedQuests(ConfigBase):