v0.3.0rc1: remove OLD_MORNING_COMPATIBLE setting

Author: KafCoppelia

README.md

@@ -18,7 +18,7 @@ _🌈 おはよう！ 🌈_
     <img src="https://img.shields.io/badge/nonebot2-2.0.0b3+-green">
   </a>
 
-  <a href="https://github.com/MinatoAquaCrews/nonebot_plugin_morning/releases/tag/v0.3.0a6">
+  <a href="https://github.com/MinatoAquaCrews/nonebot_plugin_morning/releases/tag/v0.3.0rc1">
     <img src="https://img.shields.io/github/v/release/MinatoAquaCrews/nonebot_plugin_morning?color=orange&include_prereleases">
   </a>
 
@@ -30,11 +30,11 @@ _🌈 おはよう！ 🌈_
 
 ## 版本
 
-v0.3.0a6
+v0.3.0rc1
 
 ⚠ 适配nonebot2-2.0.0beta.3+
 
-[更新日志](https://github.com/MinatoAquaCrews/nonebot_plugin_morning/releases/tag/v0.3.0a6)
+[更新日志](https://github.com/MinatoAquaCrews/nonebot_plugin_morning/releases/tag/v0.3.0rc1)
 
 ## 安装
 
@@ -44,7 +44,6 @@ v0.3.0a6
 
     ``` python
     MORNING_PATH="path-to-your-resource"    # For example: ./my_data/morning_resource/
-    OLD_MORNING_COMPATIBLE=false            # 是否开启旧版数据文件自动更新，默认开启
     ```
 
 ## 功能
@@ -95,9 +94,9 @@ v0.3.0a6
 
     💥 `v0.3.0`新增更多的群组及个人早晚安信息！
 
-4. **新增** 将自动更新`v0.2.x`的数据文件`data.json`为新版`morning.json`；将自动更新`v0.2.x`的配置文件`config.json`部分键值。启用配置`OLD_MORNING_COMPATIBLE`，在插件初始化时，若不存在新版数据文件且存在旧版数据文件`data.json`，则更新数据字段、保留原始数据，否则创建空的新版数据文件。
+4. **新增** 将自动更新`v0.2.x`的数据文件`data.json`为新版`morning.json`；将自动更新`v0.2.x`的配置文件`config.json`部分键值。在插件初始化时，若不存在新版数据文件且存在旧版数据文件`data.json`，则更新数据字段、保留原始数据，否则创建空的新版数据文件。
 
-   ⚠ 若存在新版数据文件`morning.json`，则忽略配置选项`OLD_MORNING_COMPATIBLE`
+   ⚠ 若存在新版数据文件`morning.json`，则不会重复更新
 
    ⚠ 自动检测配置文件`config.json`的部分键值是否为旧版并自动更新，后续版本将弃用该部分兼容
 

nonebot_plugin_morning/__init__.py

@@ -10,7 +10,7 @@
 require("nonebot_plugin_apscheduler")
 from nonebot_plugin_apscheduler import scheduler
 
-__morning_version__ = "v0.3.0a6"
+__morning_version__ = "v0.3.0rc1"
 __morning_notes__ = f'''
 おはよう！ {__morning_version__}
 [早安] 早安/哦哈哟/おはよう

nonebot_plugin_morning/config.py

@@ -7,7 +7,6 @@
 
 class PluginConfig(BaseModel, extra=Extra.ignore):
     morning_path: Path = Path(__file__).parent / "resource"
-    old_morning_compatible: bool = True
 
 mor_switcher: Dict[str, str] = {
     "时限": "morning_intime",
@@ -102,7 +101,7 @@ async def _() -> None:
     new_data_path: Path = morning_config.morning_path / "morning.json"
 
     if not new_data_path.exists():
-        if morning_config.old_morning_compatible and old_data_path.exists():
+        if old_data_path.exists():
             with open(old_data_path, 'r', encoding='utf-8') as f:
                 _d: Dict[str, Dict[str, Dict[str, int]]] = json.load(f)
                 _nfile = morning_json_update(_d)
@@ -112,7 +111,9 @@ async def _() -> None:
                     json.dump(_nfile, f, ensure_ascii=False, indent=4)
 
                 logger.info("旧版数据文件已自动更新至新版，后续可关闭 OLD_MORNING_COMPATIBLE 选项！")
-                old_data_path.unlink()
+            
+            old_data_path.unlink()
+            
         else:
             with open(new_data_path, 'w', encoding='utf-8') as f:
                 json.dump(dict(), f, ensure_ascii=False, indent=4)

nonebot_plugin_morning/utils.py

@@ -54,6 +54,7 @@ def total_seconds2tuple_time(secs: int) -> Tuple[int, int, int, int]:
 def sleeptime_update(_lold: List[int], _sleep: timedelta) -> List[int]:
     '''
         Add a timedelta to another one
+        - _lold: days, hrs, mins, secs
     '''
     t_old: timedelta = timedelta(days=_lold[0], hours=_lold[1], minutes=_lold[2], seconds=_lold[3])
     t_new: timedelta = t_old + _sleep

poetry.lock

@@ -1,6 +1,6 @@
 [tool.poetry]
 name = "nonebot-plugin-morning"
-version = "0.3.0a6"
+version = "0.3.0rc1"
 description = "Good morning & good night!"
 authors = ["KafCoppelia <k740677208@gmail.com>"]
 license = "MIT"