pyhw 0.14.4__py3-none-any.whl → 0.15.0__py3-none-any.whl

pyhw/__init__.py

@@ -1,2 +1,2 @@
-__version__ = '0.14.4'
+__version__ = '0.15.0'
 __author__ = 'xiaoran007'

pyhw/backend/nic/macos.py

@@ -72,7 +72,7 @@ class NICDetectMacOS:
                                       wifi_standard):
 
                     if is_wifi.value:
-                        conn_info = f"{conn_type.value.decode('utf-8')} 802.11{wifi_standard.value.decode('utf-8')} ({band.value.decode('utf-8')} {speed.value} Mbps)"
+                        conn_info = f"{conn_type.value.decode('utf-8')} ({wifi_standard.value.decode('utf-8')} {band.value.decode('utf-8')} {speed.value} Mbps)"
                     else:
                         conn_info = conn_type.value.decode('utf-8')
 
@@ -92,7 +92,6 @@ class NICDetectMacOS:
             # print(f"An error occurred while getting NIC info using IOKit: {e}")
             return False
 
-
     def __getLinkInfo(self, interface):
         try:
             # Check if interface is wireless
@@ -141,7 +140,7 @@ class NICDetectMacOS:
             return "Unknown connection type"
 
     def __getWifiInfo(self, interface):
-        # 使用 system_profiler 获取 WiFi 信息
+        # Use system_profiler to get WiFi information
         profiler_cmd = f"system_profiler SPAirPortDataType -json"
         try:
             wifi_data = subprocess.run(["bash", "-c", profiler_cmd],
@@ -150,27 +149,27 @@ class NICDetectMacOS:
             import json
             data = json.loads(wifi_data)
 
-            # 根据实际 JSON 结构提取信息
+            # Extract information based on the JSON structure
             if 'SPAirPortDataType' in data and isinstance(data['SPAirPortDataType'], list):
                 airport_data = data['SPAirPortDataType'][0]
 
-                # 获取接口列表
+                # Get the interface list
                 if 'spairport_airport_interfaces' in airport_data:
                     interfaces = airport_data['spairport_airport_interfaces']
 
-                    # 查找匹配的接口
+                    # Find the matching interface
                     for iface in interfaces:
                         if interface == iface.get('_name', ''):
-                            # 获取当前网络信息
+                            # Get current network information
                             current_network = iface.get('spairport_current_network_information', {})
 
-                            # 从当前连接中提取速率
+                            # Extract speed rate from current connection
                             speed = current_network.get('spairport_network_rate', 'Unknown')
 
-                            # 获取信道信息
+                            # Get channel information
                             channel_info = current_network.get('spairport_network_channel', 'Unknown')
 
-                            # 确定频段信息
+                            # Determine frequency band information
                             band = "Unknown"
                             if isinstance(channel_info, str) and "GHz" in channel_info:
                                 if "2GHz" in channel_info:
@@ -184,7 +183,7 @@ class NICDetectMacOS:
 
             return "Unknown", "Unknown", "Unknown"
         except Exception as e:
-            # 可以考虑添加日志记录 print(f"WiFi info error: {str(e)}")
+            # Consider adding logging here: print(f"WiFi info error: {str(e)}")
             return "Unknown", "Unknown", "Unknown"
 
     def __handleError(self):

pyhw/pyhwUtil/pyhwUtil.py

@@ -26,7 +26,7 @@ def getOS() -> str:
 def getArch() -> str:
     """
     Get the machine architecture.
-    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64, s390x, ppc64le, mips64].
+    :return: str, value in [x86_64, x86, aarch64, arm32, riscv64, s390x, ppc64le, mips64, unknown].
     """
     arch = platform.machine()
     if arch == "x86_64" or arch == "AMD64" or arch == "amd64":

{pyhw-0.14.4.dist-info → pyhw-0.15.0.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: pyhw
-Version: 0.14.4
+Version: 0.15.0
 Summary: PyHw, a neofetch-like command line tool for fetching system information but written mostly in python.
 Author: Xiao Ran
 Maintainer-email: Xiao Ran <xiaoran.007@icloud.com>

{pyhw-0.14.4.dist-info → pyhw-0.15.0.dist-info}/RECORD

@@ -1,4 +1,4 @@
-pyhw/__init__.py,sha256=Pt3AYgvOMt-i2dAXT2EwQj0cQvKE-E7vpvngWhXDPJ8,49
+pyhw/__init__.py,sha256=Qq4MF7K6OMpx8mw_zvhksDXG97lXIDXz0wtrJac6uQg,49
 pyhw/__main__.py,sha256=sycXv_HBzXuNET2w0-fRgMwHaWIsMALyJ_ZCxdZulDk,7696
 pyhw/backend/__init__.py,sha256=X1D1D28lSojDrUzUolgJvmbuctwBh_UxG3FwUeL8adA,51
 pyhw/backend/backendBase.py,sha256=mloo8mPEbgbIdmyQ3I4vdEXMSSjxWi_wnwACmzvHbEo,506
@@ -38,7 +38,7 @@ pyhw/backend/memory/windows.py,sha256=ISihGHBnV8iD4Xj8_kelFSCydPu05CYKxG5q_wM5Zb
 pyhw/backend/nic/__init__.py,sha256=eP4eOYIvMF3LcTf954hJa6TnB8R4Qahss2g-UcgypKY,57
 pyhw/backend/nic/bsd.py,sha256=6nj7XXII5dRz3FGRYAXVgTt0vSgyQo0Re9JA1vlcnuw,134
 pyhw/backend/nic/linux.py,sha256=e6gX58RBE9IDKb0FrzZ7U2EhDNfGJsR6OvXq6qO5ZOc,2003
-pyhw/backend/nic/macos.py,sha256=AOT6IvgEGvWPIpv8UwlTGbFO7zaDDQn4xC1NL8SKmeo,8566
+pyhw/backend/nic/macos.py,sha256=C0sfNQ1V1peeZzt3JTKqY1Gq_ATsLjsA-HKCnIZcLTs,8623
 pyhw/backend/nic/nicBase.py,sha256=Kng5qoe7FHcnQaf6S-LUe_HyOaBJe0L1SVstdIQ_WJY,962
 pyhw/backend/nic/nicInfo.py,sha256=wuBuL-aIzD441IUDPGz5e0xctcZ-opdpgqkVxgbvZLg,133
 pyhw/backend/nic/windows.py,sha256=4yJ0pmiXokegLEC299WLwqiW9uHAgaiVpkR2vCuzECg,1225
@@ -106,7 +106,7 @@ pyhw/frontend/logo/ascii/windows_old.pyhw,sha256=AMsvWAZ50HM8lweWEmzDWbRNDGkKFJo
 pyhw/library/lib/iokitCPULib.dylib,sha256=uMDDaijZGvTNkdT0ccQ55SDO4rRrzj8GSbrDMKeLAZ0,34280
 pyhw/library/lib/iokitGPULib.dylib,sha256=uiULOcAPpwOG7LZGR8Sdmjh_p5QjKN1OBBCfDMnUohk,155640
 pyhw/library/lib/iokitHostLib.dylib,sha256=MKxyKUkD4IZomP4exATikWx2SxqSDqQx4FEuIkFAEnc,149912
-pyhw/library/lib/iokitNICLib.dylib,sha256=gOtCQFxtHnsmU9XuWUp67eOPXJw2gIBxeVLesaIb6rY,212360
+pyhw/library/lib/iokitNICLib.dylib,sha256=4IP-GPmxiS6unnj8poktJrMGEWh0dQPclghdjVI9atE,212360
 pyhw/library/lib/nvmlGPULib_amd64.so,sha256=lrkxeJjChUs8oVhaw_uMeXKbUJp24KroQ_hhcLtHfTg,12784
 pyhw/library/lib/nvmlGPULib_arm64.so,sha256=DFIYqNcuRxiZ8_jrYoaRB3Dx9GrY7UBXscwXQvV4k3I,13528
 pyhw/library/test/iokitCPULibTest.py,sha256=BrhMypgfJTeMectpDc9Tmwzp8gYwYAcowaTFf72LlLE,311
@@ -119,11 +119,11 @@ pyhw/pyhwException/pyhwException.py,sha256=wxuzFQa9g7XB1q9TUKO_55lw7wMEJMpzG8w1G
 pyhw/pyhwUtil/__init__.py,sha256=sfUSG2jnSsa8SIk1P9174PgCAYewjE1TyzBxxPNkGsA,468
 pyhw/pyhwUtil/cliUtil.py,sha256=IUcWun5nDwQb20Qe8YefS5j3Jji8a-F41Qd9QwCf0h0,2454
 pyhw/pyhwUtil/pciUtil.py,sha256=WAluDRDb-gUbqhvSIusFzPrf6r98EkrNEAwbPyMwrTc,202
-pyhw/pyhwUtil/pyhwUtil.py,sha256=V3M6X9eTirwnwwRiSJaLUWrZKZYMbRihARJVQc879P8,8364
+pyhw/pyhwUtil/pyhwUtil.py,sha256=XA1sQnAZmfA3QdmCzqiNWN4CDJKtnPK7N0j_1p3shiQ,8373
 pyhw/pyhwUtil/sysctlUtil.py,sha256=S-rUvqi7ZrMyMouIhxlyHEQ4agM7sCT1Y7uzs3Hu5-o,841
-pyhw-0.14.4.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
-pyhw-0.14.4.dist-info/METADATA,sha256=CtMPd6f1kjJMoYYeiSv_-OnmeqKFp12lcVHgSCEkp-Q,7715
-pyhw-0.14.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-pyhw-0.14.4.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
-pyhw-0.14.4.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
-pyhw-0.14.4.dist-info/RECORD,,
+pyhw-0.15.0.dist-info/licenses/LICENSE,sha256=hJs6RBqSVCexbTsalkMLNFI5t06kekQEsSVaOt_-yLs,1497
+pyhw-0.15.0.dist-info/METADATA,sha256=BDyE_ktRMU5LTqj50QVEncMBFXw9fRfTm8ltfW0vcRw,7715
+pyhw-0.15.0.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+pyhw-0.15.0.dist-info/entry_points.txt,sha256=q-AB8im_QahpmNrmy4aPTJRGi0LlbNlnI3kF7s6pKss,44
+pyhw-0.15.0.dist-info/top_level.txt,sha256=7Inxvxt1TngEricKZEex9_WJZS3DbKYFUXDz4v5WHYU,5
+pyhw-0.15.0.dist-info/RECORD,,