X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=8924fa09c49fcdd09cef5637f5e27496de564f0e;hb=19dc3455d7112427e0470e58133d25bcb031e9f1;hp=77d3671369481b0728cac6b369827a6291fab1fb;hpb=5121d13ded51a70169f5b5d649067c9b26456705;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 77d367136..8924fa09c 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -26,21 +26,25 @@ #include #include "job.h" #include "util.h" +#include "cross.h" +#include "ui_signaller.h" +#include "exceptions.h" #include "i18n.h" using std::string; using std::list; +using std::cout; using std::stringstream; using boost::shared_ptr; -/** @param s Film that we are operating on. - */ -Job::Job (shared_ptr f) +Job::Job (shared_ptr f) : _film (f) + , _thread (0) , _state (NEW) , _start_time (0) , _progress_unknown (false) + , _last_set (0) , _ran_for (0) { descend (1); @@ -52,7 +56,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 */ @@ -69,22 +73,40 @@ Job::run_wrapper () 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_("\n\n"); - m += _("The drive that the film is stored on is low in disc space. Free some more space and try again."); + + try { + 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."); + } + } catch (...) { + } set_error (e.what(), m); - + + } catch (OpenFileError& e) { + + set_progress (1); + set_state (FINISHED_ERROR); + + set_error ( + String::compose (_("Could not open %1"), e.file().string()), + String::compose (_("DCP-o-matic could not open the file %1. Perhaps it does not exist or is in an unexpected format."), e.file().string()) + ); + + } catch (boost::thread_interrupted &) { + + set_state (FINISHED_CANCELLED); + } catch (std::exception& e) { set_progress (1); set_state (FINISHED_ERROR); 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)") + _("It is not known what caused this error. The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)") ); } catch (...) { @@ -93,7 +115,7 @@ Job::run_wrapper () 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)") + _("It is not known what caused this error. The best idea is to report the problem to the DCP-o-matic mailing list (carl@dcpomatic.com)") ); } @@ -120,7 +142,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 */ @@ -139,18 +161,40 @@ 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; +} + +bool +Job::paused () const +{ + boost::mutex::scoped_lock lm (_state_mutex); + return _state == PAUSED; +} + /** Set the state of this job. * @param s New state. */ void Job::set_state (State s) { - boost::mutex::scoped_lock lm (_state_mutex); - _state = s; + bool finished = false; + + { + boost::mutex::scoped_lock lm (_state_mutex); + _state = s; - if (_state == FINISHED_OK || _state == FINISHED_ERROR) { - _ran_for = elapsed_time (); - Finished (); + if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) { + _ran_for = elapsed_time (); + finished = true; + } + } + + if (finished && ui_signaller) { + ui_signaller->emit (boost::bind (boost::ref (Finished))); } } @@ -171,9 +215,25 @@ Job::elapsed_time () const void Job::set_progress (float p) { + if (fabs (p - _last_set) < 0.01) { + /* Calm excessive progress reporting */ + return; + } + + _last_set = p; + boost::mutex::scoped_lock lm (_progress_mutex); _progress_unknown = false; _stack.back().normalised = p; + boost::this_thread::interruption_point (); + + if (paused ()) { + dcpomatic_sleep (1); + } + + if (ui_signaller) { + ui_signaller->emit (boost::bind (boost::ref (Progress))); + } } /** @return fractional overall progress, or -1 if not known */ @@ -286,6 +346,8 @@ Job::status () const s << String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for)); } else if (finished_in_error ()) { s << String::compose (_("Error (%1)"), error_summary()); + } else if (finished_cancelled ()) { + s << _("Cancelled"); } return s.str (); @@ -297,3 +359,30 @@ Job::remaining_time () const { return elapsed_time() / overall_progress() - elapsed_time(); } + +void +Job::cancel () +{ + if (!_thread) { + return; + } + + _thread->interrupt (); + _thread->join (); +} + +void +Job::pause () +{ + if (running ()) { + set_state (PAUSED); + } +} + +void +Job::resume () +{ + if (paused ()) { + set_state (RUNNING); + } +}