X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=2ac8c60771b1c960850b4805ff1ca550fbb1cd3a;hb=79ce26d031d109177ba4b0f637fa2960345a37a3;hp=05a90524c9818615112b77464da5a56bd154ec69;hpb=ec95ff05f66e9b4cf3bcdbefa0c75ca8f99dc279;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 05a90524c..2ac8c6077 100644
--- 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,10 +66,7 @@ Job::run_wrapper ()
 
 		run ();
 
-	} catch (libdcp::FileError& e) {
-		
-		set_progress (1);
-		set_state (FINISHED_ERROR);
+	} catch (dcp::FileError& e) {
 		
 		string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
@@ -84,39 +81,48 @@ Job::run_wrapper ()
 		}
 
 		set_error (e.what(), m);
-
-	} catch (OpenFileError& e) {
-
 		set_progress (1);
 		set_state (FINISHED_ERROR);
+		
+	} catch (OpenFileError& e) {
 
 		set_error (
 			String::compose (_("Could not open %1"), e.file().string()),
 			String::compose (_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."), e.file().string())
 			);
 
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (boost::thread_interrupted &) {
 
 		set_state (FINISHED_CANCELLED);
-		
-	} catch (std::exception& e) {
 
+	} catch (std::bad_alloc& e) {
+
+		set_error (_("Out of memory"), _("There was not enough memory to do this."));
 		set_progress (1);
 		set_state (FINISHED_ERROR);
+		
+	} catch (std::exception& e) {
+
 		set_error (
 			e.what (),
 			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
 			);
 
-	} catch (...) {
-
 		set_progress (1);
 		set_state (FINISHED_ERROR);
+		
+	} catch (...) {
+
 		set_error (
 			_("Unknown error"),
 			_("It is not known what caused this error.  The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)")
 			);
 
+		set_progress (1);
+		set_state (FINISHED_ERROR);
 	}
 }
 
@@ -180,22 +186,33 @@ 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 DCPTime (in seconds) that this sub-job has been running */
@@ -233,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
 {
@@ -319,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