meshcore-cli 1.2.13__py3-none-any.whl → 1.2.14__py3-none-any.whl

meshcore_cli/meshcore_cli.py

@@ -4,7 +4,7 @@
 """
 
 import asyncio
-import os, sys, io
+import os, sys, io, platform
 import time, datetime
 import getopt, json, shlex, re
 import logging
@@ -32,7 +32,7 @@ import re
 from meshcore import MeshCore, EventType, logger
 
 # Version
-VERSION = "v1.2.13"
+VERSION = "v1.2.14"
 
 # default ble address is stored in a config file
 MCCLI_CONFIG_DIR = str(Path.home()) + "/.config/meshcore/"
@@ -1036,7 +1036,10 @@ Line starting with \"$\" or \".\" will issue a meshcli command.
     except asyncio.CancelledError:
         # Handle task cancellation from KeyboardInterrupt in asyncio.run()
         print("Exiting cli")
-interactive_loop.classic = False
+if platform.system() == "Darwin" or platform.system() == "Windows":
+    interactive_loop.classic = True
+else:
+    interactive_loop.classic = False
 
 async def process_contact_chat_line(mc, contact, line):
     if contact["type"] == 0:
@@ -2337,12 +2340,11 @@ async def next_cmd(mc, cmds, json_output=False):
                         else :
                             color = process_event_message.color
                             classic = interactive_loop.classic or not color
-                            print("]",end="")
                             for t in ev.payload["path"]:
                                 if classic :
                                     print("→",end="")
                                 else:
-                                    print(f" {ANSI_INVERT}", end="")
+                                    print(f"{ANSI_INVERT}", end="")
                                 snr = t['snr']
                                 if color:
                                     if snr >= 10 :
@@ -2355,13 +2357,13 @@ async def next_cmd(mc, cmds, json_output=False):
                                 if classic :
                                     print("→",end="")
                                 else :
-                                    print(f"{ANSI_NORMAL}{ARROW_HEAD} ",end="")
+                                    print(f"{ANSI_NORMAL}{ARROW_HEAD}",end="")
                                 if color:
                                     print(ANSI_END, end="")
                                 if "hash" in t:
                                     print(f"[{t['hash']}]",end="")
                                 else:
-                                    print("[")
+                                    print()
 
             case "login" | "l" :
                 argnum = 2
@@ -3131,6 +3133,7 @@ def usage () :
     -D : debug
     -S : scan for devices and show a selector
     -l : list available ble/serial devices and exit
+    -C              : toggles classic mode for prompt
     -c <on/off>     : disables most of color output if off
     -T <timeout>    : timeout for the ble scan (-S and -l) default 2s
     -a <address>    : specifies device address (can be a name)
@@ -3199,12 +3202,14 @@ async def main(argv):
         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:")
+    opts, args = getopt.getopt(argv, "a:d:s:ht:p:b:fjDhvSlT:Pc:C")
     for opt, arg in opts :
         match opt:
             case "-c" :
                 if arg == "off":
                     process_event_message.color = False
+            case "-C":
+                interactive_loop.classic = not interactive_loop.classic
             case "-d" : # name specified on cmdline
                 address = arg
             case "-a" : # address specified on cmdline

{meshcore_cli-1.2.13.dist-info → meshcore_cli-1.2.14.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore-cli
-Version: 1.2.13
+Version: 1.2.14
 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-1.2.14.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=NbE3xX0GE3dtq0WnlBdF79iwyeGnxHerFGGoQNLeDSc,141395
+meshcore_cli-1.2.14.dist-info/METADATA,sha256=DDHsEo0JnY32-PX5_tr3qUYagxHJfJ9eSqYn5FJkrdw,11658
+meshcore_cli-1.2.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+meshcore_cli-1.2.14.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
+meshcore_cli-1.2.14.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
+meshcore_cli-1.2.14.dist-info/RECORD,,

meshcore_cli-1.2.13.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=f5T9-BokGud7XQoSvuSh-h0bY5bA9UeLudPBTYiuQEo,141172
-meshcore_cli-1.2.13.dist-info/METADATA,sha256=ZrvQ-6jV_2NsHEiUNuTV1mTUq3cjogq37hGDaHjzRhw,11658
-meshcore_cli-1.2.13.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-meshcore_cli-1.2.13.dist-info/entry_points.txt,sha256=77V29Pyth11GteDk7tneBN3MMk8JI7bTlS-BGSmxCmI,103
-meshcore_cli-1.2.13.dist-info/licenses/LICENSE,sha256=F9s987VtS0AKxW7LdB2EkLMkrdeERI7ICdLJR60A9M4,1066
-meshcore_cli-1.2.13.dist-info/RECORD,,