pot/merge.

[dcpomatic.git] / src / lib / job.cc

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 50dcc336e2fd9029b3d659246165e06d3e303f10..6ec154c34b3804c7edc040367ce88ee1e0a7fdef 100644 (file)
--- 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"
@@ -199,9 +200,7 @@ Job::run_wrapper ()
                set_state (FINISHED_ERROR);
 
        } catch (boost::thread_interrupted &) {
-
-               set_state (FINISHED_CANCELLED);
-
+               /* The job was cancelled; there's nothing else we need to do here */
        } catch (sub::SubripError& e) {
 
                string extra = "Error is near:\n";
@@ -237,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 (
@@ -509,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);
@@ -591,16 +617,14 @@ Job::remaining_time () const
 void
 Job::cancel ()
 {
-       if (!_thread.joinable()) {
-               return;
-       }
+       if (_thread.joinable()) {
+               resume();
 
-       if (paused_by_user() || paused_by_priority()) {
-               resume ();
+               _thread.interrupt ();
+               _thread.join ();
        }
 
-       _thread.interrupt ();
-       _thread.join ();
+       set_state (FINISHED_CANCELLED);
 }