Use dcp::filesystem to wrap filesystem calls and fix_long_path

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

diff --git a/src/lib/job.cc b/src/lib/job.cc
index 912c6a6ef3c961374a81bd4863509a94d0c524f2..727456523ca39e7e58f1045fa4df1aea3095d291 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -38,6 +38,7 @@
 #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"
@@ -56,10 +57,8 @@ using namespace dcpomatic;
 Job::Job (shared_ptr<const Film> film)
        : _film (film)
        , _state (NEW)
-       , _start_time (0)
        , _sub_start_time (0)
        , _progress (0)
-       , _ran_for (0)
 {
 
 }
@@ -115,7 +114,7 @@ Job::run_wrapper ()
                string m = String::compose (_("An error occurred whilst handling the file %1."), boost::filesystem::path (e.filename()).leaf());
 
                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.");
@@ -170,7 +169,7 @@ Job::run_wrapper ()
                        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()
                                )
                        );
@@ -185,7 +184,7 @@ Job::run_wrapper ()
                                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()
                                        )
                                );
@@ -351,7 +350,7 @@ Job::set_state (State s)
                _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 ();
                }
@@ -589,7 +588,22 @@ Job::status () const
                                );
                }
        } 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 ()) {