X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=dde8cce62ad42379c999ccf2103f891afbca6b04;hb=ad1ef39eda58b3a919ea3b7084401a0439409ec6;hp=dacc8bf311e4eb1fcbec1f4026d77b0395ecce2e;hpb=f5bc071ddac2355da1d116404cc37f4485e97699;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index dacc8bf31..dde8cce62 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -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)
@@ -87,6 +85,9 @@ Job::start ()
 	_start_time = time (0);
 	_sub_start_time = time (0);
 	_thread = new boost::thread (boost::bind (&Job::run_wrapper, this));
+#ifdef DCPOMATIC_LINUX
+	pthread_setname_np (_thread->native_handle(), "job-wrapper");
+#endif
 }
 
 /** A wrapper for the ::run() method to catch exceptions */
@@ -120,8 +121,9 @@ Job::run_wrapper ()
 		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."),
-				boost::filesystem::absolute (e.file()).string()
+				_("DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or is in an unexpected format."),
+				boost::filesystem::absolute (e.file()).string(),
+				e.what()
 				)
 			);
 
@@ -134,8 +136,9 @@ Job::run_wrapper ()
 			set_error (
 				String::compose (_("Could not open %1"), e.path1().string ()),
 				String::compose (
-					_("DCP-o-matic could not open the file %1.  Perhaps it does not exist or is in an unexpected format."),
-					boost::filesystem::absolute (e.path1()).string()
+					_("DCP-o-matic could not open the file %1 (%2).  Perhaps it does not exist or is in an unexpected format."),
+					boost::filesystem::absolute (e.path1()).string(),
+					e.what()
 					)
 				);
 		} else {
@@ -169,6 +172,18 @@ Job::run_wrapper ()
 		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 (
@@ -302,6 +317,7 @@ Job::check_for_interruption_or_pause ()
 
 /** Set the progress of the current part of the job.
  *  @param p Progress (from 0 to 1)
+ *  @param force Do not ignore this update, even if it hasn't been long since the last one.
  */
 void
 Job::set_progress (float p, bool force)
@@ -374,14 +390,13 @@ Job::error_summary () const
 }
 
 /** Set the current error string.
- *  @param e New error string.
+ *  @param s New error string.
+ *  @param d New error detail string.
  */
 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);
 	}
 
@@ -421,8 +436,8 @@ Job::status () const
 		if (t > 10 && r > 0) {
 			boost::posix_time::ptime now = boost::posix_time::second_clock::local_time();
 			boost::posix_time::ptime finish = now + boost::posix_time::seconds(r);
-			char finish_string[6];
-			snprintf (finish_string, sizeof(finish_string), "%02d:%02d", finish.time_of_day().hours(), finish.time_of_day().minutes());
+			char finish_string[16];
+			snprintf (finish_string, sizeof(finish_string), "%02d:%02d", int(finish.time_of_day().hours()), int(finish.time_of_day().minutes()));
 			string day;
 			if (now.date() != finish.date()) {
 				/// TRANSLATORS: the %1 in this string will be filled in with a day of the week
@@ -500,13 +515,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
@@ -537,3 +566,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;
+}