#include "addon/downloader.hpp"
#include <algorithm>
+#include <array>
#include <assert.h>
#include <memory>
#include <physfs.h>
} // namespace
void
+TransferStatus::abort()
+{
+ m_downloader.abort(id);
+}
+
+void
TransferStatus::update()
{
m_downloader.update();
m_id(id),
m_url(url),
m_handle(),
- m_error_buffer({'\0'}),
- m_status(new TransferStatus(downloader, id)),
+ m_error_buffer({{'\0'}}),
+ m_status(new TransferStatus(m_downloader, id)),
m_fout(PHYSFS_openWrite(outfile.c_str()), PHYSFS_close)
{
if (!m_fout)
curl_easy_setopt(m_handle, CURLOPT_FOLLOWLOCATION, 1);
curl_easy_setopt(m_handle, CURLOPT_NOPROGRESS, 0);
- curl_easy_setopt(m_handle, CURLOPT_XFERINFODATA, this);
- curl_easy_setopt(m_handle, CURLOPT_XFERINFOFUNCTION, &Transfer::on_progress_wrap);
+ curl_easy_setopt(m_handle, CURLOPT_PROGRESSDATA, this);
+ curl_easy_setopt(m_handle, CURLOPT_PROGRESSFUNCTION, &Transfer::on_progress_wrap);
}
}
return size * nmemb;
}
- void on_progress(curl_off_t dltotal, curl_off_t dlnow,
- curl_off_t ultotal, curl_off_t ulnow)
+ int on_progress(double dltotal, double dlnow,
+ double ultotal, double ulnow)
{
- m_status->dltotal = dltotal;
- m_status->dlnow = dlnow;
+ m_status->dltotal = static_cast<int>(dltotal);
+ m_status->dlnow = static_cast<int>(dlnow);
+
+ m_status->ultotal = static_cast<int>(ultotal);
+ m_status->ulnow = static_cast<int>(ulnow);
- m_status->ultotal = ultotal;
- m_status->ulnow = ulnow;
+ return 0;
}
private:
return static_cast<Transfer*>(userdata)->on_data(ptr, size, nmemb);
}
- static void on_progress_wrap(void* userdata,
- curl_off_t dltotal, curl_off_t dlnow,
- curl_off_t ultotal, curl_off_t ulnow)
+ static int on_progress_wrap(void* userdata,
+ double dltotal, double dlnow,
+ double ultotal, double ulnow)
{
return static_cast<Transfer*>(userdata)->on_progress(dltotal, dlnow, ultotal, ulnow);
}
}
else
{
+ TransferStatusPtr status = (*it)->get_status();
+
curl_multi_remove_handle(m_multi_handle, (*it)->get_curl_handle());
m_transfers.erase(it);
+
+ for(auto& callback : status->callbacks)
+ {
+ try
+ {
+ callback(false);
+ }
+ catch(const std::exception& err)
+ {
+ log_warning << "Illegal exception in Downloader: " << err.what() << std::endl;
+ }
+ }
}
}