lazysdk 0.1.120__py3-none-any.whl → 0.1.121__py3-none-any.whl

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/lazyjson.py

@@ -1,6 +1,7 @@
 import json
 import decimal
 import datetime
+import base64
 
 
 class LazyEncoder(json.JSONEncoder):
@@ -8,10 +9,25 @@ class LazyEncoder(json.JSONEncoder):
         if isinstance(obj, decimal.Decimal):
             return float(obj)
         elif isinstance(obj, datetime.datetime):
-            return obj.strftime('%Y-%m-%d %H:%M:%S')
+            # # 将datetime对象转换为ISO格式字符串
+            return obj.isoformat()
         elif isinstance(obj, datetime.date):
-            return obj.strftime('%Y-%m-%d')
-        super(LazyEncoder, self).default(obj)
+            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(
@@ -22,6 +38,11 @@ def json2str(
     在将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)

lazysdk/lazytime.py

@@ -1028,7 +1028,7 @@ def network_timestamp():
 
 def str2datetime(
         input_str,
-        input_str_format: str = 'YYmmdd',
+        input_str_format: str = 'YYYYmmdd',
         output_str_format: str = '%Y-%m-%d %H:%M:%S.%f',
 ):
     """

{lazysdk-0.1.120.dist-info → lazysdk-0.1.121.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: lazysdk
-Version: 0.1.120
+Version: 0.1.121
 Summary: 基于Python的懒人包
 Home-page: https://gitee.com/ZeroSeeker/lazysdk
 Author: ZeroSeeker

{lazysdk-0.1.120.dist-info → lazysdk-0.1.121.dist-info}/RECORD

@@ -12,11 +12,12 @@ lazysdk/lazyenv.py,sha256=P6HjO9cbBPzHD_Vs-Ww_GThDq-h9Wn31VSiu9OzTNWI,3024
 lazysdk/lazyexcel.py,sha256=MOBDmDkhkMOzVQqwtyWhnlrZG1pOEOmU1usOe_L3MuU,17197
 lazysdk/lazyfile.py,sha256=5p7yPWRLTqvToDUzQAEZ8uGfz-x-zSsM5ZHeT97ZpWo,20268
 lazysdk/lazyflask.py,sha256=VUhJqtNz_evVyGOS40FKkkQWWrqGEUZ26cv1RQxS388,727
+lazysdk/lazyhash.py,sha256=cow6_NGhnBTgf3cUU2WIEiKr-KMhCisLJFK65bXv43M,1453
 lazysdk/lazyhtml.py,sha256=dWexQvyApvm1xDzGT_nzke2hSyJWSmHfq74z5FWmunU,2537
 lazysdk/lazyid.py,sha256=8yuf3ADHCiujIsGJ6YzU1LHFMX7679nmdRrGSlZPQ5o,1388
 lazysdk/lazyinfo.py,sha256=c9BsyxMygpcpQ7mpurz3JShyhVhu75XZai9Ezk4dFHc,3673
 lazysdk/lazyip.py,sha256=8GkSlBys-IEqHGM7Oe5NsHIzYjUWn5Ltmf1EOM5TRaI,1440
-lazysdk/lazyjson.py,sha256=5clxmOJDlkKbuovgB1jIPGCJwhLqM-SHHtrxmbCJe_4,867
+lazysdk/lazyjson.py,sha256=wZdMCwShRfZonvrKORZi6xOTfUhRPCGoDfysNsS1Acg,1733
 lazysdk/lazylist.py,sha256=OcfdzKIRvb7dV2xNpNHrGGrLJ5u1e6yA2UhQyXi6Wao,1339
 lazysdk/lazym3u8.py,sha256=NrwEBpivhAxpW6KhKl7YowFBKGMpPxiKrcafgw7n8wY,31937
 lazysdk/lazymd5.py,sha256=JSKIcUmH2zwPDDJAd9XajTYd59eKidoKAkLLNU8OHM4,1112
@@ -28,15 +29,15 @@ lazysdk/lazyre.py,sha256=UQNpf9P1GyxRoRfuulyY4D1nnF227R4bzUGT3LevE7w,956
 lazysdk/lazyredis.py,sha256=78jM_tXNgUKULcp08CQEHmfAlzwlWuOsl6SuLwoLDdM,37918
 lazysdk/lazyrequests.py,sha256=kNtHmg-M39selgsOtdGb-6KHfAz80BE3IwdcTdrJth4,4065
 lazysdk/lazytext.py,sha256=1UgwxLt3c6i0JwUGRC7srSc_mhM3ICv1WrhOqkuIrLk,2672
-lazysdk/lazytime.py,sha256=yKMgvJrbuMWOSQubYaEDAOvHZ8mNQqcYAw30Mz4yAGA,29432
+lazysdk/lazytime.py,sha256=r8oWbvhsKk4cK37Kykb6RcZ4fb9Uk3AONR8IQPUSosk,29434
 lazysdk/lazyua.py,sha256=IqLmqGDECdJa3Wcr8h6sTxMErJZlCTM3Jk7IWm90UzI,4827
 lazysdk/lazyurl.py,sha256=N89QLK2A6vXr9gqp-9vnk9RXv_fOjw171lVl9eEoxtE,1550
 lazysdk/lazywebhook.py,sha256=NTfcVY2p3U2qSbZ7sspSj2hloBr-22zmGSEirJG2jW0,10708
 lazysdk/lazywifi.py,sha256=FOvLPTcb6BQE6D8kjfB0TLpfgGxw8jqC3vZbTs6LbD4,716
 lazysdk/lazyxml.py,sha256=PLAcDWjpu2GMJPsV9dHOv716CVmflQee7Aan-hqGxL8,770
 lazysdk/showdata.py,sha256=957JMXq7qfJ4ELpA3nBJwkyEUn6mRwtVXVBGYfZaCgg,1683
-lazysdk-0.1.120.dist-info/LICENSE,sha256=OC5E4ENUG6B4dGEVGwUpdsD-D9SZsCVC92NAgaqvE-c,1088
-lazysdk-0.1.120.dist-info/METADATA,sha256=yS1q-qZX7Bskfg2ZLSkSp1R4PIwB1jHUgfiILaqBRi8,1901
-lazysdk-0.1.120.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
-lazysdk-0.1.120.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
-lazysdk-0.1.120.dist-info/RECORD,,
+lazysdk-0.1.121.dist-info/LICENSE,sha256=OC5E4ENUG6B4dGEVGwUpdsD-D9SZsCVC92NAgaqvE-c,1088
+lazysdk-0.1.121.dist-info/METADATA,sha256=-scyfazhhPvlLuPP7IzLdsK1kFNQ8k1v1zFLRcNhlLs,1901
+lazysdk-0.1.121.dist-info/WHEEL,sha256=iAkIy5fosb7FzIOwONchHf19Qu7_1wCWyFNR5gu9nU0,91
+lazysdk-0.1.121.dist-info/top_level.txt,sha256=--bGS42ZHUhVeO83y1wfvKFg6OjkTLxQ4V4riqPQljY,8
+lazysdk-0.1.121.dist-info/RECORD,,