i2p/haiku-beta6
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

FileRequest: More consistent progress reporting

Browse Source 
Make BFileRequest reports download progress after every DataReceived()
calls.

DownloadProgress() format has also been changed to use 0 as
`bytesTotal` when the total size is unknown. This is similar to
BHttpRequest functions currently.

Change-Id: I2920ea00c4f841bb666425be6f8da418e913c727
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3072
Reviewed-by: waddlesplash <[email protected]>
This commit is contained in:
Leorize
2020-07-25 18:13:20 +00:00
committed by waddlesplash
parent 1f569db086
commit 9e404c539f
1 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/kits/network/libnetapi/FileRequest.cpp
+3 -3
View File
@@ -87,6 +87,7 @@ BFileRequest::_ProtocolLoop()
fListener->DataReceived(this, chunk, transferredSize, fListener->DataReceived(this, chunk, transferredSize,
chunkSize); chunkSize);
transferredSize += chunkSize; transferredSize += chunkSize;
fListener->DownloadProgress(this, transferredSize, size);
} else } else
break; break;
} }
@@ -99,7 +100,6 @@ BFileRequest::_ProtocolLoop()
else else
return B_IO_ERROR; return B_IO_ERROR;
} }
fListener->DownloadProgress(this, size, size);
} }
return B_OK; return B_OK;
@@ -124,6 +124,7 @@ BFileRequest::_ProtocolLoop()
// Add a parent directory entry. // Add a parent directory entry.
fListener->DataReceived(this, "+/,\t..\r\n", transferredSize, 8); fListener->DataReceived(this, "+/,\t..\r\n", transferredSize, 8);
fListener->DownloadProgress(this, transferredSize, 0);
transferredSize += 8; transferredSize += 8;
} }
@@ -161,12 +162,11 @@ BFileRequest::_ProtocolLoop()
if (fListener != NULL) { if (fListener != NULL) {
fListener->DataReceived(this, eplf.String(), transferredSize, fListener->DataReceived(this, eplf.String(), transferredSize,
eplf.Length()); eplf.Length());
fListener->DownloadProgress(this, transferredSize, 0);
} }
transferredSize += eplf.Length(); transferredSize += eplf.Length();
} }
if (fListener != NULL)
fListener->DownloadProgress(this, transferredSize, transferredSize);
if (!fQuit) if (!fQuit)
fResult.SetLength(transferredSize); fResult.SetLength(transferredSize);