Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
18 changes: 10 additions & 8 deletions fsspec/asyn.py
Original file line number Diff line number Diff line change
Expand Up @@ -378,18 +378,20 @@ async def _put(
lpath = make_path_posix(lpath)
fs = LocalFileSystem()
lpaths = fs.expand_path(lpath, recursive=recursive)
dirs = [l for l in lpaths if os.path.isdir(l)]
rdirs = other_paths(dirs, rpath)
rpaths = other_paths(lpaths, rpath)

is_dir = {l: os.path.isdir(l) for l in lpaths}
rdirs = [r for l, r in zip(lpaths, rpaths) if is_dir[l]]
file_pairs = [(l, r) for l, r in zip(lpaths, rpaths) if not is_dir[l]]

await asyncio.gather(*[self._makedirs(d, exist_ok=True) for d in rdirs])
files = sorted(set(lpaths) - set(dirs))
rpaths = other_paths(files, rpath)
batch_size = kwargs.pop("batch_size", self.batch_size)

coros = []
callback.call("set_size", len(files))
for lpath, rpath in zip(files, rpaths):
callback.branch(lpath, rpath, kwargs)
coros.append(self._put_file(lpath, rpath, **kwargs))
callback.call("set_size", len(file_pairs))
for lfile, rfile in file_pairs:
callback.branch(lfile, rfile, kwargs)
coros.append(self._put_file(lfile, rfile, **kwargs))

return await _run_coros_in_chunks(
coros, batch_size=batch_size, callback=callback
Expand Down