X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fscp_dcp_job.cc;h=67a1fb8026a68325b768a86fa1808dd258345490;hb=ed60129bb2051649de3740ff75a7db71db9e7897;hp=760e85bd0bfccce0b45886b20a01c1baba93ce99;hpb=7a8f7e87d631adec94b6b2e61e524ee9424e8284;p=dcpomatic.git diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc index 760e85bd0..67a1fb802 100644 --- a/src/lib/scp_dcp_job.cc +++ b/src/lib/scp_dcp_job.cc @@ -27,14 +27,21 @@ #include #include #include +#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 { @@ -44,7 +51,7 @@ public: { session = ssh_new (); if (session == 0) { - throw NetworkError ("Could not start SSH session"); + throw NetworkError (_("could not start SSH session")); } } @@ -78,9 +85,7 @@ public: { 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))); } } @@ -93,9 +98,9 @@ public: }; -SCPDCPJob::SCPDCPJob (shared_ptr s, Log* l) - : Job (s, shared_ptr (), l) - , _status ("Waiting") +SCPDCPJob::SCPDCPJob (shared_ptr f) + : Job (f) + , _status (_("Waiting")) { } @@ -103,19 +108,17 @@ SCPDCPJob::SCPDCPJob (shared_ptr s, Log* l) string SCPDCPJob::name () const { - stringstream s; - s << "Copy DCP to TMS"; - return s.str (); + return _("Copy DCP to TMS"); } 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 ()); @@ -124,97 +127,82 @@ SCPDCPJob::run () 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); + boost::filesystem::path const dcp_dir = _film->dir (_film->dcp_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::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; + 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); + set_status (String::compose (_("copying %1"), leaf)); - int 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 (boost::filesystem::path (*i), "rb"); if (f == 0) { - stringstream s; - s << "Could not open " << *i << " to send"; - throw NetworkError (s.str ()); + throw NetworkError (String::compose (_("Could not open %1 to send"), *i)); } while (to_do > 0) { 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()); + 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); } @@ -222,9 +210,11 @@ string 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 @@ -233,4 +223,3 @@ SCPDCPJob::set_status (string s) boost::mutex::scoped_lock lm (_status_mutex); _status = s; } -