Tidy up handling of content-modified checks when using the dcpomatic_cli.

[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 0862ab085323eaac5966b34358b0760a1d5ebf5b..2bc562f57730339bce035be957368f7a29e8d8b2 100644 (file)
--- a/src/lib/check_content_change_job.cc
+++ b/src/lib/check_content_change_job.cc
@@ -33,8 +33,11 @@ using std::list;
 using std::cout;
 using boost::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)
 {
 
 }
@@ -42,7 +45,7 @@ CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
 string
 CheckContentChangeJob::name () const
 {
-       return _("Check content for changes");
+       return _("Checking content for changes");
 }
 
 string
@@ -61,19 +64,15 @@ CheckContentChangeJob::run ()
        BOOST_FOREACH (shared_ptr<Content> 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);
                }
        }
@@ -82,6 +81,28 @@ CheckContentChangeJob::run ()
                JobManager::instance()->add(shared_ptr<Job>(new ExamineContentJob(_film, i)));
        }
 
+       if (!changed.empty()) {
+               if (_gui) {
+                       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);
+       }
+
        set_progress (1);
        set_state (FINISHED_OK);
 }