X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=8cc6ced8ef2e90f81f83d802466f269f8237eb59;hb=86bbc0981a60ad9ba7b7bdbf28a34f197f83f6cb;hp=5134475ce6aa2f1b86fc8c6ac38635ac9bf10ca2;hpb=e44ed94827f1c0674358f04cc8657a36eef53d29;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 5134475ce..8cc6ced8e 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -28,6 +28,7 @@
 #include "exceptions.h"
 #include "film.h"
 #include "log.h"
+#include "dcpomatic_log.h"
 #include "compose.hpp"
 #include <dcp/exceptions.h>
 #include <sub/exceptions.h>
@@ -46,9 +47,6 @@ using boost::shared_ptr;
 using boost::optional;
 using boost::function;
 
-#define LOG_ERROR_NC(...) if (_film) { _film->log()->log (__VA_ARGS__, LogEntry::TYPE_ERROR); }
-#define LOG_GENERAL(...) if (_film) { _film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL); }
-
 /** @param film Associated film, or 0 */
 Job::Job (shared_ptr<const Film> film)
 	: _film (film)
@@ -174,12 +172,24 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (dcp::MissingAssetError& e) {
+
+		set_error (e.message(), e.path().string());
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (dcp::DCPReadError& e) {
 
 		set_error (e.message(), e.detail().get_value_or(""));
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (KDMError& e) {
+
+		set_error (e.summary(), e.detail());
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (std::exception& e) {
 
 		set_error (
@@ -284,6 +294,7 @@ Job::set_state (State s)
 
 	if (finished) {
 		emit (boost::bind (boost::ref (Finished)));
+		FinishedImmediate ();
 	}
 }
 
@@ -393,8 +404,6 @@ void
 Job::set_error (string s, string d)
 {
 	if (_film) {
-		LOG_ERROR_NC (s);
-		LOG_ERROR_NC (d);
 		_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), LogEntry::TYPE_ERROR);
 	}
 
@@ -440,7 +449,7 @@ Job::status () const
 			if (now.date() != finish.date()) {
 				/// TRANSLATORS: the %1 in this string will be filled in with a day of the week
 				/// to say what day a job will finish.
-				day = String::compose (_(" on %1"), finish.date().day_of_week().as_long_string());
+				day = String::compose (_(" on %1"), day_of_week_to_string(finish.date().day_of_week()));
 			}
 			/// TRANSLATORS: "remaining; finishing at" here follows an amount of time that is remaining
 			/// on an operation; after it is an estimated wall-clock completion time.
@@ -513,13 +522,27 @@ Job::cancel ()
 	_thread = 0;
 }
 
-void
+/** @return true if the job was paused, false if it was not running */
+bool
 Job::pause_by_user ()
 {
-	if (running ()) {
-		set_state (PAUSED_BY_USER);
+	bool paused = false;
+	{
+		boost::mutex::scoped_lock lm (_state_mutex);
+		/* We can set _state here directly because we have a lock and we aren't
+		   setting the job to FINISHED_*
+		*/
+		if (_state == RUNNING) {
+			paused = true;
+			_state = PAUSED_BY_USER;
+		}
+	}
+
+	if (paused) {
 		_pause_changed.notify_all ();
 	}
+
+	return paused;
 }
 
 void
@@ -550,3 +573,17 @@ Job::when_finished (boost::signals2::connection& connection, function<void()> fi
 		connection = Finished.connect (finished);
 	}
 }
+
+optional<string>
+Job::message () const
+{
+	boost::mutex::scoped_lock lm (_state_mutex);
+	return _message;
+}
+
+void
+Job::set_message (string m)
+{
+	boost::mutex::scoped_lock lm (_state_mutex);
+	_message = m;
+}