Make terminate_threads() less likely to leave _threads containing invalid pointers.

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

diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc
index bb3674f27b42471fa1518f04abd8508ae7a1db9d..3d5e4e979fe7745c2837599e7e838471756ac53b 100644 (file)
--- a/src/lib/check_content_change_job.cc
+++ b/src/lib/check_content_change_job.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2018-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -23,6 +23,7 @@
 #include "examine_content_job.h"
 #include "content.h"
 #include "film.h"
+#include "dcpomatic_log.h"
 #include <boost/foreach.hpp>
 #include <iostream>
 
@@ -33,8 +34,9 @@ using std::list;
 using std::cout;
 using boost::shared_ptr;
 
-CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
+CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film, shared_ptr<Job> following)
        : Job (film)
+       , _following (following)
 {
 
 }
@@ -42,7 +44,7 @@ CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
 string
 CheckContentChangeJob::name () const
 {
-       return _("Check content for changes");
+       return _("Checking content for changes");
 }
 
 string
@@ -62,11 +64,13 @@ CheckContentChangeJob::run ()
                bool ic = false;
                for (size_t j = 0; j < i->number_of_paths(); ++j) {
                        if (boost::filesystem::last_write_time(i->path(j)) != i->last_write_time(j)) {
+                               LOG_GENERAL("File %1 changed; last_write_time now %2, was %3", i->path(j).string(), boost::filesystem::last_write_time(i->path(j)), i->last_write_time(j));
                                ic = true;
                                break;
                        }
                }
                if (!ic && i->calculate_digest() != i->digest()) {
+                       LOG_GENERAL("Content %1 changed; digest now %2, was %3", i->path(0).string(), i->calculate_digest(), i->digest());
                        ic = true;
                }
                if (ic) {
@@ -79,9 +83,22 @@ CheckContentChangeJob::run ()
        }
 
        if (!changed.empty()) {
-               set_message (_("Some files were changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings."));
+               string m = _("Some files have been changed since they were added to the project.\n\nThese files will now be re-examined, so you may need to check their settings.");
+               if (_following) {
+                       /* I'm assuming that _following is a make DCP job */
+                       m += "  ";
+                       m += _("Choose 'Make DCP' again when you have done this.");
+               }
+               set_message (m);
+       } else if (_following) {
+               JobManager::instance()->add (_following);
        }
 
+       /* Only set this job as finished once we have added the following job, otherwise I think
+          it's possible that the tests will sporadically fail if they check for all jobs being
+          complete in the gap between this one finishing and _following being added.
+       */
+
        set_progress (1);
        set_state (FINISHED_OK);
 }