gnetcli-adapter 2.5.0__tar.gz → 2.5.2__tar.gz

{gnetcli_adapter-2.5.0 → gnetcli_adapter-2.5.2}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: gnetcli_adapter
-Version: 2.5.0
+Version: 2.5.2
 Summary: Gnetcli-server adapter for Annet
 Author-email: Aleksandr Balezin <gescheit12@gmail.com>
 Requires-Python: >=3.10

{gnetcli_adapter-2.5.0 → gnetcli_adapter-2.5.2}/src/gnetcli_adapter/gnetcli_adapter.py

@@ -143,22 +143,24 @@ def check_gnetcli_server(server_path: str, config: str = DEFAULT_GNETCLI_SERVER_
 
 def cleanup():
     if _local_gnetcli_p is not None:
+        _local_gnetcli_p.terminate()
+        time.sleep(0.05)
         _local_gnetcli_p.kill()
-
+        time.sleep(0.05)
 
 atexit.register(cleanup)
 
 
 async def gather_with_concurrency(n: int, *coros: list[asyncio.Task]):
     if n == 0:
-        return await asyncio.gather(*coros)
+        return await asyncio.gather(*coros, return_exceptions=True)
     semaphore = asyncio.Semaphore(n)
 
     async def sem_coro(coro):
         async with semaphore:
             return await coro
 
-    return await asyncio.gather(*(sem_coro(c) for c in coros))
+    return await asyncio.gather(*(sem_coro(c) for c in coros), return_exceptions=True)
 
 
 def get_device_ip(dev: Device) -> Optional[str]:
@@ -168,6 +170,16 @@ def get_device_ip(dev: Device) -> Optional[str]:
         for iface in dev.interfaces:
             for ip in iface.ip_addresses:
                 return ip.address.split("/")[0]
+    else:
+        try:
+            if dev.primary_ip:
+                return dev.primary_ip.address.split("/")[0]
+            if dev.interfaces:
+                for iface in dev.interfaces:
+                    for ip in iface.ip_addresses:
+                        return ip.address.split("/")[0]
+        except Exception as e:
+            _logger.warning("get device ip error: %s", e)
     return None
 
 
@@ -270,24 +282,28 @@ class GnetcliFetcher(Fetcher, AdapterWithConfig, AdapterWithName):
             if files_to_download or device.is_pc():
                 if files_to_download:
                     files = files_to_download.get(device, [])
-                    task = asyncio.create_task(self.adownload_dev(device=device, files=files))
+                    task = self.adownload_dev(device=device, files=files)
                     tasks[task] = device
                 else:
                     running[device] = {}
             else:
-                task = asyncio.create_task(self.afetch_dev(device=device))
+                task = self.afetch_dev(device=device)
                 tasks[task] = device
 
         if not tasks:
             return running, failed_running
 
-        done, pending = await asyncio.wait(list(tasks), return_when=asyncio.ALL_COMPLETED)
-        for task in done:
-            device = tasks[task]
-            if (exc := task.exception()) is not None:
-                failed_running[device] = exc
+        rtasks_dev = []
+        rtasks = []
+        for task, dev in tasks.items():
+            rtasks.append(task)
+            rtasks_dev.append(dev)
+        result = await gather_with_concurrency(max_slots, *rtasks)
+        for device, dev_res in zip(rtasks_dev, result):
+            if isinstance(dev_res, Exception):
+                failed_running[device] = dev_res
             else:
-                running[device] = task.result()
+                running[device] = dev_res
         return running, failed_running
 
     async def afetch_dev(self, device: Device) -> str: