X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fimage_content.cc;h=9e0bb09b5925a0a14f76f9afce703c7fb5b38ea7;hb=422eb00b446d90e3588ae6793f676917ee195cca;hp=825f6da25aab1267bffe75f8fba442585c4a44e6;hpb=b8ab7864ea798d633c4dbfa6be69c58a227d9ca2;p=dcpomatic.git

diff --git a/src/lib/image_content.cc b/src/lib/image_content.cc
index 825f6da25..9e0bb09b5 100644
--- a/src/lib/image_content.cc
+++ b/src/lib/image_content.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2013-2016 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2013-2018 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -37,6 +37,7 @@
 using std::string;
 using std::cout;
 using std::list;
+using std::vector;
 using boost::shared_ptr;
 
 ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path p)
@@ -45,19 +46,9 @@ ImageContent::ImageContent (shared_ptr<const Film> film, boost::filesystem::path
 	video.reset (new VideoContent (this));
 
 	if (boost::filesystem::is_regular_file (p) && valid_image_file (p)) {
-		_paths.push_back (p);
+		add_path (p);
 	} else {
-		for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) {
-			if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
-				_paths.push_back (i->path ());
-			}
-		}
-
-		if (_paths.empty()) {
-			throw FileError (_("No valid image files were found in the folder."), p);
-		}
-
-		sort (_paths.begin(), _paths.end(), ImageFilenameSorter ());
+		_path_to_scan = p;
 	}
 
 	set_default_colour_conversion ();
@@ -100,10 +91,10 @@ ImageContent::technical_summary () const
 }
 
 void
-ImageContent::as_xml (xmlpp::Node* node) const
+ImageContent::as_xml (xmlpp::Node* node, bool with_paths) const
 {
 	node->add_child("Type")->add_child_text ("Image");
-	Content::as_xml (node);
+	Content::as_xml (node, with_paths);
 
 	if (video) {
 		video->as_xml (node);
@@ -113,6 +104,28 @@ ImageContent::as_xml (xmlpp::Node* node) const
 void
 ImageContent::examine (shared_ptr<Job> job)
 {
+	if (_path_to_scan) {
+		job->sub (_("Scanning image files"));
+		vector<boost::filesystem::path> paths;
+		int n = 0;
+		for (boost::filesystem::directory_iterator i(*_path_to_scan); i != boost::filesystem::directory_iterator(); ++i) {
+			if (boost::filesystem::is_regular_file (i->path()) && valid_image_file (i->path())) {
+				paths.push_back (i->path());
+			}
+			++n;
+			if ((n % 1000) == 0) {
+				job->set_progress_unknown ();
+			}
+		}
+
+		if (paths.empty()) {
+			throw FileError (_("No valid image files were found in the folder."), *_path_to_scan);
+		}
+
+		sort (paths.begin(), paths.end(), ImageFilenameSorter());
+		set_paths (paths);
+	}
+
 	Content::examine (job);
 
 	shared_ptr<const Film> film = _film.lock ();
@@ -149,7 +162,7 @@ ImageContent::still () const
 void
 ImageContent::set_default_colour_conversion ()
 {
-	BOOST_FOREACH (boost::filesystem::path i, _paths) {
+	BOOST_FOREACH (boost::filesystem::path i, paths()) {
 		if (valid_j2k_file (i)) {
 			/* We default to no colour conversion if we have JPEG2000 files */
 			video->unset_colour_conversion ();