ph-utils 0.1.2__tar.gz → 0.2.1__tar.gz

{ph_utils-0.1.2 → ph_utils-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.3
 Name: ph-utils
-Version: 0.1.2
+Version: 0.2.1
 Summary: The python3 tool classes
 Author: Tenny
 Author-email: Tenny <tenny.shu@foxmail.com>

{ph_utils-0.1.2 → ph_utils-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "ph-utils"
-version = "0.1.2"
+version = "0.2.1"
 description = "The python3 tool classes"
 authors = [
     { name = "Tenny", email = "tenny.shu@foxmail.com" },

{ph_utils-0.1.2 → ph_utils-0.2.1}/src/ph_utils/date.py

@@ -246,51 +246,125 @@ def _plus_year(ori_date: datetime, year: int) -> datetime:
     return ori_date.replace(year=new_year)
 
 
-def add(ori_date: OriDateType = None, delta: DeltaDict | None = None) -> datetime:
+def add(
+    ori_date: OriDateType = None,
+    *,
+    days: int | float = 0,
+    months: int = 0,
+    years: int = 0,
+    weeks: int | float = 0,
+    hours: int | float = 0,
+    minutes: int | float = 0,
+    seconds: int | float = 0,
+    microseconds: int | float = 0,
+    milliseconds: int | float = 0,
+) -> datetime:
     """将日期进行加法操作, 通常用于计算几天、几月、几年之后的日期
 
     Args:
         ori_date (datetime | str, optional): 待添加的日期. Defaults to None.
-        delta (dict, optional): { days - 天, months - 月, years - 年, hours - 小时, minutes - 分钟, seconds - 秒 }. Defaults to None.
+        days (int | float, optional): 天数. Defaults to 0.
+        months (int, optional): 月数. Defaults to 0.
+        years (int, optional): 年数. Defaults to 0.
+        weeks (int | float, optional): 周数. Defaults to 0.
+        hours (int | float, optional): 小时数. Defaults to 0.
+        minutes (int | float, optional): 分钟数. Defaults to 0.
+        seconds (int | float, optional): 秒数. Defaults to 0.
+        microseconds (int | float, optional): 微秒数. Defaults to 0.
+        milliseconds (int | float, optional): 毫秒数. Defaults to 0.
 
     Returns:
         datetime: 添加后的日期
     """
-    if not delta:
-        delta = {"days": 0}
     ori_date = parse(ori_date)
-    if "years" in delta:  # 年份
-        ori_date = _plus_year(ori_date, delta["years"])
-        del delta["years"]
-    if "months" in delta:  # 月份
-        ori_date = _plus_month(ori_date, delta["months"])
-        del delta["months"]
-    if delta:
-        diff = timedelta(**delta)
-        ori_date = ori_date + diff
+    if years:
+        ori_date = _plus_year(ori_date, years)
+    if months:
+        ori_date = _plus_month(ori_date, months)
+
+    diff = timedelta(
+        days=days,
+        weeks=weeks,
+        hours=hours,
+        minutes=minutes,
+        seconds=seconds,
+        microseconds=microseconds,
+        milliseconds=milliseconds,
+    )
+    ori_date = ori_date + diff
     return ori_date
 
 
-def subtract(ori_date: OriDateType = None, delta: DeltaDict | None = None):
-    """将日期进行加法操作, 通常用于计算几天、几月、几年之前的日期
+def subtract(
+    ori_date: OriDateType = None,
+    *,
+    days: int | float = 0,
+    months: int = 0,
+    years: int = 0,
+    weeks: int | float = 0,
+    hours: int | float = 0,
+    minutes: int | float = 0,
+    seconds: int | float = 0,
+    microseconds: int | float = 0,
+    milliseconds: int | float = 0,
+):
+    """将日期进行减法操作, 通常用于计算几天、几月、几年之前的日期
 
     Args:
         ori_date (datetime | str, optional): 原始日期. Defaults to None.
-        delta (dict, optional): { days - 天, months - 月, years - 年 }. Defaults to None.
+        days (int | float, optional): 天数. Defaults to 0.
+        months (int, optional): 月数. Defaults to 0.
+        years (int, optional): 年数. Defaults to 0.
+        weeks (int | float, optional): 周数. Defaults to 0.
+        hours (int | float, optional): 小时数. Defaults to 0.
+        minutes (int | float, optional): 分钟数. Defaults to 0.
+        seconds (int | float, optional): 秒数. Defaults to 0.
+        microseconds (int | float, optional): 微秒数. Defaults to 0.
+        milliseconds (int | float, optional): 毫秒数. Defaults to 0.
 
     Returns:
-        datetime: 添加后的日期
+        datetime: 减去之后的日期
     """
-    if not delta:
-        delta = {"days": 0}
-    for key in delta:
-        delta[key] = -delta[key]
-    return add(ori_date, delta)
-
-
-def sub(ori_date: OriDateType = None, delta: DeltaDict | None = None):
+    return add(
+        ori_date,
+        days=-days,
+        months=-months,
+        years=-years,
+        weeks=-weeks,
+        hours=-hours,
+        minutes=-minutes,
+        seconds=-seconds,
+        microseconds=-microseconds,
+        milliseconds=-milliseconds,
+    )
+
+
+def sub(
+    ori_date: OriDateType = None,
+    *,
+    days: int | float = 0,
+    months: int = 0,
+    years: int = 0,
+    weeks: int | float = 0,
+    hours: int | float = 0,
+    minutes: int | float = 0,
+    seconds: int | float = 0,
+    microseconds: int | float = 0,
+    milliseconds: int | float = 0,
+):
     """subtract 函数别名"""
-    return subtract(ori_date, delta)
+    return subtract(
+        ori_date,
+        days=days,
+        months=months,
+        years=years,
+        weeks=weeks,
+        hours=hours,
+        minutes=minutes,
+        seconds=seconds,
+        microseconds=microseconds,
+        milliseconds=milliseconds,
+    )
 
 
 @overload