nmcli 1.2.0__tar.gz → 1.4.0__tar.gz

{nmcli-1.2.0 → nmcli-1.4.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nmcli
-Version: 1.2.0
+Version: 1.4.0
 Summary: A python wrapper library for the network-manager cli client
 Home-page: https://github.com/ushiboy/nmcli
 Author: ushiboy
@@ -256,7 +256,7 @@ Description: nmcli
         List available Wi-Fi access points.
         
         ```
-        nmcli.device.wifi(ifname: str = None) -> List[DeviceWifi]
+        nmcli.device.wifi(ifname: str = None, rescan: bool = None) -> List[DeviceWifi]
         ```
         
         #### nmcli.device.wifi_connect
@@ -466,6 +466,15 @@ Description: nmcli
         
         ## Change Log
         
+        ### 1.4.0
+        
+        - Supported unsupported cases of `DeviceWifi.parse`.
+        - Fixed the problem that `nmcli.general` does not work on nmcli client after version 1.48.x.
+        
+        ### 1.3.0
+        
+        - Added rescan parameter to `nmcli.device.wifi`.
+        
         ### 1.2.0
         
         - Added support for encodings other than UTF-8.

{nmcli-1.2.0 → nmcli-1.4.0}/README.md

@@ -249,7 +249,7 @@ nmcli.device.delete(ifname: str, wait: int = None) -> None
 List available Wi-Fi access points.
 
 ```
-nmcli.device.wifi(ifname: str = None) -> List[DeviceWifi]
+nmcli.device.wifi(ifname: str = None, rescan: bool = None) -> List[DeviceWifi]
 ```
 
 #### nmcli.device.wifi_connect
@@ -459,6 +459,15 @@ nmcli.set_lang(lang: str) -> None
 
 ## Change Log
 
+### 1.4.0
+
+- Supported unsupported cases of `DeviceWifi.parse`.
+- Fixed the problem that `nmcli.general` does not work on nmcli client after version 1.48.x.
+
+### 1.3.0
+
+- Added rescan parameter to `nmcli.device.wifi`.
+
 ### 1.2.0
 
 - Added support for encodings other than UTF-8.

{nmcli-1.2.0 → nmcli-1.4.0}/nmcli/_device.py

@@ -60,7 +60,7 @@ class DeviceControlInterface:
     def delete(self, ifname: str, wait: int = None) -> None:
         raise NotImplementedError
 
-    def wifi(self, ifname: str = None) -> List[DeviceWifi]:
+    def wifi(self, ifname: str = None, rescan: bool = None) -> List[DeviceWifi]:
         raise NotImplementedError
 
     def wifi_connect(self,
@@ -145,11 +145,13 @@ class DeviceControl(DeviceControlInterface):
             wait) + ['device', 'delete', ifname]
         self._syscmd.nmcli(cmd)
 
-    def wifi(self, ifname: str = None) -> List[DeviceWifi]:
+    def wifi(self, ifname: str = None, rescan: bool = None) -> List[DeviceWifi]:
         cmd = ['-t', '-f', 'IN-USE,SSID,BSSID,MODE,CHAN,FREQ,RATE,SIGNAL,SECURITY',
                'device', 'wifi', 'list']
         if ifname is not None:
             cmd += ['ifname', ifname]
+        if rescan is not None:
+            cmd += ['--rescan', 'yes' if rescan else 'no']
         r = self._syscmd.nmcli(cmd)
         results = []
         rows = r.split('\n')

{nmcli-1.2.0 → nmcli-1.4.0}/nmcli/data/device.py

@@ -64,7 +64,7 @@ class DeviceWifi:
         t = text.replace("\\:", "\uFFFE").replace(
             ":", "\uFFFF").replace("\uFFFE", ":")
         m = re.search(
-            r'^(\*|\s)\uFFFF(.*)\uFFFF(.*)\uFFFF(.*)\uFFFF(\d+)\uFFFF(\d+)\sMHz\uFFFF(\d+)\sMbit\/s\uFFFF(\d+)\uFFFF(.*)$', t)
+            r'^(\*|\s)\uFFFF(.*)\uFFFF(.*)\uFFFF(.*)\uFFFF(\d+)\uFFFF(\d+)\sMHz\uFFFF(\d+)\s(?:Mb|Mbit)\/s\uFFFF(\d+)\uFFFF(.*)$', t)
         if m:
             in_use, ssid, bssid, mode, chan, freq, rate, signal, security = m.groups()
             return DeviceWifi(in_use == '*', ssid, bssid, mode,

{nmcli-1.2.0 → nmcli-1.4.0}/nmcli/data/general.py

@@ -25,12 +25,43 @@ class General:
             'wwan': self.wwan
         }
 
+# case 1:
+# STATE      CONNECTIVITY  WIFI-HW  WIFI     WWAN-HW  WWAN     METERED
+# connected  full          enabled  enabled  missing  enabled  no (guessed)
+#
+# case 2:
+# unknown  none          enabled  enabled  enabled  disabled
+#
+# case 3:
+# connected (local only)  full          disabled  enabled  enabled  enabled
+#
+# see: https://regex101.com/r/zW1hHE/1
+
     @classmethod
     def parse(cls, text: str) -> General:
-        m = re.search(
-            r'^([\S\s]+)\s{2}(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s+(\S+)\s*', text)
+        pattern = (
+            r'^'
+            + r'(?P<state>.+)'
+            + r'  '
+            + r'(?P<connectivity>\S+)'
+            + r'\s+'
+            + r'(?P<wifi_hw>\S+)'
+            + r'  '
+            + r'(?P<wifi>\S+)'
+            + r'  '
+            + r'(?P<wwan_hw>\S+)'
+            + r'  '
+            + r'(?P<wwan>\S+)'
+            + r'(?:  (?P<metered>.+)?)?'
+            + r'$'
+        )
+
+        # The execution result will have a trailing space,
+        # so trim it and then match it to the pattern.
+        m = re.search(pattern, text.rstrip())
+
         if m:
-            state, connectivity, wifi_hw, wifi, wwan_hw, wwan = m.groups()
+            state, connectivity, wifi_hw, wifi, wwan_hw, wwan, _metered = m.groups()
             return General(NetworkManagerState(state),
                            NetworkConnectivity(connectivity),
                            wifi_hw == 'enabled',

{nmcli-1.2.0 → nmcli-1.4.0}/nmcli/dummy/_device.py

@@ -61,7 +61,7 @@ class DummyDeviceControl(DeviceControlInterface):
         self._disconnect_args: List[Tuple] = []
         self._reapply_args: List[str] = []
         self._delete_args: List[Tuple] = []
-        self._wifi_args: List[str] = []
+        self._wifi_args: List[Tuple] = []
         self._wifi_connect_args: List[Tuple] = []
         self._wifi_hotspot_args: List[Tuple] = []
         self._wifi_rescan_args: List[Tuple] = []
@@ -101,10 +101,9 @@ class DummyDeviceControl(DeviceControlInterface):
         self._raise_error_if_needed()
         self._delete_args.append((ifname, wait))
 
-    def wifi(self, ifname: str = None) -> List[DeviceWifi]:
+    def wifi(self, ifname: str = None, rescan: bool = None) -> List[DeviceWifi]:
         self._raise_error_if_needed()
-        if ifname is not None:
-            self._wifi_args.append(ifname)
+        self._wifi_args.append((ifname, rescan))
         return self._result_wifi
 
     def wifi_connect(self,

{nmcli-1.2.0 → nmcli-1.4.0}/nmcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nmcli
-Version: 1.2.0
+Version: 1.4.0
 Summary: A python wrapper library for the network-manager cli client
 Home-page: https://github.com/ushiboy/nmcli
 Author: ushiboy
@@ -256,7 +256,7 @@ Description: nmcli
         List available Wi-Fi access points.
         
         ```
-        nmcli.device.wifi(ifname: str = None) -> List[DeviceWifi]
+        nmcli.device.wifi(ifname: str = None, rescan: bool = None) -> List[DeviceWifi]
         ```
         
         #### nmcli.device.wifi_connect
@@ -466,6 +466,15 @@ Description: nmcli
         
         ## Change Log
         
+        ### 1.4.0
+        
+        - Supported unsupported cases of `DeviceWifi.parse`.
+        - Fixed the problem that `nmcli.general` does not work on nmcli client after version 1.48.x.
+        
+        ### 1.3.0
+        
+        - Added rescan parameter to `nmcli.device.wifi`.
+        
         ### 1.2.0
         
         - Added support for encodings other than UTF-8.

{nmcli-1.2.0 → nmcli-1.4.0}/setup.py

@@ -13,7 +13,7 @@ with open('README.md', 'r') as f:
 
 setup(
     name='nmcli',
-    version='1.2.0',
+    version='1.4.0',
     author='ushiboy',
     license='MIT',
     license_files = ('LICENSE.txt',),