meshcore-cli 0.8.0.dev6__tar.gz → 0.8.1__tar.gz

{meshcore_cli-0.8.0.dev6 → meshcore_cli-0.8.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 0.8.0.dev6
+Version: 0.8.1
 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

{meshcore_cli-0.8.0.dev6 → meshcore_cli-0.8.1}/pyproject.toml

@@ -4,7 +4,7 @@ build-backend = "hatchling.build"
 
 [project]
 name = "meshcore-cli"
-version = "0.8.0.dev6"
+version = "0.8.1"
 authors = [
   { name="Florent de Lamotte", email="florent@frizoncorrea.fr" },
 ]

{meshcore_cli-0.8.0.dev6 → meshcore_cli-0.8.1}/src/meshcore_cli/meshcore_cli.py

@@ -22,7 +22,7 @@ from meshcore import TCPConnection, BLEConnection, SerialConnection
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v0.8.0dev3"
+VERSION = "v0.8.1"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -278,8 +278,11 @@ def make_completion_dict(contacts, to=None):
                      "manual_add_contacts":None,
                      "telemetry_mode_base":None,
                      "telemetry_mode_loc":None,
+                     "custom":None
                      },
         })
+        completion_list["set"].update(make_completion_dict.custom_vars)
+        completion_list["get"].update(make_completion_dict.custom_vars)
     else :
         completion_list.update({
             "send" : None,
@@ -357,6 +360,7 @@ def make_completion_dict(contacts, to=None):
     })
 
     return completion_list
+make_completion_dict.custom_vars = {}
 
 async def interactive_loop(mc, to=None) :
     print("""Interactive mode, most commands from terminal chat should work.
@@ -389,6 +393,12 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
 
         bindings = KeyBindings()
 
+        res = await mc.commands.get_custom_vars()
+        cv = []
+        if res.type != EventType.ERROR :
+            cv = list(res.payload.keys())
+        make_completion_dict.custom_vars = {k:None for k in cv}
+
         # Add our own key binding.
         @bindings.add("escape")
         def _(event):
@@ -863,7 +873,9 @@ async def next_cmd(mc, cmds, json_output=False):
     lon       : longitude
     radio     : radio parameters
     tx        : tx power
-    print_snr : snr display in messages""")
+    print_snr : snr display in messages
+    custom    : all custom variables in json format
+                each custom var can also be get/set directly""")
                     case "print_name":
                         if json_output :
                             print(json.dumps({"print_name" : interactive_loop.print_name}))
@@ -956,6 +968,16 @@ async def next_cmd(mc, cmds, json_output=False):
                             print(json.dumps({"telemetry_mode_loc" : mc.self_info["telemetry_mode_loc"]}))
                         else :
                             print(f"telemetry_mode_loc: {mc.self_info['telemetry_mode_loc']}")
+                    case "custom" :
+                        res = await mc.commands.get_custom_vars()
+                        logger.debug(res)
+                        if res.type == EventType.ERROR :
+                            if json_output :
+                                print(json.dumps(res))
+                            else :
+                                logger.error("Couldn't get custom variables")
+                        else :
+                            print(json.dumps(res.payload, indent=4))
                     case _ :
                         res = await mc.commands.get_custom_vars()
                         logger.debug(res)
@@ -963,7 +985,7 @@ async def next_cmd(mc, cmds, json_output=False):
                             if json_output :
                                 print(json.dumps(res))
                             else :
-                                print(f"Couldn't get custom variables")
+                                logger.error(f"Couldn't get custom variables")
                         else :
                             try:
                                 if cmds[1].startswith("_"):
@@ -1520,9 +1542,11 @@ def command_help():
     contacts / list        : gets contact list                      lc
     share_contact <ct>     : share a contact with others            sc
     export_contact <ct>    : get a contact's URI                    ec
+    import_contact <URI>   : import a contactt from its URI         ic
     remove_contact <ct>    : removes a contact from this node
     reset_path <ct>        : resets path to a contact to flood      rp
     change_path <ct> <pth> : change the path to a contact           cp
+    req_telemetry <ct>     : prints telemetry data as json          rt
   Repeaters
     login <name> <pwd>     : log into a node (rep) with given pwd   l
     logout <name>          : log out of a repeater
@@ -1603,14 +1627,14 @@ async def main(argv):
                 if len(devices) == 0:
                     logger.error("No ble device found")
                 for d in devices :
-                    if d.name.startswith("MeshCore-"):
+                    if not d.name is None and d.name.startswith("MeshCore-"):
                         print(f"{d.address}  {d.name}") 
                 return
             case "-S" :
                 devices = await BleakScanner.discover(timeout=timeout)
                 choices = []           
                 for d in devices:      
-                    if d.name.startswith("MeshCore-"):
+                    if not d.name is None and d.name.startswith("MeshCore-"):
                         choices.append((d.address, f"{d.address}  {d.name}"))
                 if len(choices) == 0:
                     logger.error("No BLE device found, exiting")