libdev 0.84__tar.gz → 0.86__tar.gz

{libdev-0.84 → libdev-0.86}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libdev
-Version: 0.84
+Version: 0.86
 Summary: Set of standard functions for development
 Home-page: https://github.com/chilleco/lib
 Author: Alex Poloz

{libdev-0.84 → libdev-0.86}/libdev/__init__.py

@@ -2,6 +2,6 @@
 Initializing the Python package
 """
 
-__version__ = "0.84"
+__version__ = "0.86"
 
 __all__ = ("__version__",)

{libdev-0.84 → libdev-0.86}/libdev/crypt.py

@@ -78,7 +78,8 @@ def encrypt(number, length=5):
     encoded_str = _int_to_custom_base(number)
     # Calculate checksum and append to the end
     checksum = _get_checksum(encoded_str)
-    encoded_str += checksum
+    if encoded_str != checksum:
+        encoded_str += checksum
     # Add random characters to the beginning to meet the desired length
     while len(encoded_str) < length:
         random_char = random.choice(ALPHABET)
@@ -108,4 +109,4 @@ def decrypt(encoded_str):
         candidate = encoded_str[i:]
         if _get_checksum(candidate) == checksum:
             return _custom_base_to_int(candidate)
-    raise ValueError("Invalid encoded string")
+    return _custom_base_to_int(checksum)

{libdev-0.84 → libdev-0.86}/libdev/time.py

@@ -38,6 +38,19 @@ DAYS_OF_WEEK = (
 )
 
 
+def to_tz(hours):
+    """
+    Create a timezone object with the specified offset in hours.
+
+    Args:
+        hours (int): The timezone offset in hours (e.g., 3 for UTC+3 or -5 for UTC-5).
+
+    Returns:
+        datetime.timezone: A timezone object with the specified offset.
+    """
+    return datetime.timezone(datetime.timedelta(hours=hours))
+
+
 def get_time(data=None, template="%d.%m.%Y %H:%M:%S", tz=0):
     """Get time from timestamp"""
 
@@ -54,6 +67,11 @@ def get_time(data=None, template="%d.%m.%Y %H:%M:%S", tz=0):
     return time.strftime(template, time.gmtime(data + tz * 3600))
 
 
+def get_date(data=None, template="%d.%m.%Y", tz=0):
+    """Get date from timestamp"""
+    return get_time(data, template, tz)
+
+
 def decode_time(data=None, template="%d.%m.%Y %H:%M:%S", tz=0):
     """Get timestamp from time"""
 
@@ -72,6 +90,11 @@ def decode_time(data=None, template="%d.%m.%Y %H:%M:%S", tz=0):
     return int(data.timestamp())
 
 
+def decode_date(data=None, template="%d.%m.%Y", tz=0):
+    """Get timestamp from date"""
+    return decode_time(data, template, tz)
+
+
 # pylint: disable=too-many-branches,too-many-statements
 def parse_time(data: str, tz=0):
     """Parse time"""
@@ -239,3 +262,99 @@ def format_delta(sec, short=False, locale="en"):
                     delta += " seconds"
 
     return delta
+
+
+def get_midnight(timestamp=None, tz=0):
+    """
+    Get the start of the day (midnight) for a given timestamp in a specified timezone.
+
+    Args:
+        timestamp (float): The original timestamp (in seconds since epoch).
+        tz_offset_hours (int): The timezone offset in hours (e.g., 3 for UTC+3).
+
+    Returns:
+        float: The timestamp for the start of the day (midnight) in the specified timezone.
+    """
+    if timestamp is None:
+        timestamp = time.time()
+    dt_local = datetime.datetime.fromtimestamp(timestamp, tz=to_tz(tz))
+    start_day = dt_local.replace(hour=0, minute=0, second=0, microsecond=0)
+    return int(start_day.timestamp())
+
+
+def get_month_start(timestamp=None, tz=0):
+    """
+    Get the start of the month (midnight on the first day of the month) for a given timestamp in a specified timezone.
+
+    Args:
+        timestamp (float): The original timestamp (in seconds since epoch). Defaults to the current time if None.
+        tz (int): The timezone offset in hours (e.g., 3 for UTC+3).
+
+    Returns:
+        float: The timestamp for the start of the month in the specified timezone.
+    """
+    if timestamp is None:
+        timestamp = time.time()
+    dt_local = datetime.datetime.fromtimestamp(timestamp, tz=to_tz(tz))
+    start_month = dt_local.replace(day=1, hour=0, minute=0, second=0, microsecond=0)
+    return int(start_month.timestamp())
+
+
+def get_next_day(timestamp=None, tz=0):
+    """
+    Get the start of the next day (midnight) for a given timestamp in a specified timezone.
+
+    Args:
+        timestamp (float): The original timestamp (in seconds since epoch). Defaults to the current time if None.
+        tz (int): The timezone offset in hours (e.g., 3 for UTC+3).
+
+    Returns:
+        float: The timestamp for the start of the next day (midnight) in the specified timezone.
+    """
+    if timestamp is None:
+        timestamp = time.time()
+    dt_local = datetime.datetime.fromtimestamp(timestamp, tz=to_tz(tz))
+    next_day = (dt_local + datetime.timedelta(days=1)).replace(
+        hour=0, minute=0, second=0, microsecond=0
+    )
+    return int(next_day.timestamp())
+
+
+def get_next_month(timestamp=None, tz=0):
+    """
+    Get the start of the next month (midnight on the first day of the next month) for a given timestamp in a specified timezone.
+
+    Args:
+        timestamp (float): The original timestamp (in seconds since epoch). Defaults to the current time if None.
+        tz (int): The timezone offset in hours (e.g., 3 for UTC+3).
+
+    Returns:
+        float: The timestamp for the start of the next month in the specified timezone.
+    """
+
+    if timestamp is None:
+        timestamp = time.time()
+
+    dt_local = datetime.datetime.fromtimestamp(timestamp, tz=to_tz(tz))
+
+    if dt_local.month == 12:
+        next_month = dt_local.replace(
+            year=dt_local.year + 1,
+            month=1,
+            day=1,
+            hour=0,
+            minute=0,
+            second=0,
+            microsecond=0,
+        )
+    else:
+        next_month = dt_local.replace(
+            month=dt_local.month + 1,
+            day=1,
+            hour=0,
+            minute=0,
+            second=0,
+            microsecond=0,
+        )
+
+    return int(next_month.timestamp())

{libdev-0.84 → libdev-0.86}/libdev.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: libdev
-Version: 0.84
+Version: 0.86
 Summary: Set of standard functions for development
 Home-page: https://github.com/chilleco/lib
 Author: Alex Poloz

{libdev-0.84 → libdev-0.86}/tests/test_crypt.py

@@ -3,9 +3,9 @@ from libdev.crypt import encrypt, decrypt
 
 def test_cfg_json():
     assert encrypt(None) == None
-    assert encrypt(0)[-2:] == "00"
-    assert encrypt(0, length=0) == "00"
-    assert encrypt(0, length=10)[-2:] == "00"
+    assert encrypt(0)[-1:] == "0"
+    assert encrypt(0, length=0) == "0"
+    assert encrypt(0, length=10)[-1:] == "0"
     assert decrypt(encrypt(0, length=15)) == 0
     assert decrypt(encrypt(123, length=15)) == 123
     for i in range(0, 1000):

{libdev-0.84 → libdev-0.86}/tests/test_time.py

@@ -4,7 +4,18 @@ https://www.epochconverter.com/
 
 import datetime
 
-from libdev.time import get_time, decode_time, parse_time, format_delta
+from libdev.time import (
+    get_time,
+    get_date,
+    decode_time,
+    decode_date,
+    parse_time,
+    format_delta,
+    get_midnight,
+    get_month_start,
+    get_next_day,
+    get_next_month,
+)
 
 
 def test_get_time():
@@ -22,6 +33,10 @@ def test_get_time():
     )
 
 
+def test_get_date():
+    assert get_date(1641061152.4) == "01.01.2022"
+
+
 def test_decode_time():
     assert decode_time("") == None
     assert decode_time("01.01.2022 21:19:12", tz=3) == 1641061152
@@ -29,6 +44,10 @@ def test_decode_time():
     assert decode_time("2024-10-07", "%Y-%m-%d", 4) == 1728244800
 
 
+def test_decode_date():
+    assert decode_date("01.01.2022", tz=3) == 1640984400
+
+
 def test_parse_time():
     assert parse_time("07.10.1998", tz=3) == 907707600
     assert parse_time("7.10.1998 7:00:00") == 907743600
@@ -88,3 +107,24 @@ def test_format_delta_short():
     assert format_delta(181, short=True, locale="ru") == "3мин"
     assert format_delta(18000, short=True, locale="ru") == "5ч"
     assert format_delta(1814400, short=True, locale="ru") == "21д"
+
+
+def test_get_midnight():
+    assert get_midnight(1721597607.049283) == 1721520000
+    assert get_midnight(1721597607, tz=3) == 1721595600
+    assert get_midnight(1704056399, tz=3) == 1703970000
+
+
+def test_get_month_start():
+    assert get_month_start(1704060061.049283) == 1701388800
+    assert get_month_start(1704060061, tz=3) == 1704056400
+
+
+def test_get_next_day():
+    assert get_next_day(1704060061) == 1704067200
+    assert get_next_day(1704060061, tz=3) == 1704142800
+
+
+def test_get_next_month():
+    assert get_next_month(1703980800) == 1704067200
+    assert get_next_month(1703970000, tz=3) == 1704056400