X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fscp_dcp_job.cc;h=63784081356e9eb0fc4d81ea97d551a7078e224d;hb=d2137ac5db409e686b4d9b3fa567935a5e416d41;hp=30d02eff87604ceb9a697a4386f3619d9efa9276;hpb=38ab054c2ec22a853ee6abbe3f3683d153e9bb63;p=dcpomatic.git

diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc
index 30d02eff8..637840813 100644
--- a/src/lib/scp_dcp_job.cc
+++ b/src/lib/scp_dcp_job.cc
@@ -33,6 +33,11 @@
 #include "config.h"
 #include "log.h"
 #include "film.h"
+#include "cross.h"
+
+#include "i18n.h"
+
+#define LOG_GENERAL_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_GENERAL);
 
 using std::string;
 using std::stringstream;
@@ -47,7 +52,7 @@ public:
 	{
 		session = ssh_new ();
 		if (session == 0) {
-			throw NetworkError ("Could not start SSH session");
+			throw NetworkError (_("could not start SSH session"));
 		}
 	}
 
@@ -81,7 +86,7 @@ public:
 	{
 		scp = ssh_scp_new (s, SSH_SCP_WRITE | SSH_SCP_RECURSIVE, Config::instance()->tms_path().c_str ());
 		if (!scp) {
-			throw NetworkError (String::compose ("Could not start SCP session (%1)", ssh_get_error (s)));
+			throw NetworkError (String::compose (_("could not start SCP session (%1)"), ssh_get_error (s)));
 		}
 	}
 
@@ -94,9 +99,9 @@ public:
 };
 
 
-SCPDCPJob::SCPDCPJob (shared_ptr<Film> f)
+SCPDCPJob::SCPDCPJob (shared_ptr<const Film> f)
 	: Job (f)
-	, _status ("Waiting")
+	, _status (_("Waiting"))
 {
 
 }
@@ -104,17 +109,23 @@ SCPDCPJob::SCPDCPJob (shared_ptr<Film> f)
 string
 SCPDCPJob::name () const
 {
-	return "Copy DCP to TMS";
+	return _("Copy DCP to TMS");
+}
+
+string
+SCPDCPJob::json_name () const
+{
+	return N_("scp_dcp");
 }
 
 void
 SCPDCPJob::run ()
 {
-	_film->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 ());
@@ -123,32 +134,32 @@ SCPDCPJob::run ()
 	
 	int r = ss.connect ();
 	if (r != SSH_OK) {
-		throw NetworkError (String::compose ("Could not connect to server %1 (%2)", Config::instance()->tms_ip(), ssh_get_error (ss.session)));
+		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) {
-		throw NetworkError (String::compose ("SSH error (%1)", ssh_get_error (ss.session)));
+		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) {
-		throw NetworkError (String::compose ("Failed to authenticate with server (%1)", ssh_get_error (ss.session)));
+		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) {
-		throw NetworkError (String::compose ("Could not start SCP session (%1)", ssh_get_error (ss.session)));
+		throw NetworkError (String::compose (_("Could not start SCP session (%1)"), ssh_get_error (ss.session)));
 	}
 	
 	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)", _film->dcp_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 = _film->dir (_film->dcp_name());
+	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) {
@@ -163,38 +174,42 @@ SCPDCPJob::run ()
 		
 		string const leaf = boost::filesystem::path(*i).leaf().generic_string ();
 		
-		set_status ("copying " + leaf);
+		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);
 
-		FILE* f = fopen (boost::filesystem::path (*i).string().c_str(), "rb");
+		FILE* f = fopen_boost (boost::filesystem::path (*i), "rb");
 		if (f == 0) {
-			throw NetworkError (String::compose ("Could not open %1 to send", *i));
+			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)) {
+				fclose (f);
 				throw ReadFileError (boost::filesystem::path (*i).string());
 			}
 			
 			r = ssh_scp_write (sc.scp, buffer, t);
 			if (r != SSH_OK) {
-				throw NetworkError (String::compose ("Could not write to remote file (%1)", ssh_get_error (ss.session)));
+				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 ("");
+	set_status (N_(""));
 	set_state (FINISHED_OK);
 }
 
@@ -205,7 +220,7 @@ SCPDCPJob::status () const
 	stringstream s;
 	s << Job::status ();
 	if (!_status.empty ()) {
-		s << "; " << _status;
+		s << N_("; ") << _status;
 	}
 	return s.str ();
 }
@@ -216,4 +231,3 @@ SCPDCPJob::set_status (string s)
 	boost::mutex::scoped_lock lm (_status_mutex);
 	_status = s;
 }
-