nmcli 1.3.0__tar.gz → 1.4.0__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nmcli
-Version: 1.3.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
@@ -466,6 +466,11 @@ 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`.

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

@@ -459,6 +459,11 @@ 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`.

{nmcli-1.3.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.3.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.3.0 → nmcli-1.4.0}/nmcli.egg-info/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: nmcli
-Version: 1.3.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
@@ -466,6 +466,11 @@ 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`.

{nmcli-1.3.0 → nmcli-1.4.0}/nmcli.egg-info/SOURCES.txt

@@ -1,4 +1,3 @@
-LICENSE.txt
 README.md
 setup.py
 nmcli/__init__.py

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

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

nmcli-1.3.0/LICENSE.txt

@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2020 ushiboy
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.