Aren/haiku
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

PackageKit: fix download logic for remote files

Browse Source 
This was broken in hrev54968, as some code was lost while switching to the new
way the network services kits writes files to disk.

This should fix #16822

Change-Id: I104d82e268ded287fd64db1cb902f94b71bad53b
Reviewed-on: https://review.haiku-os.org/c/haiku/+/3760
Reviewed-by: Adrien Destugues <pulkomandy@gmail.com>
This commit is contained in:
Niels Sascha Reedijk 2021-03-02 13:51:30 +00:00
parent 8cd3603b99
commit ec8bba1587
1 changed files with 25 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

29
src/kits/package/FetchFileJob.cpp
View File

@ -94,10 +94,31 @@ FetchFileJob::Execute()
if (result != B_OK)
return result;
BUrlRequest* request = BUrlProtocolRoster::MakeRequest(fFileURL.String(),
&fTargetFile, this);
if (request == NULL)
return B_BAD_VALUE;
result = FetchUtils::SetFileType(fTargetFile,
"application/x-vnd.haiku-package");
if (result != B_OK) {
fprintf(stderr, "failed to set file type for '%s': %s\n",
DownloadFileName(), strerror(result));
}
do {
BUrlRequest* request = BUrlProtocolRoster::MakeRequest(fFileURL.String(),
&fTargetFile, this);
if (request == NULL)
return B_BAD_VALUE;
// Try to resume the download where we left off
off_t currentPosition;
BHttpRequest* http = dynamic_cast<BHttpRequest*>(request);
if (http != NULL && fTargetFile.GetSize(&currentPosition) == B_OK
&& currentPosition > 0) {
http->SetRangeStart(currentPosition);
fTargetFile.Seek(0, SEEK_END);
}
thread_id thread = request->Run();
wait_for_thread(thread, NULL);
} while (fError == B_IO_ERROR || fError == B_DEV_TIMEOUT);
if (fError == B_OK) {
result = FetchUtils::MarkDownloadComplete(fTargetFile);