X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fcontent.cc;h=3ab4a5959a81cbb8ecdc42eca672b822add569c7;hb=1245a8bb685504f11733380077a564a783348433;hp=04bdc8126cc4ddf898284d2ab8f1353d3ddd85b0;hpb=5dbd022f3abb0ebab57fb67073a07ed60df902a6;p=dcpomatic.git

diff --git a/src/lib/content.cc b/src/lib/content.cc
index 04bdc8126..3ab4a5959 100644
--- a/src/lib/content.cc
+++ b/src/lib/content.cc
@@ -87,7 +87,7 @@ Content::Content (shared_ptr<const Film> film, boost::filesystem::path p)
 	, _trim_end (0)
 	, _change_signals_frequent (false)
 {
-	_paths.push_back (p);
+	add_path (p);
 }
 
 Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
@@ -95,8 +95,16 @@ Content::Content (shared_ptr<const Film> film, cxml::ConstNodePtr node)
 	, _change_signals_frequent (false)
 {
 	list<cxml::NodePtr> path_children = node->node_children ("Path");
-	for (list<cxml::NodePtr>::const_iterator i = path_children.begin(); i != path_children.end(); ++i) {
-		_paths.push_back ((*i)->content ());
+	BOOST_FOREACH (cxml::NodePtr i, path_children) {
+		_paths.push_back (i->content());
+		optional<time_t> const mod = i->optional_number_attribute<time_t>("mtime");
+		if (mod) {
+			_last_write_times.push_back (*mod);
+		} else if (boost::filesystem::exists(i->content())) {
+			_last_write_times.push_back (boost::filesystem::last_write_time(i->content()));
+		} else {
+			_last_write_times.push_back (0);
+		}
 	}
 	_digest = node->optional_string_child ("Digest").get_value_or ("X");
 	_position = DCPTime (node->number_child<DCPTime::Type> ("Position"));
@@ -134,7 +142,8 @@ Content::Content (shared_ptr<const Film> film, vector<shared_ptr<Content> > c)
 		}
 
 		for (size_t j = 0; j < c[i]->number_of_paths(); ++j) {
-			_paths.push_back (c[i]->path (j));
+			_paths.push_back (c[i]->path(j));
+			_last_write_times.push_back (c[i]->_last_write_times[j]);
 		}
 	}
 }
@@ -145,8 +154,10 @@ Content::as_xml (xmlpp::Node* node, bool with_paths) const
 	boost::mutex::scoped_lock lm (_mutex);
 
 	if (with_paths) {
-		for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
-			node->add_child("Path")->add_child_text (i->string ());
+		for (size_t i = 0; i < _paths.size(); ++i) {
+			xmlpp::Element* p = node->add_child("Path");
+			p->add_child_text (_paths[i].string());
+			p->set_attribute ("mtime", raw_convert<string>(_last_write_times[i]));
 		}
 	}
 	node->add_child("Digest")->add_child_text (_digest);
@@ -158,13 +169,9 @@ Content::as_xml (xmlpp::Node* node, bool with_paths) const
 	}
 }
 
-void
-Content::examine (shared_ptr<Job> job)
+string
+Content::calculate_digest () const
 {
-	if (job) {
-		job->sub (_("Computing digest"));
-	}
-
 	boost::mutex::scoped_lock lm (_mutex);
 	vector<boost::filesystem::path> p = _paths;
 	lm.unlock ();
@@ -173,10 +180,25 @@ Content::examine (shared_ptr<Job> job)
 	   digest here: a digest of the first and last 1e6 bytes with the
 	   size of the first file tacked on the end as a string.
 	*/
-	string const d = digest_head_tail (p, 1000000) + raw_convert<string> (boost::filesystem::file_size (p.front ()));
+	return digest_head_tail(p, 1000000) + raw_convert<string>(boost::filesystem::file_size(p.front()));
+}
 
-	lm.lock ();
+void
+Content::examine (shared_ptr<Job> job)
+{
+	if (job) {
+		job->sub (_("Computing digest"));
+	}
+
+	string const d = calculate_digest ();
+
+	boost::mutex::scoped_lock lm (_mutex);
 	_digest = d;
+
+	_last_write_times.clear ();
+	BOOST_FOREACH (boost::filesystem::path i, _paths) {
+		_last_write_times.push_back (boost::filesystem::last_write_time(i));
+	}
 }
 
 void
@@ -273,7 +295,11 @@ Content::clone () const
 string
 Content::technical_summary () const
 {
-	return String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+	string s = String::compose ("%1 %2 %3", path_summary(), digest(), position().seconds());
+	if (_video_frame_rate) {
+		s += String::compose(" %1", *_video_frame_rate);
+	}
+	return s;
 }
 
 DCPTime
@@ -299,8 +325,8 @@ Content::identifier () const
 bool
 Content::paths_valid () const
 {
-	for (vector<boost::filesystem::path>::const_iterator i = _paths.begin(); i != _paths.end(); ++i) {
-		if (!boost::filesystem::exists (*i)) {
+	BOOST_FOREACH (boost::filesystem::path i, _paths) {
+		if (!boost::filesystem::exists (i)) {
 			return false;
 		}
 	}
@@ -308,19 +334,19 @@ Content::paths_valid () const
 	return true;
 }
 
-void
-Content::set_path (boost::filesystem::path path)
-{
-	ChangeSignaller<Content> cc (this, ContentProperty::PATH);
-	_paths.clear ();
-	_paths.push_back (path);
-}
-
 void
 Content::set_paths (vector<boost::filesystem::path> paths)
 {
 	ChangeSignaller<Content> cc (this, ContentProperty::PATH);
-	_paths = paths;
+
+	{
+		boost::mutex::scoped_lock lm (_mutex);
+		_paths = paths;
+		_last_write_times.clear ();
+		BOOST_FOREACH (boost::filesystem::path i, _paths) {
+			_last_write_times.push_back (boost::filesystem::last_write_time(i));
+		}
+	}
 }
 
 string
@@ -482,3 +508,11 @@ Content::text_of_original_type (TextType type) const
 
 	return shared_ptr<TextContent> ();
 }
+
+void
+Content::add_path (boost::filesystem::path p)
+{
+	boost::mutex::scoped_lock lm (_mutex);
+	_paths.push_back (p);
+	_last_write_times.push_back (boost::filesystem::last_write_time(p));
+}