Plan cloud transfer requests
This commit is contained in:
53
src/app.cpp
53
src/app.cpp
@@ -11,6 +11,7 @@
|
||||
#include "app_core/app_startup.h"
|
||||
#include "app_core/app_thread.h"
|
||||
#include "app_core/canvas_tool_ui.h"
|
||||
#include "app_core/document_cloud.h"
|
||||
#include "app_core/document_recording.h"
|
||||
#include "app_core/document_route.h"
|
||||
#include "app_core/document_session.h"
|
||||
@@ -272,16 +273,28 @@ void App::initLog()
|
||||
int progress_callback_download(void *clientp, curl_off_t dltotal,
|
||||
curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
|
||||
{
|
||||
std::function<void(float)> progress = *(std::function<void(float)>*)clientp;
|
||||
progress((float)dlnow / (float)dltotal);
|
||||
(void)ultotal;
|
||||
(void)ulnow;
|
||||
auto* progress = static_cast<std::function<void(float)>*>(clientp);
|
||||
const auto plan = pp::app::plan_cloud_transfer_progress(
|
||||
static_cast<std::int64_t>(dltotal),
|
||||
static_cast<std::int64_t>(dlnow));
|
||||
if (progress != nullptr && *progress && plan.notify)
|
||||
(*progress)(plan.fraction);
|
||||
return 0;
|
||||
}
|
||||
|
||||
int progress_callback_upload(void *clientp, curl_off_t dltotal,
|
||||
curl_off_t dlnow, curl_off_t ultotal, curl_off_t ulnow)
|
||||
{
|
||||
std::function<void(float)> progress = *(std::function<void(float)>*)clientp;
|
||||
progress((float)ulnow / (float)ultotal);
|
||||
(void)dltotal;
|
||||
(void)dlnow;
|
||||
auto* progress = static_cast<std::function<void(float)>*>(clientp);
|
||||
const auto plan = pp::app::plan_cloud_transfer_progress(
|
||||
static_cast<std::int64_t>(ultotal),
|
||||
static_cast<std::int64_t>(ulnow));
|
||||
if (progress != nullptr && *progress && plan.notify)
|
||||
(*progress)(plan.fraction);
|
||||
return 0;
|
||||
}
|
||||
#endif //CURL
|
||||
@@ -289,17 +302,32 @@ int progress_callback_upload(void *clientp, curl_off_t dltotal,
|
||||
void App::download(std::string url, std::string dest_filepath, std::function<void(float)> progress)
|
||||
{
|
||||
#if WITH_CURL
|
||||
const auto plan = pp::app::plan_cloud_download_transfer(
|
||||
url,
|
||||
dest_filepath,
|
||||
progress != nullptr,
|
||||
disables_network_tls_verification());
|
||||
if (plan.action != pp::app::CloudTransferAction::start_transfer) {
|
||||
LOG("download skipped: invalid transfer request");
|
||||
return;
|
||||
}
|
||||
|
||||
CURL *curl = curl_easy_init();
|
||||
if (curl)
|
||||
{
|
||||
FILE* fp = fopen(dest_filepath.c_str(), "wb");
|
||||
if (fp == nullptr) {
|
||||
LOG("download failed to open destination %s", dest_filepath.c_str());
|
||||
curl_easy_cleanup(curl);
|
||||
return;
|
||||
}
|
||||
LOG("download %s to %s", url.c_str(), dest_filepath.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_data_write);
|
||||
if (disables_network_tls_verification())
|
||||
if (plan.disable_tls_verification)
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
|
||||
if (progress)
|
||||
if (plan.enable_progress)
|
||||
{
|
||||
curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, progress_callback_download);
|
||||
curl_easy_setopt(curl, CURLOPT_XFERINFODATA, &progress);
|
||||
@@ -349,6 +377,15 @@ bool App::check_license()
|
||||
void App::upload(std::string filename, std::string name, std::function<void(float)> progress)
|
||||
{
|
||||
#if WITH_CURL
|
||||
const auto plan = pp::app::plan_cloud_upload_transfer(
|
||||
filename,
|
||||
progress != nullptr,
|
||||
disables_network_tls_verification());
|
||||
if (plan.action != pp::app::CloudTransferAction::start_transfer) {
|
||||
LOG("upload skipped: invalid transfer request");
|
||||
return;
|
||||
}
|
||||
|
||||
CURL *curl;
|
||||
|
||||
struct curl_httppost *formpost = NULL;
|
||||
@@ -372,9 +409,9 @@ void App::upload(std::string filename, std::string name, std::function<void(floa
|
||||
curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &res);
|
||||
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_data_handler);
|
||||
if (disables_network_tls_verification())
|
||||
if (plan.disable_tls_verification)
|
||||
curl_easy_setopt(curl, CURLOPT_SSL_VERIFYPEER, 0L);
|
||||
if (progress)
|
||||
if (plan.enable_progress)
|
||||
{
|
||||
curl_easy_setopt(curl, CURLOPT_XFERINFOFUNCTION, progress_callback_upload);
|
||||
curl_easy_setopt(curl, CURLOPT_XFERINFODATA, &progress);
|
||||
|
||||
Reference in New Issue
Block a user