X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=dd034bf0cf52d7225b2cb3b0d9f47927ed9165a9;hb=019e44f1a19e366b1771b3a0fb1dbec2d343597f;hp=399b235d9bee7d0264d19da544c4a20f283966d8;hpb=bb767c7e338414beee132af3e96829c1448e214b;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 399b235d9..dd034bf0c 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -22,26 +22,27 @@ */ #include +#include +#include #include "job.h" #include "util.h" -using namespace std; -using namespace boost; +using std::string; +using std::list; +using std::stringstream; +using boost::shared_ptr; -/** @param s FilmState for the film that we are operating on. - * @param o Options. - * @param l A log that we can write to. +/** @param s Film that we are operating on. + * @param req Job that must be completed before this job is run. */ -Job::Job (shared_ptr s, shared_ptr o, Log* l) - : _fs (s) - , _opt (o) - , _log (l) +Job::Job (shared_ptr f, shared_ptr req) + : _film (f) + , _required (req) , _state (NEW) , _start_time (0) , _progress_unknown (false) + , _ran_for (0) { - assert (_log); - descend (1); } @@ -62,15 +63,49 @@ Job::run_wrapper () run (); + } catch (libdcp::FileError& e) { + + set_progress (1); + set_state (FINISHED_ERROR); + + string m = String::compose ("An error occurred whilst handling the file %1.", boost::filesystem::path (e.filename()).leaf()); + + boost::filesystem::space_info const s = boost::filesystem::space (e.filename()); + if (s.available < pow (1024, 3)) { + m += "\n\nThe drive that the film is stored on is low in disc space. Free some more space and try again."; + } + + set_error (e.what(), m); + } catch (std::exception& e) { set_progress (1); set_state (FINISHED_ERROR); - set_error (e.what ()); + set_error ( + e.what (), + "It is not known what caused this error. The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)" + ); + + } catch (...) { + + set_progress (1); + set_state (FINISHED_ERROR); + set_error ( + "Unknown error", + "It is not known what caused this error. The best idea is to report the problem to the DVD-o-matic mailing list (dvdomatic@carlh.net)" + ); } } +/** @return true if this job is new (ie has not started running) */ +bool +Job::is_new () const +{ + boost::mutex::scoped_lock lm (_state_mutex); + return _state == NEW; +} + /** @return true if the job is running */ bool Job::running () const @@ -111,17 +146,11 @@ Job::set_state (State s) { boost::mutex::scoped_lock lm (_state_mutex); _state = s; -} -/** A hack to work around our lack of cross-thread - * signalling; this emits Finished, and listeners - * assume that it will be emitted in the GUI thread, - * so this method must be called from the GUI thread. - */ -void -Job::emit_finished () -{ - Finished (); + if (_state == FINISHED_OK || _state == FINISHED_ERROR) { + _ran_for = elapsed_time (); + Finished (); + } } /** @return Time (in seconds) that this job has been running */ @@ -142,6 +171,7 @@ void Job::set_progress (float p) { boost::mutex::scoped_lock lm (_progress_mutex); + _progress_unknown = false; _stack.back().normalised = p; } @@ -195,25 +225,33 @@ Job::descend (float a) _stack.push_back (Level (a)); } -/** @return Any error string that the job has generated */ string -Job::error () const +Job::error_details () const +{ + boost::mutex::scoped_lock lm (_state_mutex); + return _error_details; +} + +/** @return A summary of any error that the job has generated */ +string +Job::error_summary () const { boost::mutex::scoped_lock lm (_state_mutex); - return _error; + return _error_summary; } /** Set the current error string. * @param e New error string. */ void -Job::set_error (string e) +Job::set_error (string s, string d) { boost::mutex::scoped_lock lm (_state_mutex); - _error = e; + _error_summary = s; + _error_details = d; } -/** Set that this job's progress will always be unknown */ +/** Say that this job's progress will be unknown until further notice */ void Job::set_progress_unknown () { @@ -221,22 +259,37 @@ Job::set_progress_unknown () _progress_unknown = true; } +/** @return Human-readable status of this job */ string Job::status () const { float const p = overall_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 () && p >= 0 && t > 10) { - s << rint (p * 100) << "%; about " << seconds_to_approximate_hms (t / p - t) << " remaining"; - } else if (!finished () && t <= 10) { - s << rint (p * 100) << "%"; + if (!finished () && p >= 0 && t > 10 && r > 0) { + s << pc << "%; " << seconds_to_approximate_hms (r) << " remaining"; + } else if (!finished () && (t <= 10 || r == 0)) { + s << pc << "%"; } else if (finished_ok ()) { - s << "OK (ran for " << seconds_to_hms (t) << ")"; + s << "OK (ran for " << seconds_to_hms (_ran_for) << ")"; } else if (finished_in_error ()) { - s << "Error (" << error() << ")"; + s << "Error (" << error_summary() << ")"; } return s.str (); } + +/** @return An estimate of the remaining time for this job, in seconds */ +int +Job::remaining_time () const +{ + return elapsed_time() / overall_progress() - elapsed_time(); +}