/*
- Copyright (C) 2012 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
#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"
+#include "cross.h"
-using namespace std;
-using namespace boost;
+#include "i18n.h"
+
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
+
+using std::string;
+using std::min;
+using boost::shared_ptr;
class SSHSession
{
{
session = ssh_new ();
if (session == 0) {
- throw NetworkError ("Could not start SSH session");
+ throw NetworkError (_("could not start SSH session"));
}
}
ssh_session session;
-private:
+private:
bool _connected;
};
{
scp = ssh_scp_new (s, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str ());
if (!scp) {
- stringstream s;
- s << "Could not start SCP session (" << ssh_get_error (s) << ")";
- throw NetworkError (s.str ());
+ throw NetworkError (String::compose (_("could not start SCP session (%1)"), ssh_get_error (s)));
}
}
};
-SCPDCPJob::SCPDCPJob (shared_ptr<const FilmState> s, Log* l)
- : Job (s, shared_ptr<const Options> (), l)
- , _status ("Waiting")
+SCPDCPJob::SCPDCPJob (shared_ptr<const Film> film)
+ : Job (film)
+ , _status (_("Waiting"))
{
}
string
SCPDCPJob::name () const
{
- stringstream s;
- s << "Copy DCP to TMS";
- return s.str ();
+ return _("Copy DCP to TMS");
+}
+
+string
+SCPDCPJob::json_name () const
+{
+ return N_("scp_dcp");
}
void
SCPDCPJob::run ()
{
- _log->log ("SCP DCP job starting");
-
+ LOG_GENERAL_NC (N_("SCP DCP job starting"));
+
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 ());
int const port = 22;
ssh_options_set (ss.session, SSH_OPTIONS_PORT, &port);
-
+
int r = ss.connect ();
if (r != SSH_OK) {
- stringstream s;
- s << "Could not connect to server " << Config::instance()->tms_ip() << " (" << ssh_get_error (ss.session) << ")";
- throw NetworkError (s.str ());
+ throw NetworkError (String::compose (_("Could not connect to server %1 (%2)"), Config::instance()->tms_ip(), ssh_get_error (ss.session)));
}
-
+
int const state = ssh_is_server_known (ss.session);
if (state == SSH_SERVER_ERROR) {
- stringstream s;
- s << "SSH error (" << ssh_get_error (ss.session) << ")";
- throw NetworkError (s.str ());
+ throw NetworkError (String::compose (_("SSH error (%1)"), ssh_get_error (ss.session)));
}
-
+
r = ssh_userauth_password (ss.session, 0, Config::instance()->tms_password().c_str ());
if (r != SSH_AUTH_SUCCESS) {
- stringstream s;
- s << "Failed to authenticate with server (" << ssh_get_error (ss.session) << ")";
- throw NetworkError (s.str ());
+ throw NetworkError (String::compose (_("Failed to authenticate with server (%1)"), ssh_get_error (ss.session)));
}
-
+
SSHSCP sc (ss.session);
-
+
r = ssh_scp_init (sc.scp);
if (r != SSH_OK) {
- stringstream s;
- s << "Could not start SCP session (" << ssh_get_error (ss.session) << ")";
- throw NetworkError (s.str ());
+ 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) {
- stringstream s;
- s << "Could not create remote directory " << _fs->name << "(" << ssh_get_error (ss.session) << ")";
- throw NetworkError (s.str ());
+ 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);
-
- int 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);
+
+ boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_name());
+
+ boost::uintmax_t bytes_to_transfer = 0;
+ 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);
}
-
- int buffer_size = 64 * 1024;
+
+ boost::uintmax_t buffer_size = 64 * 1024;
char buffer[buffer_size];
- int bytes_transferred = 0;
-
- for (filesystem::directory_iterator i = filesystem::directory_iterator (dcp_dir); i != 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
-
- set_status ("copying " + leaf);
-
- int to_do = filesystem::file_size (*i);
+ boost::uintmax_t bytes_transferred = 0;
+
+ for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator (dcp_dir); i != boost::filesystem::directory_iterator(); ++i) {
+
+ string const leaf = boost::filesystem::path(*i).leaf().generic_string ();
+
+ set_status (String::compose (_("copying %1"), leaf));
+
+ 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);
-
- int fd = open (filesystem::path (*i).string().c_str(), O_RDONLY);
- if (fd == 0) {
- stringstream s;
- s << "Could not open " << *i << " to send";
- throw NetworkError (s.str ());
+
+ FILE* f = fopen_boost (boost::filesystem::path (*i), "rb");
+ if (f == 0) {
+ throw NetworkError (String::compose (_("Could not open %1 to send"), *i));
}
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)) {
+ fclose (f);
+ throw ReadFileError (boost::filesystem::path (*i).string());
+ }
+
r = ssh_scp_write (sc.scp, buffer, t);
if (r != SSH_OK) {
- stringstream s;
- s << "Could not write to remote file (" << ssh_get_error (ss.session) << ")";
- throw NetworkError (s.str ());
+ fclose (f);
+ throw NetworkError (String::compose (_("Could not write to remote file (%1)"), ssh_get_error (ss.session)));
}
to_do -= t;
bytes_transferred += t;
-
- set_progress ((double) bytes_transferred / bytes_to_transfer);
+
+ if (bytes_to_transfer > 0) {
+ set_progress ((double) bytes_transferred / bytes_to_transfer);
+ }
}
+
+ fclose (f);
}
-
+
set_progress (1);
- set_status ("OK");
+ set_status (N_(""));
set_state (FINISHED_OK);
}
SCPDCPJob::status () const
{
boost::mutex::scoped_lock lm (_status_mutex);
- stringstream s;
- s << Job::status() << "; " << _status;
- return s.str ();
+ string s = Job::status ();
+ if (!_status.empty ()) {
+ s += N_("; ") + _status;
+ }
+ return s;
}
void
boost::mutex::scoped_lock lm (_status_mutex);
_status = s;
}
-
projects / dcpomatic.git / blobdiff