KittyPatch/kitty
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fix chunking of signature for transmission

Browse Source
This commit is contained in:
Kovid Goyal
2021-10-02 11:47:29 +05:30
parent c79a0108a1
commit 14f9f64bce
1 changed files with 8 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
kitty/file_transmission.py
View File

@@ -584,7 +584,7 @@ class FileTransmission:
ar = self.active_receives.get(receive_id) ar = self.active_receives.get(receive_id)
if ar is None: if ar is None:
return return
func = partial(self.transmit_rsync_signature, fs, file_id, receive_id, pending) func = partial(self.transmit_rsync_signature, fs, receive_id, file_id, pending)
while pending: while pending:
if self.write_ftc_to_child(pending[0], use_pending=False): if self.write_ftc_to_child(pending[0], use_pending=False):
pending.popleft() pending.popleft()
@@ -592,7 +592,7 @@ class FileTransmission:
self.callback_after(func, timeout=0.1) self.callback_after(func, timeout=0.1)
return return
try: try:
next_bit_of_data = next(fs) chunk = next(fs)
except StopIteration: except StopIteration:
self.write_ftc_to_child(FileTransmissionCommand(id=receive_id, action=Action.end_data, file_id=file_id)) self.write_ftc_to_child(FileTransmissionCommand(id=receive_id, action=Action.end_data, file_id=file_id))
return return
@@ -600,20 +600,19 @@ class FileTransmission:
if ar.send_errors: if ar.send_errors:
self.send_fail_on_os_error(err, 'Failed to read signature', ar, file_id) self.send_fail_on_os_error(err, 'Failed to read signature', ar, file_id)
return return
if not len(chunk):
self.write_ftc_to_child(FileTransmissionCommand(id=receive_id, action=Action.end_data, file_id=file_id))
return
has_capacity = True has_capacity = True
pos = 0 while len(chunk) > 0:
is_last = False data = FileTransmissionCommand(id=receive_id, action=Action.data, file_id=file_id, data=chunk[:4096])
while not is_last:
r = next_bit_of_data[pos:pos + 4096]
is_last = len(r) < 4096
pos += len(r)
data = FileTransmissionCommand(id=receive_id, action=Action.end_data if is_last else Action.data, file_id=file_id, data=r)
if has_capacity: if has_capacity:
if not self.write_ftc_to_child(data, use_pending=False): if not self.write_ftc_to_child(data, use_pending=False):
has_capacity = False has_capacity = False
pending.append(data) pending.append(data)
else: else:
pending.append(data) pending.append(data)
chunk = chunk[4096:]
self.callback_after(func) self.callback_after(func)
def send_status_response( def send_status_response(