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 bf0879d926ebb77d0cf9461af9aa8c52fd1d79bc..727456523ca39e7e58f1045fa4df1aea3095d291 100644 (file)
--- a/src/lib/job.cc
+++ b/src/lib/job.cc
@@ -57,7 +57,6 @@ using namespace dcpomatic;
 Job::Job (shared_ptr<const Film> film)
        : _film (film)
        , _state (NEW)
-       , _start_time (0)
        , _sub_start_time (0)
        , _progress (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()
                                        )
                                );
@@ -596,7 +595,10 @@ Job::status () const
                        return string(buffer);
                };
                auto const duration = _finish_time - _start_time;
-               if (duration < 600) {
+               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 {