lazysdk 0.1.118__tar.gz → 0.1.122__tar.gz

{lazysdk-0.1.118 → lazysdk-0.1.122}/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: lazysdk
-Version: 0.1.118
+Version: 0.1.122
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker
@@ -24,6 +24,15 @@ Requires-Dist: netifaces==0.11.0
 Requires-Dist: user_agents==2.2.0
 Requires-Dist: rich>=13.5.2
 Requires-Dist: urllib3==1.26.9
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # lazysdk
 ![](https://img.shields.io/badge/Python-3.8.6-green.svg)

{lazysdk-0.1.118 → lazysdk-0.1.122}/lazysdk/lazyexcel.py

@@ -252,12 +252,18 @@ def save_xlsx(
     :param rank_asc: 排序列是否正序排序，True为按正序排序，False为按倒序排序
     将输出保存后的文件绝对路径
     """
+    # 自动检查添加后缀
+    if file.endswith(".xlsx"):
+        pass
+    else:
+        file += ".xlsx"
+
     if os.path.isabs(file):  # 判断是否为绝对路径
         pass
     else:
         file = os.getcwd() + path_separator + file
     if value is None:
-        return
+        return file
     else:
         wb = openpyxl.Workbook()
         sheet_index = 0  # sheet序号
@@ -363,9 +369,13 @@ def save_xlsx(
                             column=col_num,
                             value=value
                         )
-                        value_cell_number_format = cell_number_format.get(key)
-                        if value_cell_number_format:
-                            cell.number_format = value_cell_number_format  # 设置单元格数据格式
+
+                        # 对单元数据格式化
+                        if cell_number_format:
+                            value_cell_number_format = cell_number_format.get(key)
+                            if value_cell_number_format:
+                                cell.number_format = value_cell_number_format  # 设置单元格数据格式
+
                         col_num += 1
                     row_num += 1
             else:

{lazysdk-0.1.118 → lazysdk-0.1.122}/lazysdk/lazyfile.py

@@ -169,7 +169,11 @@ def download(
     if filename is None:
         download_file_name = str(filename_default) + "." + str(suffix_name)
     else:
-        download_file_name = str(filename) + "." + str(suffix_name)
+        if filename.endswith(suffix_name):
+            # 如果文件名中已存在后缀名，则不重复添加
+            download_file_name = filename
+        else:
+            download_file_name = str(filename) + "." + str(suffix_name)
 
     if path is None:
         path_local = download_file_name

lazysdk-0.1.122/lazysdk/lazyhash.py

@@ -0,0 +1,60 @@
+#!/usr/bin/env python3
+# coding = utf8
+"""
+@ Author : ZeroSeeker
+@ e-mail : zeroseeker@foxmail.com
+@ GitHub : https://github.com/ZeroSeeker
+@ Gitee : https://gitee.com/ZeroSeeker
+"""
+import requests
+import hashlib
+
+
+def md5_file(
+        file_path: str = None,
+        file_url: str = None
+):
+    """
+    计算文件的md5
+    :param file_path: 本地文件路径
+    :param file_url: 网络文件地址
+    """
+    # 文件名不影响md5
+    d5 = hashlib.md5()
+    if file_path:
+        with open(r'%s' % file_path, 'rb') as f:
+            while True:
+                data = f.read(2048)
+                if not data:
+                    break
+                d5.update(data)  # update添加时会进行计算
+        return d5.hexdigest()
+    elif file_url:
+        resp = requests.get(file_url)
+        d5.update(resp.content)  # update添加时会进行计算
+        return d5.hexdigest()
+    else:
+        return
+
+
+def md5_str(
+        content,
+        encoding='UTF-8'
+):
+    d5 = hashlib.md5()
+    d5.update(content.encode(encoding=encoding))  # update添加时会进行计算
+    return d5.hexdigest()
+
+
+def calculate_sha256(
+        content,
+        encoding: str='UTF-8'
+):
+    """
+        计算文档的SHA-256哈希值
+        :param content:
+        :param encoding:
+        :return: SHA-256哈希字符串
+        """
+    # 使用BSON的JSON工具确保一致的序列化
+    return hashlib.sha256(content.encode(encoding)).hexdigest()

lazysdk-0.1.122/lazysdk/lazyjson.py

@@ -0,0 +1,54 @@
+import json
+import decimal
+import datetime
+import base64
+
+
+class LazyEncoder(json.JSONEncoder):
+    def default(self, obj):
+        if isinstance(obj, decimal.Decimal):
+            return float(obj)
+        elif isinstance(obj, datetime.datetime):
+            # # 将datetime对象转换为ISO格式字符串
+            return obj.isoformat()
+        elif isinstance(obj, datetime.date):
+            return obj.isoformat()
+        elif isinstance(obj, bytes):
+            # 将bytes转换为base64编码的字符串
+            try:
+                # 尝试将bytes解码为UTF-8字符串
+                return obj.decode('utf-8')
+            except UnicodeDecodeError:
+                # 如果UTF-8解码失败，回退到Base64编码
+                return base64.b64encode(obj).decode('utf-8')
+        # elif isinstance(obj, bson.timestamp.Timestamp):
+        #     # # 将BSON时间戳转换为其时间表示的ISO格式字符串
+        #     return obj.as_datetime().isoformat()
+        # elif isinstance(obj, bson.objectid.ObjectId):
+        #     # # 将ObjectId转换为字符串
+        #     return str(obj)
+        return super(LazyEncoder, self).default(obj)
+
+
+def json2str(
+        data: json,
+        ensure_ascii: bool = False
+):
+    """
+    在将json数据反序列化为str时，会遇到一些格式无法转换
+    这里使用识别类型转换转为str
+    目前支持类型：
+
+    对于mongodb返回数据的处理：
+        from bson import json_util
+        default=json_util.default
+
+    decimal --> str
+    datetime.datetime --> str(%Y-%m-%d %H:%M:%S)
+    datetime.date --> str(%Y-%m-%d)
+    """
+    return json.dumps(
+        data,
+        cls=LazyEncoder,
+        ensure_ascii=ensure_ascii
+    )

{lazysdk-0.1.118 → lazysdk-0.1.122}/lazysdk/lazytime.py

@@ -1024,3 +1024,83 @@ def network_timestamp():
     res = requests.get(url=url)
     net_t = res.json()['data']['t']  # 精确到毫秒的时间戳
     return int(net_t)
+
+
+def str2datetime(
+        input_str,
+        input_str_format: str = 'YYYYmmdd',
+        output_str_format: str = '%Y-%m-%d %H:%M:%S.%f',
+):
+    """
+    将输入的字符串按照既定格式格式化后输出
+    :param input_str: 输入的字符串
+    :param input_str_format: 输入的字符串格式，例如：YYmmdd
+    :param output_str_format: 输出的字符串格式，例如：%Y-%m-%d %H:%M:%S.%f
+    """
+    year_str = ""
+    month_str = ""
+    day_str = ""
+    hour_str = ""
+    minute_str = ""
+    second_str = ""
+
+    for index in range(len(input_str_format)):
+        index_str = input_str_format[index]
+        if index_str == 'Y':
+            year_str += input_str[index]
+        elif index_str == 'm':
+            month_str += input_str[index]
+        elif index_str == 'd':
+            day_str += input_str[index]
+        elif index_str == 'H':
+            hour_str += input_str[index]
+        elif index_str == 'M':
+            minute_str += input_str[index]
+        elif index_str == 'S':
+            second_str += input_str[index]
+        else:
+            continue
+
+    if year_str:
+        year_int = int(year_str)
+    else:
+        year_int = None
+
+    if month_str:
+        month_int = int(month_str)
+    else:
+        month_int = None
+
+    if day_str:
+        day_int = int(day_str)
+    else:
+        day_int = None
+
+    if hour_str:
+        hour_int = int(hour_str)
+    else:
+        hour_int = 0
+
+    if minute_str:
+        minute_int = int(minute_str)
+    else:
+        minute_int = 0
+
+    if second_str:
+        second_int = int(second_str)
+    else:
+        second_int = 0
+
+    return datetime.datetime(
+        year=year_int,
+        month=month_int,
+        day=day_int,
+        hour=hour_int,
+        minute=minute_int,
+        second=second_int
+    ).strftime(output_str_format)
+
+
+if __name__ == '__main__':
+    res = str2datetime(input_str="20250101123456", input_str_format="YYYYmmdd")
+    print(res)

{lazysdk-0.1.118 → lazysdk-0.1.122}/lazysdk.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
-Metadata-Version: 2.1
+Metadata-Version: 2.4
 Name: lazysdk
-Version: 0.1.118
+Version: 0.1.122
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker
@@ -24,6 +24,15 @@ Requires-Dist: netifaces==0.11.0
 Requires-Dist: user_agents==2.2.0
 Requires-Dist: rich>=13.5.2
 Requires-Dist: urllib3==1.26.9
+Dynamic: author
+Dynamic: author-email
+Dynamic: classifier
+Dynamic: description
+Dynamic: description-content-type
+Dynamic: home-page
+Dynamic: license-file
+Dynamic: requires-dist
+Dynamic: summary
 
 # lazysdk
 ![](https://img.shields.io/badge/Python-3.8.6-green.svg)

{lazysdk-0.1.118 → lazysdk-0.1.122}/lazysdk.egg-info/SOURCES.txt

@@ -15,6 +15,7 @@ lazysdk/lazyenv.py
 lazysdk/lazyexcel.py
 lazysdk/lazyfile.py
 lazysdk/lazyflask.py
+lazysdk/lazyhash.py
 lazysdk/lazyhtml.py
 lazysdk/lazyid.py
 lazysdk/lazyinfo.py

{lazysdk-0.1.118 → lazysdk-0.1.122}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setuptools.setup(
     name="lazysdk",
-    version="0.1.118",
+    version="0.1.122",
     description="基于Python的懒人包",
     long_description=long_description,
     long_description_content_type="text/markdown",

lazysdk-0.1.118/lazysdk/lazyjson.py

@@ -1,33 +0,0 @@
-import json
-import decimal
-import datetime
-
-
-class LazyEncoder(json.JSONEncoder):
-    def default(self, obj):
-        if isinstance(obj, decimal.Decimal):
-            return float(obj)
-        elif isinstance(obj, datetime.datetime):
-            return obj.strftime('%Y-%m-%d %H:%M:%S')
-        elif isinstance(obj, datetime.date):
-            return obj.strftime('%Y-%m-%d')
-        super(LazyEncoder, self).default(obj)
-
-
-def json2str(
-        data: json,
-        ensure_ascii: bool = False
-):
-    """
-    在将json数据反序列化为str时，会遇到一些格式无法转换
-    这里使用识别类型转换转为str
-    目前支持类型：
-    decimal --> str
-    datetime.datetime --> str(%Y-%m-%d %H:%M:%S)
-    datetime.date --> str(%Y-%m-%d)
-    """
-    return json.dumps(
-        data,
-        cls=LazyEncoder,
-        ensure_ascii=ensure_ascii
-    )