Merge.

[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 90122cea7e0aa09db03c0103264b5e160b0ff42c..3d941888e76585350f461417893d9bd4daab32dd 100644 (file)
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -27,14 +27,17 @@
 #include <fcntl.h>
 #include <boost/filesystem.hpp>
 #include <libssh/libssh.h>
+#include "compose.hpp"
 #include "scp_dcp_job.h"
 #include "exceptions.h"
 #include "config.h"
 #include "log.h"
-#include "film_state.h"
+#include "film.h"
 
-using namespace std;
-using namespace boost;
+using std::string;
+using std::stringstream;
+using std::min;
+using boost::shared_ptr;
 
 class SSHSession
 {
@@ -91,8 +94,8 @@ public:
 };
 
 
-SCPDCPJob::SCPDCPJob (shared_ptr<const FilmState> s, Log* l, shared_ptr<Job> req)
-       : Job (s, shared_ptr<const Options> (), l, req)
+SCPDCPJob::SCPDCPJob (shared_ptr<Film> f, shared_ptr<Job> req)
+       : Job (f, req)
        , _status ("Waiting")
 {
 
@@ -107,7 +110,7 @@ SCPDCPJob::name () const
 void
 SCPDCPJob::run ()
 {
-       _log->log ("SCP DCP job starting");
+       _film->log()->log ("SCP DCP job starting");
        
        SSHSession ss;
        
@@ -140,37 +143,32 @@ SCPDCPJob::run ()
                throw NetworkError (String::compose ("Could not start SCP session (%1)", ssh_get_error (ss.session)));
        }
        
-       r = ssh_scp_push_directory (sc.scp, _fs->name.c_str(), S_IRWXU);
+       r = ssh_scp_push_directory (sc.scp, _film->dcp_name().c_str(), S_IRWXU);
        if (r != SSH_OK) {
-               throw NetworkError (String::compose ("Could not create remote directory %1 (%2)", _fs->name, ssh_get_error (ss.session)));
+               throw NetworkError (String::compose ("Could not create remote directory %1 (%2)", _film->dcp_name(), ssh_get_error (ss.session)));
        }
        
-       string const dcp_dir = _fs->dir (_fs->name);
+       string const dcp_dir = _film->dir (_film->dcp_name());
        
        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);
+       for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dcp_dir); i != boost::filesystem::directory_iterator(); ++i) {
+               bytes_to_transfer += boost::filesystem::file_size (*i);
        }
        
        boost::uintmax_t buffer_size = 64 * 1024;
        char buffer[buffer_size];
        boost::uintmax_t bytes_transferred = 0;
        
-       for (filesystem::directory_iterator i = filesystem::directory_iterator (dcp_dir); i != filesystem::directory_iterator(); ++i) {
+       for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dcp_dir); i != boost::filesystem::directory_iterator(); ++i) {
                
-               /* Aah, the sweet smell of progress */
-#if BOOST_FILESYSTEM_VERSION == 3              
-               string const leaf = filesystem::path(*i).leaf().generic_string ();
-#else
-               string const leaf = i->leaf ();
-#endif
+               string const leaf = boost::filesystem::path(*i).leaf().generic_string ();
                
                set_status ("copying " + leaf);
                
-               boost::uintmax_t to_do = filesystem::file_size (*i);
+               boost::uintmax_t to_do = boost::filesystem::file_size (*i);
                ssh_scp_push_file (sc.scp, leaf.c_str(), to_do, S_IRUSR | S_IWUSR);
 
-               FILE* f = fopen (filesystem::path (*i).string().c_str(), "rb");
+               FILE* f = fopen (boost::filesystem::path (*i).string().c_str(), "rb");
                if (f == 0) {
                        throw NetworkError (String::compose ("Could not open %1 to send", *i));
                }
@@ -179,7 +177,7 @@ SCPDCPJob::run ()
                        int const t = min (to_do, buffer_size);
                        size_t const read = fread (buffer, 1, t, f);
                        if (read != size_t (t)) {
-                               throw ReadFileError (filesystem::path (*i).string());
+                               throw ReadFileError (boost::filesystem::path (*i).string());
                        }
                        
                        r = ssh_scp_write (sc.scp, buffer, t);