Fix assertion failure on opening content properties (#816).

[dcpomatic.git] / src / lib / content_factory.cc

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 2b17d69e42bdbd1525035eb479f79934b4d99ebe..c3278e30e1bf02f626f9f77dd6e408f9956acc69 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -28,6 +28,10 @@
 #include "dcp_content.h"
 #include "dcp_subtitle_content.h"
 #include "util.h"
+#include "film.h"
+#include "log_entry.h"
+#include "log.h"
+#include "compose.hpp"
 #include <libcxml/cxml.h>
 #include <dcp/smpte_subtitle_asset.h>
 #include <boost/algorithm/string.hpp>
@@ -36,6 +40,8 @@ using std::string;
 using std::list;
 using boost::shared_ptr;
 
+#define LOG_GENERAL(...) film->log()->log (String::compose (__VA_ARGS__), LogEntry::TYPE_GENERAL);
+
 /** Create a Content object from an XML node.
  *  @param film Film that the content will be in.
  *  @param node XML description.
@@ -79,6 +85,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 
        if (boost::filesystem::is_directory (path)) {
 
+               LOG_GENERAL ("Look in directory %1", path);
+
                if (boost::filesystem::is_empty (path)) {
                        return shared_ptr<Content> ();
                }
@@ -91,12 +99,25 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                int read = 0;
                for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i) {
 
-                       if (boost::starts_with (i->path().leaf().string(), "._")) {
+                       LOG_GENERAL ("Checking file %1", i->path());
+
+                       if (boost::starts_with (i->path().leaf().string(), "._") || i->path().leaf().string() == ".DS_Store") {
                                /* We ignore these files */
+                               LOG_GENERAL ("Ignored %1 (starts with {._}, or .DS_Store)", i->path());
+                               continue;
+                       }
+
+                       if (!boost::filesystem::is_regular_file(i->path())) {
+                               /* Ignore things which aren't files (probably directories) */
+                               LOG_GENERAL ("Ignored %1 (not a regular file)", i->path());
                                continue;
                        }
 
-                       if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) {
+                       if (!valid_image_file (i->path())) {
+                               /* We have a normal file which isn't an image; assume we are looking
+                                  at a DCP.
+                               */
+                               LOG_GENERAL ("It's a DCP because of %1", i->path());
                                is_dcp = true;
                        }