xtn-tools-pro 1.0.0.0.3__py3-none-any.whl → 1.0.0.0.4__py3-none-any.whl

xtn_tools_pro/tools.py

@@ -37,25 +37,54 @@ def get_md5_16(s, is_upper=False):
     return result[8:24]
 
 
-def get_file_md5_32(file_path):
+def get_binary_content_md5_32(content, is_upper=False):
+    """
+        二进制内容md5 例如图片
+    :param content: 二进制内容
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    md5_hash = hashlib.md5(content)
+    md5_hexdigest = md5_hash.hexdigest()
+    if is_upper:
+        return md5_hexdigest.upper()
+    return md5_hexdigest
+
+
+def get_binary_content_md5_16(content, is_upper=False):
+    """
+        二进制内容md5 例如图片
+    :param content: 二进制内容
+    :param is_upper: 是否转大写 默认False
+    :return:
+    """
+    result = get_binary_content_md5_32(content, is_upper)
+    return result[8:24]
+
+
+def get_file_md5_32(file_path, is_upper=False):
     """
         获取文件md5值
     :param file_path: 文件路径
+    :param is_upper: 是否转大写 默认False
     :return: 
     """
     with open(file_path, 'rb') as file:
         data = file.read()
         md5_hash = hashlib.md5(data).hexdigest()
+    if is_upper:
+        return md5_hash.upper()
     return md5_hash
 
 
-def get_file_md5_16(file_path):
+def get_file_md5_16(file_path, is_upper=False):
     """
         获取文件md5值
     :param file_path: 文件路径
+    :param is_upper: 是否转大写 默认False
     :return: 
     """
-    result = get_file_md5_32(file_path)
+    result = get_file_md5_32(file_path, is_upper)
     return result[8:24]
 
 
@@ -100,9 +129,5 @@ def get_calculate_total_page(total, limit):
     return total_pages
 
 
-
-
-
-
 if __name__ == '__main__':
     pass

{xtn_tools_pro-1.0.0.0.3.dist-info → xtn_tools_pro-1.0.0.0.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: xtn-tools-pro
-Version: 1.0.0.0.3
+Version: 1.0.0.0.4
 Summary: xtn 开发工具
 Author: xtn
 Author-email: czw011122@163.com

{xtn_tools_pro-1.0.0.0.3.dist-info → xtn_tools_pro-1.0.0.0.4.dist-info}/RECORD

@@ -1,5 +1,5 @@
 xtn_tools_pro/__init__.py,sha256=26Tf9j2wj88M1Ldg3b1DJ40KyGgN9ZmQdBLuV453388,395
-xtn_tools_pro/tools.py,sha256=e9KSPqaFBIptBGvexShCcn0nZmUQ5omlVwXgEfWZf5Y,2630
+xtn_tools_pro/tools.py,sha256=-EeI_T7jEccapvZ6Jz25Ta0SIunqqcvDSWP2qn5b4aU,3502
 xtn_tools_pro/tools_flie.py,sha256=B_P3J_R-nRLt_IFutnOVrBRGf6_SZ_cXoIoeaT9B7tk,1512
 xtn_tools_pro/tools_time.py,sha256=DMjsw9h4E_mrPsanPA8CEhpUE1AA6Z2FU4OJqJKZc1k,4867
 xtn_tools_pro/db/MongoDB.py,sha256=_GiX1MHNl9CtI-uLDgY_NmMSvRJei-mtKq3Hhe6ly1E,5567
@@ -7,8 +7,8 @@ xtn_tools_pro/db/RedisDB.py,sha256=ep32Yj8AAkUHRshSBhKsdl06UwO7Z-gQJLaezspVRKw,6
 xtn_tools_pro/db/__init__.py,sha256=Zg91UWS02TO0Ba_0AY56s0oabRy93xLNFkpIIL_6mMM,416
 xtn_tools_pro/proxy/XiaoXiangProxy.py,sha256=xrEBJZ6Cjuh6IBZVB17oXHwByaeKcWVUSSWSg17tujE,9842
 xtn_tools_pro/proxy/__init__.py,sha256=WRwh6s2lruMu5buh0ejo9EK54kWT_VQhCsFGNFAmcyo,418
-xtn_tools_pro-1.0.0.0.3.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-xtn_tools_pro-1.0.0.0.3.dist-info/METADATA,sha256=VG4Bs3muLvi85SaWcP3Tw3q4TFfafKDtZhbQ-x9CpRw,358
-xtn_tools_pro-1.0.0.0.3.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
-xtn_tools_pro-1.0.0.0.3.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
-xtn_tools_pro-1.0.0.0.3.dist-info/RECORD,,
+xtn_tools_pro-1.0.0.0.4.dist-info/LICENSE,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+xtn_tools_pro-1.0.0.0.4.dist-info/METADATA,sha256=nLLM4xF-cM4V6dqxghgyDjq6B2BAqHm0jI07PIuflQU,358
+xtn_tools_pro-1.0.0.0.4.dist-info/WHEEL,sha256=oiQVh_5PnQM0E3gPdiz09WCNmwiHDMaGer_elqB3coM,92
+xtn_tools_pro-1.0.0.0.4.dist-info/top_level.txt,sha256=jyB3FLDEr8zE1U7wHczTgIbvUpALhR-ULF7RVEO7O2U,14
+xtn_tools_pro-1.0.0.0.4.dist-info/RECORD,,