From 979452c78fe2b9aeb6a802d2d900fb83083f9a8a Mon Sep 17 00:00:00 2001 From: Carl Hetherington Date: Sat, 24 Nov 2018 15:00:53 +0000 Subject: Fix tests. --- src/lib/dcp_content.cc | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) (limited to 'src/lib/dcp_content.cc') diff --git a/src/lib/dcp_content.cc b/src/lib/dcp_content.cc index ac9f82899..419ffe69c 100644 --- a/src/lib/dcp_content.cc +++ b/src/lib/dcp_content.cc @@ -150,16 +150,7 @@ DCPContent::DCPContent (cxml::ConstNodePtr node, int version) void DCPContent::read_directory (boost::filesystem::path p) { - LOG_GENERAL ("DCPContent::read_directory reads %1", p.string()); - for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) { - if (boost::filesystem::is_regular_file (i->path())) { - LOG_GENERAL ("Inside there's regular file %1", i->path().string()); - add_path (i->path()); - } else if (boost::filesystem::is_directory (i->path ())) { - LOG_GENERAL ("Inside there's directory %1", i->path().string()); - read_directory (i->path()); - } - } + read_sub_directory (p); bool have_assetmap = false; BOOST_FOREACH (boost::filesystem::path i, paths()) { @@ -173,6 +164,21 @@ DCPContent::read_directory (boost::filesystem::path p) } } +void +DCPContent::read_sub_directory (boost::filesystem::path p) +{ + LOG_GENERAL ("DCPContent::read_sub_directory reads %1", p.string()); + for (boost::filesystem::directory_iterator i(p); i != boost::filesystem::directory_iterator(); ++i) { + if (boost::filesystem::is_regular_file (i->path())) { + LOG_GENERAL ("Inside there's regular file %1", i->path().string()); + add_path (i->path()); + } else if (boost::filesystem::is_directory (i->path ())) { + LOG_GENERAL ("Inside there's directory %1", i->path().string()); + read_sub_directory (i->path()); + } + } +} + void DCPContent::examine (shared_ptr film, shared_ptr job) { -- cgit v1.2.3