X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=784defc91736074e53292fdbcdb4c306341d7d6f;hb=0ec7c9d0b1f3ea58ffe17dd70bea04ad702d164b;hp=e5d0933f83d7572477a0222972ddb1a80ea3ee38;hpb=ef4b082c5d7452a34ce45f6d3bead46a7e846faf;p=dcpomatic.git

diff --git a/src/lib/job.cc b/src/lib/job.cc
index e5d0933f8..784defc91 100644
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -17,19 +17,20 @@
 
 */
 
-/** @file src/job.cc
+/** @file  src/job.cc
  *  @brief A parent class to represent long-running tasks which are run in their own thread.
  */
 
-#include <boost/thread.hpp>
-#include <boost/filesystem.hpp>
-#include <dcp/exceptions.h>
 #include "job.h"
 #include "util.h"
 #include "cross.h"
 #include "exceptions.h"
 #include "film.h"
 #include "log.h"
+#include "compose.hpp"
+#include <dcp/exceptions.h>
+#include <boost/thread.hpp>
+#include <boost/filesystem.hpp>
 
 #include "i18n.h"
 
@@ -41,8 +42,8 @@ using boost::optional;
 
 #define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
 
-Job::Job (shared_ptr<const Film> f)
-	: _film (f)
+Job::Job (shared_ptr<const Film> film)
+	: _film (film)
 	, _thread (0)
 	, _state (NEW)
 	, _start_time (0)
@@ -52,6 +53,16 @@ Job::Job (shared_ptr<const Film> f)
 
 }
 
+Job::~Job ()
+{
+	if (_thread) {
+		_thread->interrupt ();
+		_thread->join ();
+	}
+
+	delete _thread;
+}
+
 /** Start the job in a separate thread, returning immediately */
 void
 Job::start ()
@@ -86,7 +97,7 @@ Job::run_wrapper ()
 		set_error (e.what(), m);
 		set_progress (1);
 		set_state (FINISHED_ERROR);
-		
+
 	} catch (OpenFileError& e) {
 
 		set_error (
@@ -97,6 +108,23 @@ Job::run_wrapper ()
 		set_progress (1);
 		set_state (FINISHED_ERROR);
 
+	} catch (boost::filesystem::filesystem_error& e) {
+
+		if (e.code() == boost::system::errc::no_such_file_or_directory) {
+			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."), e.path1().string())
+				);
+		} else {
+			set_error (
+				e.what (),
+				string (_("It is not known what caused this error.")) + "  " + REPORT_PROBLEM
+				);
+		}
+
+		set_progress (1);
+		set_state (FINISHED_ERROR);
+
 	} catch (boost::thread_interrupted &) {
 
 		set_state (FINISHED_CANCELLED);
@@ -106,7 +134,7 @@ Job::run_wrapper ()
 		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 (
@@ -116,7 +144,7 @@ Job::run_wrapper ()
 
 		set_progress (1);
 		set_state (FINISHED_ERROR);
-		
+
 	} catch (...) {
 
 		set_error (
@@ -182,7 +210,7 @@ Job::paused () const
 	boost::mutex::scoped_lock lm (_state_mutex);
 	return _state == PAUSED;
 }
-	
+
 /** Set the state of this job.
  *  @param s New state.
  */
@@ -204,7 +232,7 @@ Job::set_state (State s)
 
 	if (finished) {
 		emit (boost::bind (boost::ref (Finished)));
-	}	
+	}
 }
 
 /** @return DCPTime (in seconds) that this sub-job has been running */
@@ -214,7 +242,7 @@ Job::elapsed_time () const
 	if (_start_time == 0) {
 		return 0;
 	}
-	
+
 	return time (0) - _start_time;
 }
 
@@ -229,6 +257,12 @@ Job::set_progress (float p, bool force)
 		return;
 	}
 
+	set_progress_common (p);
+}
+
+void
+Job::set_progress_common (optional<float> p)
+{
 	boost::mutex::scoped_lock lm (_progress_mutex);
 	_progress = p;
 	boost::this_thread::interruption_point ();
@@ -259,7 +293,7 @@ Job::sub (string n)
 		boost::mutex::scoped_lock lm (_progress_mutex);
 		_sub_name = n;
 	}
-	
+
 	set_progress (0, true);
 }
 
@@ -286,7 +320,7 @@ 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;
@@ -297,11 +331,7 @@ Job::set_error (string s, string d)
 void
 Job::set_progress_unknown ()
 {
-	boost::mutex::scoped_lock lm (_progress_mutex);
-	_progress.reset ();
-	lm.unlock ();
-
-	emit (boost::bind (boost::ref (Progress)));
+	set_progress_common (optional<float> ());
 }
 
 /** @return Human-readable status of this job */
@@ -314,14 +344,14 @@ Job::status () const
 
 	SafeStringStream s;
 	if (!finished () && p) {
-		int pc = rint (p.get() * 100);
+		int pc = lrintf (p.get() * 100);
 		if (pc == 100) {
 			/* 100% makes it sound like we've finished when we haven't */
 			pc = 99;
 		}
-		
+
 		s << pc << N_("%");
-		
+
 		if (t > 10 && r > 0) {
 			/// TRANSLATORS: remaining here follows an amount of time that is remaining
 			/// on an operation.
@@ -330,7 +360,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");
 	}
@@ -368,7 +398,7 @@ Job::remaining_time () const
 	if (progress().get_value_or(0) == 0) {
 		return elapsed_time ();
 	}
-	
+
 	return elapsed_time() / progress().get() - elapsed_time();
 }
 
@@ -379,6 +409,10 @@ Job::cancel ()
 		return;
 	}
 
+	if (paused ()) {
+		resume ();
+	}
+
 	_thread->interrupt ();
 	_thread->join ();
 }