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 c61889363fda9a62837c15acd51b4c85f0b20fc1..c3278e30e1bf02f626f9f77dd6e408f9956acc69 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -24,17 +24,24 @@
 #include "ffmpeg_content.h"
 #include "image_content.h"
 #include "sndfile_content.h"
-#include "subrip_content.h"
+#include "text_subtitle_content.h"
 #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>
 
 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.
@@ -55,8 +62,8 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
                content.reset (new ImageContent (film, node, version));
        } else if (type == "Sndfile") {
                content.reset (new SndfileContent (film, node, version));
-       } else if (type == "SubRip") {
-               content.reset (new SubRipContent (film, node, version));
+       } else if (type == "SubRip" || type == "TextSubtitle") {
+               content.reset (new TextSubtitleContent (film, node, version));
        } else if (type == "DCP") {
                content.reset (new DCPContent (film, node, version));
        } else if (type == "DCPSubtitle") {
@@ -77,16 +84,44 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
        shared_ptr<Content> content;
 
        if (boost::filesystem::is_directory (path)) {
+
+               LOG_GENERAL ("Look in directory %1", path);
+
+               if (boost::filesystem::is_empty (path)) {
+                       return shared_ptr<Content> ();
+               }
+
                /* Guess if this is a DCP or a set of images: read the first ten filenames and if they
                   are all valid image files we assume it is a set of images.
                */
 
                bool is_dcp = false;
                int read = 0;
-               for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i, ++read) {
-                       if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) {
+               for (boost::filesystem::directory_iterator i(path); i != boost::filesystem::directory_iterator() && read < 10; ++i) {
+
+                       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 (!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;
                        }
+
+                       ++read;
                }
 
                if (is_dcp) {
@@ -104,8 +139,8 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
                        content.reset (new ImageContent (film, path));
                } else if (SndfileContent::valid_file (path)) {
                        content.reset (new SndfileContent (film, path));
-               } else if (ext == ".srt") {
-                       content.reset (new SubRipContent (film, path));
+               } else if (ext == ".srt" || ext == ".ssa") {
+                       content.reset (new TextSubtitleContent (film, path));
                } else if (ext == ".xml") {
                        content.reset (new DCPSubtitleContent (film, path));
                } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {