The download progress and total used to be doubles, but now they are off_t. This resulted in the division being done in integers, and always getting 0 as the result. Fixes #11940.
170 lines
3.1 KiB
C++
170 lines
3.1 KiB
C++
/*
|
|
* Copyright 2011-2015, Haiku, Inc. All Rights Reserved.
|
|
* Distributed under the terms of the MIT License.
|
|
*
|
|
* Authors:
|
|
* Axel Dörfler <[email protected]>
|
|
* Rene Gollent <[email protected]>
|
|
* Oliver Tappe <[email protected]>
|
|
*/
|
|
|
|
|
|
#include <package/FetchFileJob.h>
|
|
|
|
#include <stdio.h>
|
|
#ifndef HAIKU_BOOTSTRAP_BUILD
|
|
#include <curl/curl.h>
|
|
#endif
|
|
#include <sys/wait.h>
|
|
|
|
#include <Path.h>
|
|
|
|
|
|
namespace BPackageKit {
|
|
|
|
namespace BPrivate {
|
|
|
|
|
|
FetchFileJob::FetchFileJob(const BContext& context, const BString& title,
|
|
const BString& fileURL, const BEntry& targetEntry)
|
|
:
|
|
inherited(context, title),
|
|
fFileURL(fileURL),
|
|
fTargetEntry(targetEntry),
|
|
fTargetFile(&targetEntry, B_CREATE_FILE | B_ERASE_FILE | B_WRITE_ONLY),
|
|
fDownloadProgress(0.0)
|
|
{
|
|
}
|
|
|
|
|
|
FetchFileJob::~FetchFileJob()
|
|
{
|
|
}
|
|
|
|
|
|
float
|
|
FetchFileJob::DownloadProgress() const
|
|
{
|
|
return fDownloadProgress;
|
|
}
|
|
|
|
|
|
const char*
|
|
FetchFileJob::DownloadURL() const
|
|
{
|
|
return fFileURL.String();
|
|
}
|
|
|
|
|
|
const char*
|
|
FetchFileJob::DownloadFileName() const
|
|
{
|
|
return fTargetEntry.Name();
|
|
}
|
|
|
|
|
|
off_t
|
|
FetchFileJob::DownloadBytes() const
|
|
{
|
|
return fBytes;
|
|
}
|
|
|
|
|
|
off_t
|
|
FetchFileJob::DownloadTotalBytes() const
|
|
{
|
|
return fTotalBytes;
|
|
}
|
|
|
|
|
|
status_t
|
|
FetchFileJob::Execute()
|
|
{
|
|
status_t result = fTargetFile.InitCheck();
|
|
if (result != B_OK)
|
|
return result;
|
|
|
|
#ifndef HAIKU_BOOTSTRAP_BUILD
|
|
CURL* handle = curl_easy_init();
|
|
|
|
if (handle == NULL)
|
|
return B_NO_MEMORY;
|
|
|
|
result = curl_easy_setopt(handle, CURLOPT_NOPROGRESS, 0);
|
|
|
|
result = curl_easy_setopt(handle, CURLOPT_XFERINFOFUNCTION,
|
|
&_TransferCallback);
|
|
if (result != CURLE_OK)
|
|
return B_BAD_VALUE;
|
|
|
|
result = curl_easy_setopt(handle, CURLOPT_PROGRESSDATA, this);
|
|
if (result != CURLE_OK)
|
|
return B_ERROR;
|
|
|
|
result = curl_easy_setopt(handle, CURLOPT_WRITEFUNCTION,
|
|
&_WriteCallback);
|
|
if (result != CURLE_OK)
|
|
return B_ERROR;
|
|
|
|
result = curl_easy_setopt(handle, CURLOPT_WRITEDATA, this);
|
|
if (result != CURLE_OK)
|
|
return B_ERROR;
|
|
|
|
result = curl_easy_setopt(handle, CURLOPT_FOLLOWLOCATION, 1);
|
|
if (result != CURLE_OK)
|
|
return B_ERROR;
|
|
|
|
result = curl_easy_setopt(handle, CURLOPT_URL, fFileURL.String());
|
|
if (result != CURLE_OK)
|
|
return B_ERROR;
|
|
|
|
result = curl_easy_perform(handle);
|
|
curl_easy_cleanup(handle);
|
|
if (result != CURLE_OK) {
|
|
// TODO: map more curl error codes to ours for more
|
|
// precise error reporting
|
|
return B_ERROR;
|
|
}
|
|
#endif /* !HAIKU_BOOTSTRAP_BUILD */
|
|
|
|
return B_OK;
|
|
}
|
|
|
|
|
|
int
|
|
FetchFileJob::_TransferCallback(void* _job, off_t downloadTotal,
|
|
off_t downloaded, off_t uploadTotal, off_t uploaded)
|
|
{
|
|
FetchFileJob* job = reinterpret_cast<FetchFileJob*>(_job);
|
|
if (downloadTotal != 0) {
|
|
job->fBytes = downloaded;
|
|
job->fTotalBytes = downloadTotal;
|
|
job->fDownloadProgress = (float)downloaded / downloadTotal;
|
|
job->NotifyStateListeners();
|
|
}
|
|
return 0;
|
|
}
|
|
|
|
|
|
size_t
|
|
FetchFileJob::_WriteCallback(void *buffer, size_t size, size_t nmemb,
|
|
void *userp)
|
|
{
|
|
FetchFileJob* job = reinterpret_cast<FetchFileJob*>(userp);
|
|
ssize_t dataWritten = job->fTargetFile.Write(buffer, size * nmemb);
|
|
return size_t(dataWritten);
|
|
}
|
|
|
|
|
|
void
|
|
FetchFileJob::Cleanup(status_t jobResult)
|
|
{
|
|
if (jobResult != B_OK)
|
|
fTargetEntry.Remove();
|
|
}
|
|
|
|
|
|
} // namespace BPrivate
|
|
|
|
} // namespace BPackageKit
|