tplinkrouterc6u 5.12.3__py3-none-any.whl → 5.12.4__py3-none-any.whl

test/test_client_c6u.py

@@ -508,7 +508,7 @@ class TestTPLinkClient(TestCase):
         self.assertEqual(status.wired_total, 2)
         self.assertEqual(status.wifi_clients_total, 2)
         self.assertEqual(status.guest_clients_total, 0)
-        self.assertEqual(status.clients_total, 4)
+        self.assertEqual(status.clients_total, 7)
         self.assertEqual(status.iot_clients_total, 3)
         self.assertEqual(status.guest_2g_enable, True)
         self.assertEqual(status.guest_5g_enable, None)

tplinkrouterc6u/client/c6u.py

@@ -376,7 +376,8 @@ class TplinkBaseRouter(AbstractRouter, TplinkRequest):
             pass
 
         status.devices = list(devices.values())
-        status.clients_total = status.wired_total + status.wifi_clients_total + status.guest_clients_total
+        status.clients_total = (status.wired_total + status.wifi_clients_total + status.guest_clients_total
+                                + (status.iot_clients_total or 0))
 
         return status
 

tplinkrouterc6u/client/ex.py

@@ -141,7 +141,7 @@ class TPLinkEXClient(TPLinkMRClientBase):
                 status.wifi_clients_total += 1
             devices[val['physAddress']] = Device(conn,
                                                  EUI48(val['physAddress']),
-                                                 IPv4Address(val['IPAddress']),
+                                                 get_ip(val['IPAddress']),
                                                  val['hostName'])
 
         total = int(values[4]['total'])

tplinkrouterc6u/client/mr.py

@@ -371,7 +371,7 @@ class TPLinkMRClientBase(AbstractRouter):
         lines = response.split('\n')
         for line in lines:
             if line.startswith('['):
-                regexp = search(r'\[\d,\d,\d,\d,\d,\d\](\d)', line)
+                regexp = search(r'\[\d+,\d+,\d+,\d+,\d+,\d+](\d+)', line)
                 if regexp is not None:
                     obj = {}
                     index = regexp.group(1)

{tplinkrouterc6u-5.12.3.dist-info → tplinkrouterc6u-5.12.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tplinkrouterc6u
-Version: 5.12.3
+Version: 5.12.4
 Summary: TP-Link Router API (supports also Mercusys Router)
 Home-page: https://github.com/AlexandrErohin/TP-Link-Archer-C6U
 Author: Alex Erohin
@@ -372,6 +372,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - Deco P7
 - Deco X20
 - Deco X50 v1.3
+- Deco X50-5G 1.20
 - Deco X55 1.0
 - Deco X60 V3
 - Deco X90
@@ -403,6 +404,7 @@ or you have TP-link C5400X or similar router you need to get web encrypted passw
 - AC10 1.20
 - MR47BE v1.0
 - MR50G 1.0
+- ME30 1.0
 - H60XR 1.0
 - H47BE 2.0
 - Halo H80X 1.0

{tplinkrouterc6u-5.12.3.dist-info → tplinkrouterc6u-5.12.4.dist-info}/RECORD

@@ -1,6 +1,6 @@
 test/__init__.py,sha256=McQmUjeN3AwmwdS6QNfwGXXE77OKoPK852I2BM9XsrU,210
 test/test_client_c1200.py,sha256=Sl-85JGqINNg-ckBZCIVqY0CC-V1UOc-yiIUljtePRM,7582
-test/test_client_c6u.py,sha256=j9IpkZaWAedqkSktIGhjK8YZMhCkQhHnhqAmAWzEAYc,40399
+test/test_client_c6u.py,sha256=u-8mnPF18RBgU-rx06L_M-RYTXYKZY6B3mmkXgq8mZg,40399
 test/test_client_c80.py,sha256=RY_1SgRVcQQdN9h0_IXA0YW4_0flEB_uel05QvDDfws,42359
 test/test_client_deco.py,sha256=YPLKRD8GoyDYHfRgdXvCk8iVNw8zdMJW-AHVnNbpdTM,31719
 test/test_client_ex.py,sha256=Kg6svEKtyGAfyF9yrLh2qZa2tK1mlEBJJwXRsq1MAjo,26591
@@ -16,11 +16,11 @@ tplinkrouterc6u/provider.py,sha256=gzsWGgkxqOSxxLcCjx3eHVkTQteE6DG1XuYziBp6C6s,2
 tplinkrouterc6u/client/__init__.py,sha256=KBy3fmtA9wgyFrb0Urh2x4CkKtWVnESdp-vxmuOvq0k,27
 tplinkrouterc6u/client/c1200.py,sha256=4XEYidEGmVIJk0YQLvmTnd0Gqa7glH2gUWvjreHpWrk,3178
 tplinkrouterc6u/client/c5400x.py,sha256=ID9jC-kLUBBeETvOh8cxyQpKmJBIzdwNYR03DmvMN0s,4289
-tplinkrouterc6u/client/c6u.py,sha256=Lh0YktqD4mRdQ_Q6b-fy_s_bgLx3cEdyoD5doOIbOzI,19851
+tplinkrouterc6u/client/c6u.py,sha256=wGxqXiqOA6-Vt1shSygYiJAnFgjgx6gPYUuALJ-KO8k,19919
 tplinkrouterc6u/client/c80.py,sha256=efE0DEjEfzRFr35fjKA_hsv9YaWy_2dgLAaurDM-WQk,17665
 tplinkrouterc6u/client/deco.py,sha256=cpKRggKD2RvSmMZuD6tzsZmehAUCU9oLiTTHcZBW81Y,8898
-tplinkrouterc6u/client/ex.py,sha256=tOcMugCViAcISULg8otp3NjdkPyuUXihcoe_0lql3AQ,14886
-tplinkrouterc6u/client/mr.py,sha256=7MtnKqmtbggWBx6RIiJzlGuSyVDbC8MFynPrc34bSd0,28948
+tplinkrouterc6u/client/ex.py,sha256=iVLTtLe1uNwNtv43zHzbLJkZL3SHsBllVBM-MVlnseE,14881
+tplinkrouterc6u/client/mr.py,sha256=kNXk0bzBIIIM-4jMZOFp370vDPMJKwt2HmWGMjktguk,28954
 tplinkrouterc6u/client/mr200.py,sha256=febM1Eoc2_8NGJu-NrrAdj9zrlP_n7dOU6EVKktzMnw,5801
 tplinkrouterc6u/client/re330.py,sha256=9Wj4VpYJbVwZJUh9s3magdeL3Jl-B7qyrWfrVBxRk4A,17465
 tplinkrouterc6u/client/vr.py,sha256=7Tbu0IrWtr4HHtyrnLFXEJi1QctzhilciL7agtwQ0R8,5025
@@ -33,8 +33,8 @@ tplinkrouterc6u/common/encryption.py,sha256=EWfgGafOz0YgPilBndVaupnjw6JrzhVBdZkB
 tplinkrouterc6u/common/exception.py,sha256=_0G8ZvW5__CsGifHrsZeULdl8c6EUD071sDCQsQgrHY,140
 tplinkrouterc6u/common/helper.py,sha256=23b04fk9HuVinrZXMCS5R1rmF8uZ7eM-Cdnp7Br9NR0,572
 tplinkrouterc6u/common/package_enum.py,sha256=CMHVSgk4RSZyFoPi3499-sJDYg-nfnyJbz1iArFU9Hw,1644
-tplinkrouterc6u-5.12.3.dist-info/licenses/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
-tplinkrouterc6u-5.12.3.dist-info/METADATA,sha256=rkchRBKj215L408MdAzr8nHC67LtBQxEzHDzTnAU734,17604
-tplinkrouterc6u-5.12.3.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
-tplinkrouterc6u-5.12.3.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
-tplinkrouterc6u-5.12.3.dist-info/RECORD,,
+tplinkrouterc6u-5.12.4.dist-info/licenses/LICENSE,sha256=YF6QR6Vjxcg5b_sYIyqkME7FZYau5TfEUGTG-0JeRK0,35129
+tplinkrouterc6u-5.12.4.dist-info/METADATA,sha256=c3pEsJxHJhU-xNBwxD8l8TocAPojogYWBm4-FrqF5Rg,17634
+tplinkrouterc6u-5.12.4.dist-info/WHEEL,sha256=_zCd3N1l69ArxyTb8rzEoP9TpbYXkqRFSNOD5OuxnTs,91
+tplinkrouterc6u-5.12.4.dist-info/top_level.txt,sha256=1iSCCIueqgEkrTxtQ-jiHe99jAB10zqrVdBcwvNfe_M,21
+tplinkrouterc6u-5.12.4.dist-info/RECORD,,