X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fcheck_content_change_job.cc;h=c4d050c0e19ea09b7dc6d7e6c8d42568d8876a7f;hp=0862ab085323eaac5966b34358b0760a1d5ebf5b;hb=da44da6f31f97d39ca91c35955e573e76371f2c2;hpb=f968fb875135884b0551195edc2315d4be76d5bc

diff --git a/src/lib/check_content_change_job.cc b/src/lib/check_content_change_job.cc
index 0862ab085..c4d050c0e 100644
--- a/src/lib/check_content_change_job.cc
+++ b/src/lib/check_content_change_job.cc
@@ -23,7 +23,6 @@
 #include "examine_content_job.h"
 #include "content.h"
 #include "film.h"
-#include <boost/foreach.hpp>
 #include <iostream>
 
 #include "i18n.h"
@@ -31,18 +30,26 @@
 using std::string;
 using std::list;
 using std::cout;
-using boost::shared_ptr;
+using std::shared_ptr;
 
-CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
+/** @param gui true if we are running this job from the GUI, false if it's the CLI */
+CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film, shared_ptr<Job> following, bool gui)
 	: Job (film)
+	, _following (following)
+	, _gui (gui)
 {
 
 }
 
+CheckContentChangeJob::~CheckContentChangeJob ()
+{
+	stop_thread ();
+}
+
 string
 CheckContentChangeJob::name () const
 {
-	return _("Check content for changes");
+	return _("Checking content for changes");
 }
 
 string
@@ -58,30 +65,52 @@ CheckContentChangeJob::run ()
 
 	list<shared_ptr<Content> > changed;
 
-	BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
+	for (auto i: _film->content()) {
 		bool ic = false;
 		for (size_t j = 0; j < i->number_of_paths(); ++j) {
-			cout << boost::filesystem::last_write_time(i->path(j)) << " " << i->last_write_time(j) << "\n";
 			if (boost::filesystem::last_write_time(i->path(j)) != i->last_write_time(j)) {
-				cout << "last write differs.\n";
 				ic = true;
 				break;
 			}
 		}
 		if (!ic && i->calculate_digest() != i->digest()) {
-			cout << "digest differs.\n";
 			ic = true;
 		}
 		if (ic) {
-			cout << i->path(0) << " changed.\n";
 			changed.push_back (i);
 		}
 	}
 
-	BOOST_FOREACH (shared_ptr<Content> i, changed) {
-		JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob(_film, i)));
+	if (!changed.empty()) {
+		if (_gui) {
+			for (auto i: changed) {
+				JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob(_film, i)));
+			}
+			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 {
+			set_progress (1);
+			set_state (FINISHED_ERROR);
+			set_error (
+				_("Some files have been changed since they were added to the project.  Open the project in DCP-o-matic, check the settings, then save it before trying again."),
+				""
+				);
+			return;
+		}
+	} 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);
 }