*/
+
#include "check_content_change_job.h"
-#include "job_manager.h"
-#include "examine_content_job.h"
#include "content.h"
+#include "examine_content_job.h"
#include "film.h"
-#include <boost/foreach.hpp>
+#include "job_manager.h"
#include <iostream>
#include "i18n.h"
-using std::string;
-using std::list;
+
using std::cout;
+using std::make_shared;
using std::shared_ptr;
+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)
{
}
{
set_progress_unknown ();
- list<shared_ptr<Content> > changed;
-
- BOOST_FOREACH (shared_ptr<Content> i, _film->content()) {
- 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)) {
- ic = true;
- break;
- }
- }
- if (!ic && i->calculate_digest() != i->digest()) {
- ic = true;
- }
- if (ic) {
- changed.push_back (i);
- }
- }
+ auto content = _film->content();
+ std::vector<shared_ptr<Content>> changed;
+ std::copy_if (content.begin(), content.end(), std::back_inserter(changed), [](shared_ptr<Content> c) { return c->changed(); });
if (!changed.empty()) {
- if (_gui) {
- BOOST_FOREACH (shared_ptr<Content> 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;
+ 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);
}