0.10.4

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

diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index 4878c7df476269209cbdd4f249b2973541e6ea59..f62d2db8dd86bb78be6e440319ff0ae8dbb8a06d 100644 (file)
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -115,7 +115,7 @@ SCPDCPJob::run ()
        
        SSHSession ss;
        
-       set_status ("Connecting");
+       set_status ("connecting");
        
        ssh_options_set (ss.session, SSH_OPTIONS_HOST, Config::instance()->tms_ip().c_str ());
        ssh_options_set (ss.session, SSH_OPTIONS_USER, Config::instance()->tms_user().c_str ());
@@ -161,14 +161,14 @@ SCPDCPJob::run ()
        
        string const dcp_dir = _fs->dir (_fs->name);
        
-       int bytes_to_transfer = 0;
+       boost::uintmax_t bytes_to_transfer = 0;
        for (filesystem::directory_iterator i = filesystem::directory_iterator (dcp_dir); i != filesystem::directory_iterator(); ++i) {
                bytes_to_transfer += filesystem::file_size (*i);
        }
        
-       int buffer_size = 64 * 1024;
+       boost::uintmax_t buffer_size = 64 * 1024;
        char buffer[buffer_size];
-       int bytes_transferred = 0;
+       boost::uintmax_t bytes_transferred = 0;
        
        for (filesystem::directory_iterator i = filesystem::directory_iterator (dcp_dir); i != filesystem::directory_iterator(); ++i) {
                
@@ -179,13 +179,13 @@ SCPDCPJob::run ()
                string const leaf = i->leaf ();
 #endif
                
-               set_status ("Copying " + leaf);
+               set_status ("copying " + leaf);
                
-               int to_do = filesystem::file_size (*i);
+               boost::uintmax_t to_do = filesystem::file_size (*i);
                ssh_scp_push_file (sc.scp, leaf.c_str(), to_do, S_IRUSR | S_IWUSR);
-               
-               int fd = open (filesystem::path (*i).string().c_str(), O_RDONLY);
-               if (fd == 0) {
+
+               FILE* f = fopen (filesystem::path (*i).string().c_str(), "rb");
+               if (f == 0) {
                        stringstream s;
                        s << "Could not open " << *i << " to send";
                        throw NetworkError (s.str ());
@@ -193,7 +193,11 @@ SCPDCPJob::run ()
 
                while (to_do > 0) {
                        int const t = min (to_do, buffer_size);
-                       read (fd, buffer, t);
+                       size_t const read = fread (buffer, 1, t, f);
+                       if (read != size_t (t)) {
+                               throw ReadFileError (filesystem::path (*i).string());
+                       }
+                       
                        r = ssh_scp_write (sc.scp, buffer, t);
                        if (r != SSH_OK) {
                                stringstream s;
@@ -205,10 +209,12 @@ SCPDCPJob::run ()
                        
                        set_progress ((double) bytes_transferred / bytes_to_transfer);
                }
+
+               fclose (f);
        }
        
        set_progress (1);
-       set_status ("OK");
+       set_status ("");
        set_state (FINISHED_OK);
 }
 
@@ -216,7 +222,12 @@ string
 SCPDCPJob::status () const
 {
        boost::mutex::scoped_lock lm (_status_mutex);
-       return _status;
+       stringstream s;
+       s << Job::status ();
+       if (!_status.empty ()) {
+               s << "; " << _status;
+       }
+       return s.str ();
 }
 
 void