Tidy SCPDCPJob's status reporting.

diff --git a/TODO b/TODO
index 31cee0a7922384ee7897f1555ca436339845dde0..171e2ee44bbc66ee651c4171aee77b52ed7131f9 100644 (file)
--- a/TODO
+++ b/TODO
@@ -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 4878c7df476269209cbdd4f249b2973541e6ea59..ffa04e0183637a19aea3e6d91a535debef278fc3 100644 (file)
--- 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