using std::string;
-/** @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)
+CheckContentChangeJob::CheckContentChangeJob (shared_ptr<const Film> film)
: Job (film)
- , _following (following)
- , _gui (gui)
{
}
std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr<Content> c) { return c->changed(); });
if (!changed.empty()) {
- if (_gui) {
- for (auto i: changed) {
- JobManager::instance()->add(make_shared<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;
+ for (auto i: changed) {
+ JobManager::instance()->add(make_shared<ExamineContentJob>(_film, i));
}
- } else if (_following) {
- JobManager::instance()->add (_following);
+ set_message (_("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."));
}
- /* 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);
}