diff options
| author | Carl Hetherington <cth@carlh.net> | 2012-07-18 11:39:15 +0100 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2012-07-18 11:39:15 +0100 |
| commit | 193f4b8013fdb5c6594b2d348a9b3a44de562eb5 (patch) | |
| tree | fd454e23344d05f65a5a4aeb9495e107d9fc0ad0 | |
| parent | 8e4c867d592be3e6cbdffc1ad3d9a4e8eb16c93f (diff) | |
Tidy SCPDCPJob's status reporting.
| -rw-r--r-- | TODO | 1 | ||||
| -rw-r--r-- | src/lib/scp_dcp_job.cc | 8 |
2 files changed, 5 insertions, 4 deletions
@@ -1,5 +1,4 @@ Standardise j2c/j2k -Sort out fight between Job::status and overridden versions; a bit ugly Format name in ~/.dvdomatic screws up with spaces; use ID or something Thumbnails are poorly named x-thread signaller diff --git a/src/lib/scp_dcp_job.cc b/src/lib/scp_dcp_job.cc index 4878c7df4..ffa04e018 100644 --- 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 ()); @@ -179,7 +179,7 @@ SCPDCPJob::run () string const leaf = i->leaf (); #endif - set_status ("Copying " + leaf); + set_status ("copying " + leaf); int to_do = filesystem::file_size (*i); ssh_scp_push_file (sc.scp, leaf.c_str(), to_do, S_IRUSR | S_IWUSR); @@ -216,7 +216,9 @@ string SCPDCPJob::status () const { boost::mutex::scoped_lock lm (_status_mutex); - return _status; + stringstream s; + s << Job::status() << "; " << _status; + return s.str (); } void |