meshcore 2.1.14__py3-none-any.whl → 2.1.16__py3-none-any.whl

meshcore/commands/contact.py

@@ -9,16 +9,17 @@ logger = logging.getLogger("meshcore")
 
 
 class ContactCommands(CommandHandlerBase):
-    async def get_contacts(self, lastmod=0, anim=False) -> Event:
+    async def get_contacts_async(self, lastmod=0) :
         logger.debug("Getting contacts")
         data = b"\x04"
         if lastmod > 0:
             data = data + lastmod.to_bytes(4, "little")
-        if anim:
-            print("Fetching contacts ", end="", flush=True)
         # wait first event
-        res = await self.send(data)
-        timeout = 5
+        await self.send(data)
+
+    async def get_contacts(self, lastmod=0, timeout=5) -> Event:
+        await self.get_contacts_async(lastmod)
+
         # Inline wait for events to continue waiting for CONTACTS event 
         # while receiving NEXT_CONTACTs (or it might be missed over serial)
         try:
@@ -26,7 +27,7 @@ class ContactCommands(CommandHandlerBase):
             futures = []
             for event_type in [EventType.ERROR, EventType.NEXT_CONTACT, EventType.CONTACTS] :
                 future = asyncio.create_task(
-                    self.dispatcher.wait_for_event(event_type, {}, timeout)
+                    self.dispatcher.wait_for_event(event_type, {}, timeout=timeout)
                 )
                 futures.append(future)
 
@@ -39,26 +40,20 @@ class ContactCommands(CommandHandlerBase):
     
                 # Check if any future completed successfully
                 if len(done) == 0:
-                    print(" Timeout")
+                    logger.debug("Timeout while getting contacts")
                     for future in pending: # cancel all futures
                         future.cancel()
                     return None
 
                 for future in done:
                     event = await future
-
-                    if event:
-                        if event.type == EventType.NEXT_CONTACT:
-                            if anim:
-                                print(".", end="", flush=True)
-                        else: # Done or Error ... cancel pending and return
-                            if anim:
-                                print(" Done" if event.type == EventType.CONTACTS else " Error")
-                            for future in pending:
-                                future.cancel()
-                            return event
+                    if event is None or event.type != EventType.NEXT_CONTACT:
+                        for future in pending:
+                            future.cancel()
+                        return event
 
                 futures = []
+
                 for future in pending: # put back pending
                     futures.append(future)
 
@@ -69,13 +64,9 @@ class ContactCommands(CommandHandlerBase):
     
         except asyncio.TimeoutError:
             logger.debug(f"Timeout receiving contacts")
-            if anim:
-                print(" Timeout")
             return None
         except Exception as e:
             logger.debug(f"Command error: {e}")
-            if anim:
-                print(" Error")
             return Event(EventType.ERROR, {"error": str(e)})
 
     async def reset_path(self, key: DestinationType) -> Event:

{meshcore-2.1.14.dist-info → meshcore-2.1.16.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: meshcore
-Version: 2.1.14
+Version: 2.1.16
 Summary: Base classes for communicating with meshcore companion radios
 Project-URL: Homepage, https://github.com/fdlamotte/meshcore_py
 Project-URL: Issues, https://github.com/fdlamotte/meshcore_py/issues

{meshcore-2.1.14.dist-info → meshcore-2.1.16.dist-info}/RECORD

@@ -9,14 +9,13 @@ meshcore/parsing.py,sha256=48PQkig-sqvsRlkF9zkvWhJoSq6ERCbGb_aRuCND5NI,4044
 meshcore/reader.py,sha256=mIewSrfsgt-qe-acoxGQncHZhEhRr_3CEZuN1afnr7E,24784
 meshcore/serial_cx.py,sha256=-kaqnqk7Ydufu2DECFfPDv4Xs-7gHUBuz8v0xf8fvvE,3969
 meshcore/tcp_cx.py,sha256=05YRVMnjY5aVBTJcHa0uG4VfFKGbV6hQ1pPIsJg4CDI,4227
-meshcore/commands/.contact.py.swp,sha256=ukLHeYjDX9dKOGMyuN3BNJCFrTvgD5y1X0vj1Lp0j5U,24576
 meshcore/commands/__init__.py,sha256=NNmkTEcL-DLyuwKLUagEzpqe3C6ui2tETbu_mUd4p-I,441
 meshcore/commands/base.py,sha256=0bDHcNGlKoej03xJqzo_wL5ctoPQU5kcK1Ca5sZh1pk,7097
 meshcore/commands/binary.py,sha256=MVKXrT4pFSlzFkVFLBX988Eh57tRwunw4XPKBumbQNU,4890
-meshcore/commands/contact.py,sha256=fmOW3CrDZFuvDHhqP7WpZT_vps7PK9LUvra2CYm0El8,6273
+meshcore/commands/contact.py,sha256=-dRY68xZkDFP6-i53WujyWhEsXZsFRk98B3j3zBzaL4,5860
 meshcore/commands/device.py,sha256=vstyy1crvhGbDgCAtyCWyjj3X8F2CpMw1LFTOwoHh6M,8273
 meshcore/commands/messaging.py,sha256=MIVGM5G8J16qimKjCHdrlEiVJ4g_MsBaZKPvRJHJcLU,8306
-meshcore-2.1.14.dist-info/METADATA,sha256=e_MjaWO0VyG1-ZTsL-hj8vWfvm6gIzUIVu42dhPHOAc,25317
-meshcore-2.1.14.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
-meshcore-2.1.14.dist-info/licenses/LICENSE,sha256=o62-JWT_C-ZqEtzb1Gl_PPtPr0pVT8KDmgji_Y_bejI,1075
-meshcore-2.1.14.dist-info/RECORD,,
+meshcore-2.1.16.dist-info/METADATA,sha256=WPPdkEeUGwo7SwiMZ-4DRC2JoUX-IqevfpBMLS2fLVw,25317
+meshcore-2.1.16.dist-info/WHEEL,sha256=qtCwoSJWgHk21S1Kb4ihdzI2rlJ1ZKaIurTj_ngOhyQ,87
+meshcore-2.1.16.dist-info/licenses/LICENSE,sha256=o62-JWT_C-ZqEtzb1Gl_PPtPr0pVT8KDmgji_Y_bejI,1075
+meshcore-2.1.16.dist-info/RECORD,,