Hand-apply 111f02f4fc8ace359a16aea1c88c2821bf3dde31 from master; improve progress reporting when scanning a file for length.

1 files changed, 26 insertions, 15 deletions

diff --git a/src/lib/job.cc b/src/lib/job.cc
index e11efa407..68aa6230a 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
@@ -38,6 +38,7 @@ using std::string;
 using std::list;
 using std::cout;
 using boost::shared_ptr;
+using boost::optional;
 
 #define LOG_ERROR_NC(...) _film->log()->log (__VA_ARGS__, Log::TYPE_ERROR);
 
@@ -224,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;
 	}
@@ -243,12 +244,12 @@ Job::set_progress (float p, bool force)
 	}
 }
 
-/** @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
@@ -298,26 +299,32 @@ Job::set_progress_unknown ()
 {
 	boost::mutex::scoped_lock lm (_progress_mutex);
 	_progress.reset ();
+	lm.unlock ();
+
+	if (ui_signaller) {
+		ui_signaller->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;
-	}
-
 	SafeStringStream s;
-	if (!finished ()) {
+	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");
@@ -341,7 +348,11 @@ Job::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