X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=2a4986f0ddc23cd18c0998a890aac70fc6a28680;hb=7ee21d16c01b90c22192cd10f118419881fe504e;hp=68cdce3cd3a961ed1e3e272280d2ce3c62ac4fa6;hpb=cbaed1119cdf3acb8662e5240f59706722437d94;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 68cdce3cd..2a4986f0d 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -27,23 +27,21 @@ #include "job.h" #include "util.h" -using namespace std; -using namespace boost; +#include "i18n.h" -/** @param s FilmState for the film that we are operating on. - * @param l A log that we can write to. - */ -Job::Job (shared_ptr s, Log* l, shared_ptr req) - : _fs (s) - , _log (l) - , _required (req) +using std::string; +using std::list; +using std::stringstream; +using boost::shared_ptr; + +Job::Job (shared_ptr f) + : _film (f) + , _thread (0) , _state (NEW) , _start_time (0) , _progress_unknown (false) , _ran_for (0) { - assert (_log); - descend (1); } @@ -53,7 +51,7 @@ Job::start () { set_state (RUNNING); _start_time = time (0); - boost::thread (boost::bind (&Job::run_wrapper, this)); + _thread = new boost::thread (boost::bind (&Job::run_wrapper, this)); } /** A wrapper for the ::run() method to catch exceptions */ @@ -68,17 +66,43 @@ Job::run_wrapper () set_progress (1); set_state (FINISHED_ERROR); - set_error (String::compose ("%1 (%2)", e.what(), filesystem::path (e.filename()).leaf())); + 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_("\n\n"); + m += _("The 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 (boost::thread_interrupted &) { + + set_state (FINISHED_CANCELLED); + } 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 DCP-o-matic mailing list (dcpomatic@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 DCP-o-matic mailing list (dcpomatic@carlh.net)") + ); } } +/** @return true if this job is new (ie has not started running) */ bool Job::is_new () const { @@ -99,7 +123,7 @@ bool Job::finished () const { boost::mutex::scoped_lock lm (_state_mutex); - return _state == FINISHED_OK || _state == FINISHED_ERROR; + return _state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED; } /** @return true if the job has finished successfully */ @@ -118,6 +142,13 @@ Job::finished_in_error () const return _state == FINISHED_ERROR; } +bool +Job::finished_cancelled () const +{ + boost::mutex::scoped_lock lm (_state_mutex); + return _state == FINISHED_CANCELLED; +} + /** Set the state of this job. * @param s New state. */ @@ -132,17 +163,6 @@ Job::set_state (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 (); -} - /** @return Time (in seconds) that this job has been running */ int Job::elapsed_time () const @@ -163,6 +183,7 @@ Job::set_progress (float p) boost::mutex::scoped_lock lm (_progress_mutex); _progress_unknown = false; _stack.back().normalised = p; + boost::this_thread::interruption_point (); } /** @return fractional overall progress, or -1 if not known */ @@ -215,22 +236,30 @@ 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; + 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_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; } /** Say that this job's progress will be unknown until further notice */ @@ -248,16 +277,27 @@ 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 && r > 0) { - s << rint (p * 100) << "%; " << seconds_to_approximate_hms (r) << " remaining"; - } else if (!finished () && (t <= 10 || r == 0)) { - s << rint (p * 100) << "%"; + if (!finished ()) { + s << pc << N_("%"); + if (p >= 0 && 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"); + } } else if (finished_ok ()) { - s << "OK (ran for " << seconds_to_hms (_ran_for) << ")"; + s << String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for)); } else if (finished_in_error ()) { - s << "Error (" << error() << ")"; + s << String::compose (_("Error (%1)"), error_summary()); + } else if (finished_cancelled ()) { + s << _("Cancelled"); } return s.str (); @@ -269,3 +309,14 @@ Job::remaining_time () const { return elapsed_time() / overall_progress() - elapsed_time(); } + +void +Job::cancel () +{ + if (!_thread) { + return; + } + + _thread->interrupt (); + _thread->join (); +}