lazysdk 0.1.59__tar.gz → 0.1.60__tar.gz

{lazysdk-0.1.59 → lazysdk-0.1.60}/PKG-INFO

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

{lazysdk-0.1.59 → lazysdk-0.1.60}/lazysdk/lazyinfo.py

@@ -1,16 +1,30 @@
 import platform
 import datetime
 import socket
-import uuid
 import os
 
 
 def get_mac_address() -> str:
     """
-    获取mac地址
+    获取mac地址，只有联网才能生效
     """
-    mac = uuid.UUID(int=uuid.getnode()).hex[-12:]
-    return ":".join([mac[e:e+2] for e in range(0, 11, 2)])
+    import netifaces
+    try:
+        default_gate_way, default_nic_name = netifaces.gateways()['default'][netifaces.AF_INET]  # 获取默认网关和网卡名称
+        default_nic_mac_addr = netifaces.ifaddresses(default_nic_name)[netifaces.AF_LINK][0]['addr']  # 默认网卡的mac地址
+        return default_nic_mac_addr
+    except:
+        return ''
+
+
+def get_net_info():
+    import netifaces
+    default_gate_way, default_nic_name = netifaces.gateways()['default'][netifaces.AF_INET]  # 获取默认网关和网卡名称
+    default_nic_mac_addr = netifaces.ifaddresses(default_nic_name)[netifaces.AF_LINK][0]['addr']  # 默认网卡的mac地址
+    default_ip_addr = netifaces.ifaddresses(default_nic_name)[netifaces.AF_INET][0]['addr']  # 本地ip
+    default_ip_netmask = netifaces.ifaddresses(default_nic_name)[netifaces.AF_INET][0]['netmask']  # 子网掩码
+    default_ip_broadcast = netifaces.ifaddresses(default_nic_name)[netifaces.AF_INET][0]['netmask']
+    return {'mac': default_nic_mac_addr, 'local_ip': default_ip_addr, 'netmask': default_ip_netmask, 'broadcast': default_ip_broadcast}
 
 
 def platform_info() -> dict:

{lazysdk-0.1.59 → lazysdk-0.1.60}/lazysdk.egg-info/PKG-INFO

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

{lazysdk-0.1.59 → lazysdk-0.1.60}/lazysdk.egg-info/requires.txt

@@ -10,3 +10,4 @@ m3u8==3.5.0
 pycryptodome==3.10.1
 filetype==1.2.0
 rich==13.5.2
+netifaces==0.11.0

{lazysdk-0.1.59 → lazysdk-0.1.60}/setup.py

@@ -13,7 +13,7 @@ with open("README.md", "r", encoding='utf-8') as fh:
 
 setuptools.setup(
     name="lazysdk",
-    version="0.1.59",
+    version="0.1.60",
     description="基于Python的懒人包",
     long_description=long_description,
     long_description_content_type="text/markdown",
@@ -38,6 +38,7 @@ setuptools.setup(
         'm3u8==3.5.0',
         'pycryptodome==3.10.1',
         'filetype==1.2.0',
-        'rich==13.5.2'
+        'rich==13.5.2',
+        'netifaces==0.11.0'
     ]
 )