mirrors/kitty
1
0
Fork 0
mirror of https://github.com/kovidgoyal/kitty synced 2026-07-28 03:01:57 +02:00
Code Issues Packages Projects Releases Wiki Activity

Report individual file transfer failures

Browse Source
This commit is contained in:
Kovid Goyal
2021-09-16 17:40:19 +05:30
parent 44dfd7a803
commit 0d37431def
1 changed files with 12 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
kittens/transfer/send.py
View File

@@ -379,6 +379,7 @@ class Send(Handler):
self.spinner = Spinner() self.spinner = Spinner()
self.progress_drawn = True self.progress_drawn = True
self.done_files: List[File] = [] self.done_files: List[File] = []
self.failed_files: List[File] = []
def send_payload(self, payload: str) -> None: def send_payload(self, payload: str) -> None:
self.write(self.manager.prefix) self.write(self.manager.prefix)
@@ -479,7 +480,7 @@ class Send(Handler):
def transfer_finished(self) -> None: def transfer_finished(self) -> None:
self.send_payload(FileTransmissionCommand(action=Action.finish).serialize()) self.send_payload(FileTransmissionCommand(action=Action.finish).serialize())
self.quit_after_write_code = 0 self.quit_after_write_code = 1 if self.failed_files else 0
def on_writing_finished(self) -> None: def on_writing_finished(self) -> None:
chunk_transmitted = self.manager.current_chunk_uncompressed_sz is not None chunk_transmitted = self.manager.current_chunk_uncompressed_sz is not None
@@ -561,12 +562,15 @@ class Send(Handler):
def on_file_done(self, file: File) -> None: def on_file_done(self, file: File) -> None:
self.done_files.append(file) self.done_files.append(file)
if file.err_msg:
self.failed_files.append(file)
self.asyncio_loop.call_soon(self.refresh_progress) self.asyncio_loop.call_soon(self.refresh_progress)
def draw_progress(self) -> None: def draw_progress(self) -> None:
with without_line_wrap(self.write): with without_line_wrap(self.write):
for df in self.done_files: for df in self.done_files:
self.draw_progress_for_current_file(df, spinner_char=styled('✔', fg='green'), is_complete=True) sc = styled('✔', fg='green') if not df.err_msg else styled('✘', fg='red')
self.draw_progress_for_current_file(df, spinner_char=sc, is_complete=True)
self.print() self.print()
del self.done_files[:] del self.done_files[:]
is_complete = self.quit_after_write_code is not None is_complete = self.quit_after_write_code is not None
@@ -612,4 +616,10 @@ def send_main(cli_opts: TransferCLIOptions, args: List[str]) -> None:
loop = Loop() loop = Loop()
handler = Send(cli_opts, files) handler = Send(cli_opts, files)
loop.loop(handler) loop.loop(handler)
if handler.failed_files:
print(f'Transfer of {len(handler.failed_files)} out of {len(handler.manager.files)} files failed')
for ff in handler.failed_files:
print(styled(ff.display_name, fg='red'))
print(' ', ff.err_msg)
raise SystemExit(loop.return_code) raise SystemExit(loop.return_code)