meshcore-cli 1.3.2__py3-none-any.whl → 1.3.4__py3-none-any.whl

meshcore_cli/meshcore_cli.py

@@ -32,7 +32,7 @@ import re
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.3.2"
+VERSION = "v1.3.4"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -766,6 +766,7 @@ Use \"to\" to select recipient, use Tab to complete name ...
 Some cmds have an help accessible with ?<cmd>. Do ?[Tab] to get a list.
 \"quit\", \"q\", CTRL+D will end interactive mode""")
 
+
     contact = to
     prev_contact = None
 
@@ -774,16 +775,16 @@ Some cmds have an help accessible with ?<cmd>. Do ?[Tab] to get a list.
 
     await get_contacts(mc, anim=True)
     await get_channels(mc, anim=True)
+
+    # Call sync_msg before going further so there is no issue when scrolling
+    # long list of msgs
+    await next_cmd(mc, ["sync_msgs"])
+
     await subscribe_to_msgs(mc, above=True)
 
     handle_new_contact.print_new_contacts = True
 
     try:
-        while True: # purge msgs
-            res = await mc.commands.get_msg()
-            if res.type == EventType.NO_MORE_MSGS:
-                break
-
         if os.path.isdir(MCCLI_CONFIG_DIR) :
             our_history = FileHistory(MCCLI_HISTORY_FILE)
         else:
@@ -1493,7 +1494,8 @@ async def send_msg (mc, contact, msg) :
     return res
 
 async def msg_ack (mc, contact, msg) :
-    timeout = 0 if not 'timeout' in contact else contact['timeout']
+    timeout = 0 if not isinstance(contact, dict) or not 'timeout' in contact\
+        else contact['timeout']
     res = await mc.commands.send_msg_with_retry(contact, msg,
                 max_attempts=msg_ack.max_attempts,
                 flood_after=msg_ack.flood_after,
@@ -2333,7 +2335,7 @@ async def next_cmd(mc, cmds, json_output=False):
                 argnum = 2
                 dest = None
 
-                if len(cmds[1]) == 12: # possibly an hex prefix
+                if len(cmds[1]) >= 12: # possibly an hex prefix
                     try:
                         dest = bytes.fromhex(cmds[1])
                     except ValueError:
@@ -3244,11 +3246,16 @@ def command_help():
 def usage () :
     """ Prints some help """
     version()
+    command_usage()
+    print(" Available Commands and shorcuts (can be chained) :""")
+    command_help()
+
+def command_usage() :
     print("""
    Usage : meshcore-cli <args> <commands>
 
  Arguments :
-    -h : prints this help
+    -h : prints help for arguments and commands
     -v : prints version
     -j : json output (disables init file)
     -D : debug
@@ -3264,9 +3271,7 @@ def usage () :
     -b <baudrate>   : specify baudrate
     -C              : toggles classic mode for prompt
     -c <on/off>     : disables most of color output if off
-
- Available Commands and shorcuts (can be chained) :""")
-    command_help()
+""")
 
 def get_help_for (cmdname, context="line") :
     if cmdname == "apply_to" or cmdname == "at" :
@@ -3409,13 +3414,19 @@ async def main(argv):
     baudrate = 115200
     timeout = 2
     pin = None
+    first_device = False
     # If there is an address in config file, use it by default
     # unless an arg is explicitely given
     if os.path.exists(MCCLI_ADDRESS) :
         with open(MCCLI_ADDRESS, encoding="utf-8") as f :
             address = f.readline().strip()
 
-    opts, args = getopt.getopt(argv, "a:d:s:ht:p:b:fjDhvSlT:Pc:C")
+    try:
+        opts, args = getopt.getopt(argv, "a:d:s:ht:p:b:fjDhvSlT:Pc:C")
+    except getopt.GetoptError:
+        print("Unrecognized option, use -h to get more help")
+        command_usage()
+        return
     for opt, arg in opts :
         match opt:
             case "-c" :
@@ -3452,6 +3463,7 @@ async def main(argv):
                 return
             case "-f": # connect to first encountered device
                 address = ""
+                first_device = True
             case "-l" :
                 print("BLE devices:")
                 try :
@@ -3547,8 +3559,15 @@ async def main(argv):
 
         try :
             mc = await MeshCore.create_ble(address=address, device=device, client=client, debug=debug, only_error=json_output, pin=pin)
+        except BleakError :
+            print("BLE connection asked (default behaviour), but no BLE HW found")
+            print("Call meshcore-cli with -h for some more help (on commands)")
+            command_usage()
+            return            
         except ConnectionError :
             logger.info("Error while connecting, retrying once ...")
+            if first_device :
+                address = "" # reset address to change device if first_device was asked
             if device is None and client is None: # Search for device
                 logger.info(f"Scanning BLE for device matching {address}")
                 devices = await BleakScanner.discover(timeout=timeout)

{meshcore_cli-1.3.2.dist-info → meshcore_cli-1.3.4.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.3.2
+Version: 1.3.4
 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>=2.2.0
+Requires-Dist: meshcore>=2.2.1
 Requires-Dist: prompt-toolkit>=3.0.50
 Requires-Dist: pycryptodome
 Requires-Dist: requests>=2.28.0

meshcore_cli-1.3.4.dist-info/RECORD

@@ -0,0 +1,8 @@
+meshcore_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
+meshcore_cli/__main__.py,sha256=PfYgibmu2LEtC-OV7L1UgmvV3swJ5rQ4bbXHlwUFlgE,83
+meshcore_cli/meshcore_cli.py,sha256=HEIf0cCzrl1NKQeeh15R-RBdDC0cUh8xw0-cvb2XHTE,151800
+meshcore_cli-1.3.4.dist-info/METADATA,sha256=4dva0jFFNntaaOaUfrV5yHg20aRcJSUoWuU1-3qEaXk,17105
+meshcore_cli-1.3.4.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+meshcore_cli-1.3.4.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
+meshcore_cli-1.3.4.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
+meshcore_cli-1.3.4.dist-info/RECORD,,

meshcore_cli-1.3.2.dist-info/RECORD

@@ -1,8 +0,0 @@
-meshcore_cli/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-meshcore_cli/__main__.py,sha256=PfYgibmu2LEtC-OV7L1UgmvV3swJ5rQ4bbXHlwUFlgE,83
-meshcore_cli/meshcore_cli.py,sha256=YxHOuvOYMj1gNmwxKwAMABROO9iNLiKH_gl8nTePc1I,151114
-meshcore_cli-1.3.2.dist-info/METADATA,sha256=a3H0Qig83DDxRmsqrW1NTuiDurihrPXhosUloOfAWzE,17105
-meshcore_cli-1.3.2.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-meshcore_cli-1.3.2.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
-meshcore_cli-1.3.2.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
-meshcore_cli-1.3.2.dist-info/RECORD,,