Print file name during transfer

This commit is contained in:
SG
2023-05-15 10:31:07 +02:00
parent 4bf8c69b2c
commit 24c9ae55b5

View File

@@ -147,7 +147,7 @@ async def main():
message = json.loads(message) message = json.loads(message)
if message["msgtype"] == "announce" and message["peer_group_id"] == peer_group_id: if message["msgtype"] == "announce" and message["peer_group_id"] == peer_group_id:
break break
bar = Bar('Transferring', max=number_of_chunks, check_tty=False, suffix='%(percent).1f%% complete - %(eta_td)s remaining') bar = Bar(filename, max=number_of_chunks, check_tty=False, suffix='%(percent).1f%% complete - %(eta_td)s remaining')
msgtype = "data" msgtype = "data"
async for chunk in read_chunks(file_path, chunk_size): async for chunk in read_chunks(file_path, chunk_size):
msg = (msgtype, peer_group_id, role, filename, chunk_size, chunk_id, number_of_chunks, chunk) msg = (msgtype, peer_group_id, role, filename, chunk_size, chunk_id, number_of_chunks, chunk)
@@ -174,10 +174,11 @@ async def main():
msg = pickle.loads(decrypt_chunk(k, payload)) msg = pickle.loads(decrypt_chunk(k, payload))
chunk_id = msg["chunk_id"] chunk_id = msg["chunk_id"]
number_of_chunks = msg["number_of_chunks"] number_of_chunks = msg["number_of_chunks"]
filename = msg["filename"]
if bar is None: if bar is None:
bar = Bar('Receiving', max=number_of_chunks, check_tty=False, suffix='%(percent).1f%% complete - %(eta_td)s remaining') bar = Bar(filename, max=number_of_chunks, check_tty=False, suffix='%(percent).1f%% complete - %(eta_td)s remaining')
if f is None: if f is None:
f = open(msg["filename"], "wb") f = open(filename, "wb")
f.write(msg["chunk"]) f.write(msg["chunk"])
else: else:
f.write(msg["chunk"]) f.write(msg["chunk"])