Merge branch 'master' into 2.0

[dcpomatic.git] / src / lib / job.cc

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 66fa3755dfb69d3c751a15cde8c868d083927339..2ac8c60771b1c960850b4805ff1ca550fbb1cd3a 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -23,7 +23,7 @@
 
 #include <boost/thread.hpp>
 #include <boost/filesystem.hpp>
-#include <libdcp/exceptions.h>
+#include <dcp/exceptions.h>
 #include "job.h"
 #include "util.h"
 #include "cross.h"
@@ -66,7 +66,7 @@ Job::run_wrapper ()
 
                run ();
 
-       } catch (libdcp::FileError& e) {
+       } catch (dcp::FileError& e) {
                
                string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
@@ -186,25 +186,36 @@ Job::paused () const
 void
 Job::set_state (State s)
 {
-       bool finished = false;
+       bool const finished = (s == FINISHED_OK || s == FINISHED_ERROR || s == FINISHED_CANCELLED);
        
+       /* Do this first, so that we handle things that should happen on finish before the
+        * job is actually marked as such.  This is important for callers that do:
+        *
+        * while (JobManager::work_to_do ()) {
+        *   ui_signaller->ui_idle ();
+        * }
+        *
+        * as otherwise this loop can finish before the Finished handler has been executed
+        * (job finishes, calls set_state(), this sets the state and sets a pending signal
+        * for Finished, but this is never called as a ui_idle() never happens as work_to_do()
+        * is now false).
+        */
+       if (finished && ui_signaller) {
+               ui_signaller->emit (boost::bind (boost::ref (Finished)));
+       }
+
        {
                boost::mutex::scoped_lock lm (_state_mutex);
                _state = s;
 
-               if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
+               if (finished) {
                        _ran_for = elapsed_time ();
-                       finished = true;
                        _sub_name.clear ();
                }
        }
-
-       if (finished && ui_signaller) {
-               ui_signaller->emit (boost::bind (boost::ref (Finished)));
-       }
 }
 
-/** @return Time (in seconds) that this sub-job has been running */
+/** @return DCPTime (in seconds) that this sub-job has been running */
 int
 Job::elapsed_time () const
 {
@@ -239,7 +250,7 @@ Job::set_progress (float p, bool force)
        }
 }
 
-/** @return fractional progress of this sub-job, or -1 if not known */
+/** @return fractional progress of the current sub-job, or -1 if not known */
 float
 Job::progress () const
 {
@@ -325,6 +336,29 @@ Job::status () const
        return s.str ();
 }
 
+string
+Job::json_status () const
+{
+       boost::mutex::scoped_lock lm (_state_mutex);
+
+       switch (_state) {
+       case NEW:
+               return N_("new");
+       case RUNNING:
+               return N_("running");
+       case PAUSED:
+               return N_("paused");
+       case FINISHED_OK:
+               return N_("finished_ok");
+       case FINISHED_ERROR:
+               return N_("finished_error");
+       case FINISHED_CANCELLED:
+               return N_("finished_cancelled");
+       }
+
+       return "";
+}
+
 /** @return An estimate of the remaining time for this sub-job, in seconds */
 int
 Job::remaining_time () const