Fix failure to examine non-flat-ratio VFs (#2775).

[dcpomatic.git] / src / lib / scp_uploader.cc

diff --git a/src/lib/scp_uploader.cc b/src/lib/scp_uploader.cc
index 8bb41e3b1d3118aa43f453865ccc09901b1c6d93..6c63a6c3e881ac698c925a79b93a9cfe3d2bf999 100644 (file)
--- a/src/lib/scp_uploader.cc
+++ b/src/lib/scp_uploader.cc
@@ -25,6 +25,9 @@
 #include "config.h"
 #include "cross.h"
 #include "compose.hpp"
+#include <dcp/file.h>
+#include <dcp/filesystem.h>
+#include <dcp/warnings.h>
 #include <sys/stat.h>
 
 #include "i18n.h"
@@ -66,12 +69,16 @@ LIBDCP_ENABLE_WARNINGS
                throw NetworkError (String::compose(_("Failed to authenticate with server (%1)"), ssh_get_error(_session)));
        }
 
+LIBDCP_DISABLE_WARNINGS
        _scp = ssh_scp_new (_session, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str());
+LIBDCP_ENABLE_WARNINGS
        if (!_scp) {
                throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_scp_new", ssh_get_error(_session)));
        }
 
+LIBDCP_DISABLE_WARNINGS
        r = ssh_scp_init (_scp);
+LIBDCP_ENABLE_WARNINGS
        if (r != SSH_OK) {
                throw NetworkError (String::compose(_("SSH error [%1] (%2)"), "ssh_scp_init", ssh_get_error(_session)));
        }
@@ -80,7 +87,9 @@ LIBDCP_ENABLE_WARNINGS
 
 SCPUploader::~SCPUploader ()
 {
+LIBDCP_DISABLE_WARNINGS
        ssh_scp_free (_scp);
+LIBDCP_ENABLE_WARNINGS
        ssh_disconnect (_session);
        ssh_free (_session);
 }
@@ -90,7 +99,9 @@ void
 SCPUploader::create_directory (boost::filesystem::path directory)
 {
        /* Use generic_string so that we get forward-slashes in the path, even on Windows */
+LIBDCP_DISABLE_WARNINGS
        int const r = ssh_scp_push_directory (_scp, directory.generic_string().c_str(), S_IRWXU);
+LIBDCP_ENABLE_WARNINGS
        if (r != SSH_OK) {
                throw NetworkError (String::compose(_("Could not create remote directory %1 (%2)"), directory, ssh_get_error(_session)));
        }
@@ -100,12 +111,14 @@ SCPUploader::create_directory (boost::filesystem::path directory)
 void
 SCPUploader::upload_file (boost::filesystem::path from, boost::filesystem::path to, boost::uintmax_t& transferred, boost::uintmax_t total_size)
 {
-       auto to_do = boost::filesystem::file_size (from);
+       auto to_do = dcp::filesystem::file_size(from);
        /* Use generic_string so that we get forward-slashes in the path, even on Windows */
+LIBDCP_DISABLE_WARNINGS
        ssh_scp_push_file (_scp, to.generic_string().c_str(), to_do, S_IRUSR | S_IWUSR);
+LIBDCP_ENABLE_WARNINGS
 
-       auto f = fopen_boost (from, "rb");
-       if (f == nullptr) {
+       dcp::File f(from, "rb");
+       if (!f) {
                throw NetworkError (String::compose(_("Could not open %1 to send"), from));
        }
 
@@ -114,15 +127,15 @@ SCPUploader::upload_file (boost::filesystem::path from, boost::filesystem::path
 
        while (to_do > 0) {
                int const t = min (to_do, buffer_size);
-               size_t const read = fread (buffer, 1, t, f);
+               size_t const read = f.read(buffer, 1, t);
                if (read != size_t (t)) {
-                       fclose (f);
                        throw ReadFileError (from);
                }
 
+LIBDCP_DISABLE_WARNINGS
                int const r = ssh_scp_write (_scp, buffer, t);
+LIBDCP_ENABLE_WARNINGS
                if (r != SSH_OK) {
-                       fclose (f);
                        throw NetworkError (String::compose(_("Could not write to remote file (%1)"), ssh_get_error(_session)));
                }
                to_do -= t;
@@ -132,6 +145,4 @@ SCPUploader::upload_file (boost::filesystem::path from, boost::filesystem::path
                        _set_progress ((double) transferred / total_size);
                }
        }
-
-       fclose (f);
 }