X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=f281466325f8c34a7e78d8e0ad8229910335946b;hb=05c37bfdb86be26497d5baa448a0cbda20e33bed;hp=594c0da34f1b5cdc7a55177e61bee698b5ac21d5;hpb=40b654453c2ce0b266f43c36f1b9a5d1705f983c;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 594c0da34..f28146632 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     This program is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License as published by
@@ -37,8 +37,10 @@
 using std::string;
 using std::list;
 using std::cout;
-using std::stringstream;
 using boost::shared_ptr;
+using boost::optional;
+
+#define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
 
 Job::Job (shared_ptr<const Film> f)
 	: _film (f)
@@ -110,7 +112,7 @@ Job::run_wrapper ()
 
 		set_error (
 			e.what (),
-			_("It is not known what caused this error.  Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).")
+			string (_("It is not known what caused this error.")) + "  " + REPORT_PROBLEM
 			);
 
 		set_progress (1);
@@ -120,7 +122,7 @@ Job::run_wrapper ()
 
 		set_error (
 			_("Unknown error"),
-			_("It is not known what caused this error.  Please report the problem to the DCP-o-matic author (carl@dcpomatic.com).")
+			string (_("It is not known what caused this error.")) + "  " + REPORT_PROBLEM
 			);
 
 		set_progress (1);
@@ -201,8 +203,8 @@ Job::set_state (State s)
 		}
 	}
 
-	if (finished && ui_signaller) {
-		ui_signaller->emit (boost::bind (boost::ref (Finished)));
+	if (finished) {
+		emit (boost::bind (boost::ref (Finished)));
 	}	
 }
 
@@ -223,7 +225,7 @@ Job::elapsed_time () const
 void
 Job::set_progress (float p, bool force)
 {
-	if (!force && fabs (p - progress()) < 0.01) {
+	if (!force && fabs (p - progress().get_value_or(0)) < 0.01) {
 		/* Calm excessive progress reporting */
 		return;
 	}
@@ -232,21 +234,20 @@ Job::set_progress (float p, bool force)
 	_progress = p;
 	boost::this_thread::interruption_point ();
 
-	if (paused ()) {
-		dcpomatic_sleep (1);
+	boost::mutex::scoped_lock lm2 (_state_mutex);
+	while (_state == PAUSED) {
+		_pause_changed.wait (lm2);
 	}
 
-	if (ui_signaller) {
-		ui_signaller->emit (boost::bind (boost::ref (Progress)));
-	}
+	emit (boost::bind (boost::ref (Progress)));
 }
 
-/** @return fractional progress of the current sub-job, or -1 if not known */
-float
+/** @return fractional progress of the current sub-job, if known */
+optional<float>
 Job::progress () const
 {
 	boost::mutex::scoped_lock lm (_progress_mutex);
-	return _progress.get_value_or (-1);
+	return _progress;
 }
 
 void
@@ -281,6 +282,9 @@ Job::error_summary () const
 void
 Job::set_error (string s, string d)
 {
+	LOG_ERROR_NC (s);
+	LOG_ERROR_NC (d);
+	
 	_film->log()->log (String::compose ("Error in job: %1 (%2)", s, d), Log::TYPE_ERROR);
 	boost::mutex::scoped_lock lm (_state_mutex);
 	_error_summary = s;
@@ -293,26 +297,30 @@ Job::set_progress_unknown ()
 {
 	boost::mutex::scoped_lock lm (_progress_mutex);
 	_progress.reset ();
+	lm.unlock ();
+
+	emit (boost::bind (boost::ref (Progress)));
 }
 
 /** @return Human-readable status of this job */
 string
 Job::status () const
 {
-	float const p = progress ();
+	optional<float> p = progress ();
 	int const t = elapsed_time ();
 	int const r = remaining_time ();
 
-	int pc = rint (p * 100);
-	if (pc == 100) {
-		/* 100% makes it sound like we've finished when we haven't */
-		pc = 99;
-	}
-
-	stringstream s;
-	if (!finished ()) {
+	SafeStringStream s;
+	if (!finished () && p) {
+		int pc = rint (p.get() * 100);
+		if (pc == 100) {
+			/* 100% makes it sound like we've finished when we haven't */
+			pc = 99;
+		}
+		
 		s << pc << N_("%");
-		if (p >= 0 && t > 10 && r > 0) {
+		
+		if (t > 10 && r > 0) {
 			/// TRANSLATORS: remaining here follows an amount of time that is remaining
 			/// on an operation.
 			s << "; " << seconds_to_approximate_hms (r) << " " << _("remaining");
@@ -320,7 +328,7 @@ Job::status () const
 	} else if (finished_ok ()) {
 		s << String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for));
 	} else if (finished_in_error ()) {
-		s << String::compose (_("Error (%1)"), error_summary());
+		s << String::compose (_("Error (%1)"), error_summary ());
 	} else if (finished_cancelled ()) {
 		s << _("Cancelled");
 	}
@@ -355,7 +363,11 @@ Job::json_status () const
 int
 Job::remaining_time () const
 {
-	return elapsed_time() / progress() - elapsed_time();
+	if (progress().get_value_or(0) == 0) {
+		return elapsed_time ();
+	}
+	
+	return elapsed_time() / progress().get() - elapsed_time();
 }
 
 void
@@ -374,6 +386,7 @@ Job::pause ()
 {
 	if (running ()) {
 		set_state (PAUSED);
+		_pause_changed.notify_all ();
 	}
 }
 
@@ -382,5 +395,6 @@ Job::resume ()
 {
 	if (paused ()) {
 		set_state (RUNNING);
+		_pause_changed.notify_all ();
 	}
 }