#include "compose.hpp"
+#include "constants.h"
#include "cross.h"
#include "dcpomatic_log.h"
#include "exceptions.h"
#include <boost/date_time/posix_time/posix_time.hpp>
#include <boost/filesystem.hpp>
#include <boost/thread.hpp>
+#include <time.h>
#include <iostream>
#include "i18n.h"
Job::Job (shared_ptr<const Film> film)
: _film (film)
, _state (NEW)
- , _start_time (0)
, _sub_start_time (0)
, _progress (0)
- , _ran_for (0)
+ , _rate_limit_progress(true)
{
}
} catch (dcp::FileError& e) {
- string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
+ string m = String::compose(_("An error occurred whilst handling the file %1."), e.filename().filename());
try {
- auto const s = boost::filesystem::space (e.filename());
+ auto const s = dcp::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.");
String::compose (_("Could not open %1"), e.file().string()),
String::compose (
_("DCP-o-matic could not open the file %1 (%2). Perhaps it does not exist or is in an unexpected format."),
- boost::filesystem::absolute (e.file()).string(),
+ dcp::filesystem::absolute(e.file()).string(),
e.what()
)
);
String::compose (_("Could not open %1"), e.path1().string ()),
String::compose (
_("DCP-o-matic could not open the file %1 (%2). Perhaps it does not exist or is in an unexpected format."),
- boost::filesystem::absolute (e.path1()).string(),
+ dcp::filesystem::absolute(e.path1()).string(),
e.what()
)
);
set_progress(1);
set_state(FINISHED_ERROR);
+ } catch (MissingConfigurationError& e) {
+
+ set_error(e.what());
+ set_progress(1);
+ set_state(FINISHED_ERROR);
+
} catch (std::exception& e) {
set_error (
{
boost::mutex::scoped_lock lm (_state_mutex);
+ if (_state == s) {
+ return;
+ }
+
_state = s;
if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
- _ran_for = time(0) - _start_time;
+ _finish_time = time(nullptr);
finished = true;
_sub_name.clear ();
}
}
if (finished) {
- emit (boost::bind (boost::ref (Finished)));
- FinishedImmediate ();
+ auto const result = state_to_result(s);
+ emit(boost::bind(boost::ref(Finished), result));
+ FinishedImmediate(result);
}
}
+Job::Result
+Job::state_to_result(State state) const
+{
+ switch (state) {
+ case FINISHED_OK:
+ return Result::RESULT_OK;
+ case FINISHED_ERROR:
+ return Result::RESULT_ERROR;
+ case FINISHED_CANCELLED:
+ return Result::RESULT_CANCELLED;
+ default:
+ DCPOMATIC_ASSERT(false);
+ };
+
+ DCPOMATIC_ASSERT(false);
+}
+
+
/** @return DCPTime (in seconds) that this sub-job has been running */
int
Job::elapsed_sub_time () const
{
check_for_interruption_or_pause ();
- if (!force) {
+ if (!force && _rate_limit_progress) {
/* Check for excessively frequent progress reporting */
boost::mutex::scoped_lock lm (_progress_mutex);
struct timeval now;
int const t = elapsed_sub_time ();
int const r = remaining_time ();
+ auto day_of_week_to_string = [](boost::gregorian::greg_weekday d) -> std::string {
+ switch (d.as_enum()) {
+ case boost::date_time::Sunday:
+ return _("Sunday");
+ case boost::date_time::Monday:
+ return _("Monday");
+ case boost::date_time::Tuesday:
+ return _("Tuesday");
+ case boost::date_time::Wednesday:
+ return _("Wednesday");
+ case boost::date_time::Thursday:
+ return _("Thursday");
+ case boost::date_time::Friday:
+ return _("Friday");
+ case boost::date_time::Saturday:
+ return _("Saturday");
+ }
+
+ return d.as_long_string();
+ };
+
string s;
if (!finished () && p) {
int pc = lrintf (p.get() * 100);
);
}
} else if (finished_ok ()) {
- s = String::compose (_("OK (ran for %1)"), seconds_to_hms (_ran_for));
+ auto time_string = [](time_t time) {
+ auto tm = localtime(&time);
+ char buffer[8];
+ snprintf(buffer, sizeof(buffer), "%02d:%02d", tm->tm_hour, tm->tm_min);
+ return string(buffer);
+ };
+ auto const duration = _finish_time - _start_time;
+ if (duration < 10) {
+ /* It took less than 10 seconds; it doesn't seem worth saying how long it took */
+ s = _("OK");
+ } else if (duration < 600) {
+ /* It took less than 10 minutes; it doesn't seem worth saying when it started and finished */
+ s = String::compose(_("OK (ran for %1)"), seconds_to_hms(duration));
+ } else {
+ s = String::compose(_("OK (ran for %1 from %2 to %3)"), seconds_to_hms(duration), time_string(_start_time), time_string(_finish_time));
+ }
} else if (finished_in_error ()) {
s = String::compose (_("Error: %1"), error_summary ());
} else if (finished_cancelled ()) {
void
-Job::when_finished (boost::signals2::connection& connection, function<void()> finished)
+Job::when_finished(boost::signals2::connection& connection, function<void(Result)> finished)
{
boost::mutex::scoped_lock lm (_state_mutex);
if (_state == FINISHED_OK || _state == FINISHED_ERROR || _state == FINISHED_CANCELLED) {
- finished ();
+ finished(state_to_result(_state));
} else {
connection = Finished.connect (finished);
}
boost::mutex::scoped_lock lm (_state_mutex);
_message = m;
}
+
+
+void
+Job::set_rate_limit_progress(bool rate_limit)
+{
+ _rate_limit_progress = rate_limit;
+}
+
projects / dcpomatic.git / blobdiff