/*
- Copyright (C) 2015 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2015-2021 Carl Hetherington <cth@carlh.net>
This file is part of DCP-o-matic.
*/
+
#include "curl_uploader.h"
+#include "dcpomatic_log.h"
#include "exceptions.h"
#include "config.h"
#include "cross.h"
#include "compose.hpp"
+#include "dcpomatic_assert.h"
#include <iostream>
#include "i18n.h"
+
using std::string;
using std::cout;
-using boost::function;
+using std::function;
+
static size_t
read_callback (void* ptr, size_t size, size_t nmemb, void* object)
return u->read_callback (ptr, size, nmemb);
}
+
+static int
+curl_debug_shim (CURL* curl, curl_infotype type, char* data, size_t size, void* userp)
+{
+ return reinterpret_cast<CurlUploader*>(userp)->debug(curl, type, data, size);
+}
+
+
CurlUploader::CurlUploader (function<void (string)> set_status, function<void (float)> set_progress)
: Uploader (set_status, set_progress)
- , _file (0)
- , _transferred (0)
- , _total_size (0)
{
_curl = curl_easy_init ();
if (!_curl) {
curl_easy_setopt (_curl, CURLOPT_UPLOAD, 1L);
curl_easy_setopt (_curl, CURLOPT_FTP_CREATE_MISSING_DIRS, 1L);
curl_easy_setopt (_curl, CURLOPT_READDATA, this);
- curl_easy_setopt (_curl, CURLOPT_USERNAME, Config::instance()->tms_user().c_str ());
- curl_easy_setopt (_curl, CURLOPT_PASSWORD, Config::instance()->tms_password().c_str ());
+ curl_easy_setopt (_curl, CURLOPT_USERNAME, Config::instance()->tms_user().c_str());
+ curl_easy_setopt (_curl, CURLOPT_PASSWORD, Config::instance()->tms_password().c_str());
+ if (!Config::instance()->tms_passive()) {
+ curl_easy_setopt(_curl, CURLOPT_FTPPORT, "-");
+ }
+ curl_easy_setopt(_curl, CURLOPT_VERBOSE, 1L);
+ curl_easy_setopt(_curl, CURLOPT_DEBUGFUNCTION, curl_debug_shim);
+ curl_easy_setopt(_curl, CURLOPT_DEBUGDATA, this);
}
+
CurlUploader::~CurlUploader ()
{
- if (_file) {
- fclose (_file);
- }
curl_easy_cleanup (_curl);
}
+
void
CurlUploader::create_directory (boost::filesystem::path)
{
/* this is done by libcurl */
}
+
void
CurlUploader::upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size)
{
String::compose ("ftp://%1/%2/%3", Config::instance()->tms_ip(), Config::instance()->tms_path(), to.generic_string ()).c_str ()
);
- _file = fopen_boost (from, "rb");
- if (!_file) {
+ dcp::File file(from, "rb");
+ if (!file) {
throw NetworkError (String::compose (_("Could not open %1 to send"), from));
}
+ _file = file.get();
_transferred = &transferred;
_total_size = total_size;
- CURLcode const r = curl_easy_perform (_curl);
+ auto const r = curl_easy_perform (_curl);
if (r != CURLE_OK) {
throw NetworkError (String::compose (_("Could not write to remote file (%1)"), curl_easy_strerror (r)));
}
- fclose (_file);
- _file = 0;
+ _file = nullptr;
}
+
size_t
CurlUploader::read_callback (void* ptr, size_t size, size_t nmemb)
{
- size_t const r = fread (ptr, size, nmemb, _file);
+ DCPOMATIC_ASSERT (_file);
+ size_t const r = fread(ptr, size, nmemb, _file);
*_transferred += size * nmemb;
if (_total_size > 0) {
return r;
}
+
+
+int
+CurlUploader::debug(CURL *, curl_infotype type, char* data, size_t size)
+{
+ if (type == CURLINFO_TEXT && size > 0) {
+ LOG_GENERAL("CurlUploader: %1", string(data, size - 1));
+ }
+ return 0;
+}
+