Logging improvements to allow prettier displays in the server GUI.

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

diff --git a/src/lib/content_factory.cc b/src/lib/content_factory.cc
index 789496d08e043c7d911ce2991eff4f689b3e4e68..3aa8ca9d31eb16ef16dc34ce776f43b198a50ad8 100644 (file)
--- a/src/lib/content_factory.cc
+++ b/src/lib/content_factory.cc
@@ -21,12 +21,16 @@
  *  @brief Methods to create content objects.
  */
 
-#include <libcxml/cxml.h>
 #include "ffmpeg_content.h"
 #include "image_content.h"
 #include "sndfile_content.h"
 #include "subrip_content.h"
+#include "dcp_content.h"
+#include "dcp_subtitle_content.h"
 #include "util.h"
+#include <libcxml/cxml.h>
+#include <dcp/smpte_subtitle_asset.h>
+#include <boost/algorithm/string.hpp>
 
 using std::string;
 using std::list;
@@ -45,7 +49,7 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
        string const type = node->string_child ("Type");
 
        boost::shared_ptr<Content> content;
-       
+
        if (type == "FFmpeg") {
                content.reset (new FFmpegContent (film, node, version, notes));
        } else if (type == "Image") {
@@ -54,14 +58,18 @@ content_factory (shared_ptr<const Film> film, cxml::NodePtr node, int version, l
                content.reset (new SndfileContent (film, node, version));
        } else if (type == "SubRip") {
                content.reset (new SubRipContent (film, node, version));
+       } else if (type == "DCP") {
+               content.reset (new DCPContent (film, node, version));
+       } else if (type == "DCPSubtitle") {
+               content.reset (new DCPSubtitleContent (film, node, version));
        }
 
        return content;
 }
 
-/** Create a Content object from a file, depending on its extension.
+/** Create a Content object from a file or directory.
  *  @param film Film that the content will be in.
- *  @param path File's path.
+ *  @param path File or directory.
  *  @return Content object.
  */
 shared_ptr<Content>
@@ -69,17 +77,58 @@ content_factory (shared_ptr<const Film> film, boost::filesystem::path path)
 {
        shared_ptr<Content> content;
 
-       string ext = path.extension().string ();
-       transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
-               
-       if (valid_image_file (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));
+       if (boost::filesystem::is_directory (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) {
+
+                       if (boost::starts_with (i->path().leaf().string(), "._")) {
+                               /* We ignore these files */
+                               continue;
+                       }
+
+                       if (!boost::filesystem::is_regular_file (i->path()) || !valid_image_file (i->path())) {
+                               is_dcp = true;
+                       }
+
+                       ++read;
+               }
+
+               if (is_dcp) {
+                       content.reset (new DCPContent (film, path));
+               } else {
+                       content.reset (new ImageContent (film, path));
+               }
+
        } else {
-               content.reset (new FFmpegContent (film, path));
+
+               string ext = path.extension().string ();
+               transform (ext.begin(), ext.end(), ext.begin(), ::tolower);
+
+               if (valid_image_file (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 == ".xml") {
+                       content.reset (new DCPSubtitleContent (film, path));
+               } else if (ext == ".mxf" && dcp::SMPTESubtitleAsset::valid_mxf (path)) {
+                       content.reset (new DCPSubtitleContent (film, path));
+               }
+
+               if (!content) {
+                       content.reset (new FFmpegContent (film, path));
+               }
        }
 
        return content;