X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fjob.cc;h=6ec154c34b3804c7edc040367ce88ee1e0a7fdef;hb=53d0a9a844841fe10b2720543c032a687c548108;hp=1c7fe5a83ff5d333eafa62141fce4ec3c00e059e;hpb=da75178e689a48dc689b70e0880a45f0cf8c07a8;p=dcpomatic.git diff --git a/src/lib/job.cc b/src/lib/job.cc index 1c7fe5a83..6ec154c34 100644 --- a/src/lib/job.cc +++ b/src/lib/job.cc @@ -25,6 +25,7 @@ #include "compose.hpp" +#include "constants.h" #include "cross.h" #include "dcpomatic_log.h" #include "exceptions.h" @@ -235,6 +236,12 @@ Job::run_wrapper () set_progress (1); set_state (FINISHED_ERROR); + } catch (CPLNotFoundError& e) { + + set_error(e.what()); + set_progress(1); + set_state(FINISHED_ERROR); + } catch (std::exception& e) { set_error ( @@ -507,6 +514,27 @@ Job::status () const 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);