sascha/devlib
1
0
Fork 0
mirror of https://github.com/ARM-software/devlib.git synced 2025-03-04 17:27:51 +00:00
Code Issues Releases Wiki Activity

target: Reduce the number of commands involved in push/pull

Browse Source 
* Combine cp and chmod for pull
* Make both push and pull use concurrent async code
This commit is contained in:
Douglas Raillard 2024-11-20 16:56:21 +00:00 committed by Marc Bonnici
parent 8af9f1a328
commit 4431932e0d
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
devlib/target.py
View File

@ -819,10 +819,11 @@ class Target(object):
if as_root: if as_root:
for sources, dest in mapping.items(): for sources, dest in mapping.items():
for source in sources: async def f(source):
async with self._xfer_cache_path(source) as device_tempfile: async with self._xfer_cache_path(source) as device_tempfile:
do_push([source], device_tempfile) do_push([source], device_tempfile)
await self.execute.asyn("mv -f -- {} {}".format(quote(device_tempfile), quote(dest)), as_root=True) await self.execute.asyn("mv -f -- {} {}".format(quote(device_tempfile), quote(dest)), as_root=True)
await self.async_manager.map_concurrently(f, sources)
else: else:
for sources, dest in mapping.items(): for sources, dest in mapping.items():
do_push(sources, dest) do_push(sources, dest)
@ -897,11 +898,13 @@ class Target(object):
if via_temp: if via_temp:
for sources, dest in mapping.items(): for sources, dest in mapping.items():
for source in sources: async def f(source):
async with self._xfer_cache_path(source) as device_tempfile: async with self._xfer_cache_path(source) as device_tempfile:
await self.execute.asyn(f"{quote(self.busybox)} cp -rL -- {quote(source)} {quote(device_tempfile)}", as_root=as_root) cp_cmd = f"{quote(self.busybox)} cp -rL -- {quote(source)} {quote(device_tempfile)}"
await self.execute.asyn(f"{quote(self.busybox)} chmod 0644 -- {quote(device_tempfile)}", as_root=as_root) chmod_cmd = f"{quote(self.busybox)} chmod 0644 -- {quote(device_tempfile)}"
await self.execute.asyn(f"{cp_cmd} && {chmod_cmd}", as_root=as_root)
do_pull([device_tempfile], dest) do_pull([device_tempfile], dest)
await self.async_manager.map_concurrently(f, sources)
else: else:
for sources, dest in mapping.items(): for sources, dest in mapping.items():
do_pull(sources, dest) do_pull(sources, dest)