meshcore-cli 0.8.0.dev3__tar.gz → 0.8.0.dev5__tar.gz

{meshcore_cli-0.8.0.dev3 → meshcore_cli-0.8.0.dev5}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 0.8.0.dev3
+Version: 0.8.0.dev5
 Summary: Command line interface to meshcore companion radios
 Project-URL: Homepage, https://github.com/fdlamotte/meshcore-cli
 Project-URL: Issues, https://github.com/fdlamotte/meshcore-cli/issues
@@ -10,7 +10,7 @@ License-File: LICENSE
 Classifier: Operating System :: OS Independent
 Classifier: Programming Language :: Python :: 3
 Requires-Python: >=3.10
-Requires-Dist: meshcore>=1.9.8.dev3
+Requires-Dist: meshcore>=1.9.8.dev5
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: requests>=2.28.0
 Description-Content-Type: text/markdown

{meshcore_cli-0.8.0.dev3 → meshcore_cli-0.8.0.dev5}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore-cli"
-version = "0.8.0.dev3"
+version = "0.8.0.dev5"
 authors = [
   { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
 ]
@@ -17,7 +17,7 @@ classifiers = [
 ]
 license = "MIT"
 license-files = ["LICEN[CS]E*"]
-dependencies = [ "meshcore >= 1.9.8.dev3", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ]
+dependencies = [ "meshcore >= 1.9.8.dev5", "prompt_toolkit >= 3.0.50", "requests >= 2.28.0" ]
 
 [project.urls]
 Homepage = "https://github.com/fdlamotte/meshcore-cli"

{meshcore_cli-0.8.0.dev3 → meshcore_cli-0.8.0.dev5}/src/meshcore_cli/meshcore_cli.py

@@ -239,6 +239,7 @@ def make_completion_dict(contacts, to=None):
             "reset_path" : contact_list,
             "change_path" : contact_list,
             "remove_contact" : contact_list,
+            "import_contact" : {"meshcore://":None},
             "login" : contact_list,
             "cmd" : contact_list,
             "req_status" : contact_list,
@@ -258,23 +259,23 @@ def make_completion_dict(contacts, to=None):
                     "color" : {"on":None, "off":None},
                     "print_name" : {"on":None, "off":None},
                     "classic_prompt" : {"on" : None, "off":None},
-                    "manual_add_contact" : {"on" : None, "off":None},
+                    "manual_add_contacts" : {"on" : None, "off":None},
                     "telemetry_mode_base" : {"always" : None, "device":None, "never":None},
                     "telemetry_mode_loc" : {"always" : None, "device":None, "never":None},
                     },
-            "get" : {"name" : None, 
-                     "bat" : None, 
-                     "radio" : None, 
-                     "tx" : None, 
-                     "coords" : None, 
-                     "lat" : None,
-                     "lon" : None,
-                     "print_snr" : None, 
+            "get" : {"name":None, 
+                     "bat":None, 
+                     "radio":None, 
+                     "tx":None, 
+                     "coords":None, 
+                     "lat":None,
+                     "lon":None,
+                     "print_snr":None, 
                      "json_msgs":None, 
                      "color":None,
                      "print_name":None, 
                      "classic_prompt":None,
-                     "manual_add_contact":None,
+                     "manual_add_contacts":None,
                      "telemetry_mode_base":None,
                      "telemetry_mode_loc":None,
                      },
@@ -807,7 +808,7 @@ async def next_cmd(mc, cmds, json_output=False):
                         else:
                             print("ok")
                     case "manual_add_contacts":
-                        mac = (cmds[2] == "on") or (cmds[2] == "true") or (cmds[2] == "1")
+                        mac = (cmds[2] == "on") or (cmds[2] == "true") or (cmds[2] == "yes") or (cmds[2] == "1")
                         res = await mc.commands.set_manual_add_contacts(mac)
                         if res.type == EventType.ERROR:
                             print(f"Error : {res}")
@@ -950,7 +951,7 @@ async def next_cmd(mc, cmds, json_output=False):
                         else :
                             print(f"telemetry_mode_base: {mc.self_info['telemetry_mode_base']}")
                     case "telemetry_mode_loc" :
-                        await mc.commands.sent_appstart()
+                        await mc.commands.send_appstart()
                         if json_output :
                             print(json.dumps({"telemetry_mode_loc" : mc.self_info["telemetry_mode_loc"]}))
                         else :
@@ -1240,6 +1241,16 @@ async def next_cmd(mc, cmds, json_output=False):
                     else :
                         print(res.payload['uri'])
 
+            case "import_contact"|"ic":
+                argnum = 1
+                if cmds[1].startswith("meshcore://") :
+                    res = await mc.commands.import_contact(bytes.fromhex(cmds[1][11:]))
+                    logger.debug(res)
+                    if res.type == EventType.ERROR:
+                        print(f"Error while importing contact: {res}")
+                    else:
+                        logger.info("Contact successfully added, refresh with lc")
+
             case "upload_contact" | "uc" :
                 argnum = 1
                 await mc.ensure_contacts()