More string -> boost::filesystem::path.

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

diff --git a/src/lib/film.cc b/src/lib/film.cc
index 8c0365e024e7c45b4b4ed240043d303d17d0d669..2697b062fb8211be7d4838e421f4359a134b2e2e 100644 (file)
--- a/src/lib/film.cc
+++ b/src/lib/film.cc
@@ -131,7 +131,7 @@ Film::Film (boost::filesystem::path dir)
                }
        }
 
-       set_directory (result.string ());
+       set_directory (result);
        _log.reset (new FileLog (file ("log")));
 
        _playlist->set_sequence_video (_sequence_video);
@@ -165,34 +165,34 @@ Film::video_identifier () const
 }
          
 /** @return The path to the directory to write video frame info files to */
-string
+boost::filesystem::path
 Film::info_dir () const
 {
        boost::filesystem::path p;
        p /= "info";
        p /= video_identifier ();
-       return dir (p.string());
+       return dir (p);
 }
 
-string
+boost::filesystem::path
 Film::internal_video_mxf_dir () const
 {
        return dir ("video");
 }
 
-string
+boost::filesystem::path
 Film::internal_video_mxf_filename () const
 {
        return video_identifier() + ".mxf";
 }
 
-string
+boost::filesystem::path
 Film::video_mxf_filename () const
 {
        return filename_safe_name() + "_video.mxf";
 }
 
-string
+boost::filesystem::path
 Film::audio_mxf_filename () const
 {
        return filename_safe_name() + "_audio.mxf";
@@ -313,13 +313,13 @@ Film::encoded_frames () const
 void
 Film::write_metadata () const
 {
-       if (!boost::filesystem::exists (directory())) {
-               boost::filesystem::create_directory (directory());
+       if (!boost::filesystem::exists (directory ())) {
+               boost::filesystem::create_directory (directory ());
        }
        
        LocaleGuard lg;
 
-       boost::filesystem::create_directories (directory());
+       boost::filesystem::create_directories (directory ());
 
        xmlpp::Document doc;
        xmlpp::Element* root = doc.create_root_node ("Metadata");
@@ -351,7 +351,7 @@ Film::write_metadata () const
        root->add_child("Key")->add_child_text (_key.hex ());
        _playlist->as_xml (root->add_child ("Playlist"));
 
-       doc.write_to_file_formatted (file ("metadata.xml"));
+       doc.write_to_file_formatted (file("metadata.xml").string ());
        
        _dirty = false;
 }
@@ -407,8 +407,8 @@ Film::read_metadata ()
 /** Given a directory name, return its full path within the Film's directory.
  *  The directory (and its parents) will be created if they do not exist.
  */
-string
-Film::dir (string d) const
+boost::filesystem::path
+Film::dir (boost::filesystem::path d) const
 {
        boost::filesystem::path p;
        p /= _directory;
@@ -416,14 +416,14 @@ Film::dir (string d) const
        
        boost::filesystem::create_directories (p);
        
-       return p.string ();
+       return p;
 }
 
 /** Given a file or directory name, return its full path within the Film's directory.
  *  Any required parent directories will be created.
  */
-string
-Film::file (string f) const
+boost::filesystem::path
+Film::file (boost::filesystem::path f) const
 {
        boost::filesystem::path p;
        p /= _directory;
@@ -431,7 +431,7 @@ Film::file (string f) const
 
        boost::filesystem::create_directories (p.parent_path ());
        
-       return p.string ();
+       return p;
 }
 
 /** @return a DCI-compliant name for a DCP of this film */
@@ -546,7 +546,7 @@ Film::dcp_name (bool if_created_now) const
 
 
 void
-Film::set_directory (string d)
+Film::set_directory (boost::filesystem::path d)
 {
        _directory = d;
        _dirty = true;
@@ -671,7 +671,7 @@ Film::set_dci_date_today ()
        _dci_date = boost::gregorian::day_clock::local_day ();
 }
 
-string
+boost::filesystem::path
 Film::info_path (int f, Eyes e) const
 {
        boost::filesystem::path p;
@@ -694,10 +694,10 @@ Film::info_path (int f, Eyes e) const
        /* info_dir() will already have added any initial bit of the path,
           so don't call file() on this.
        */
-       return p.string ();
+       return p;
 }
 
-string
+boost::filesystem::path
 Film::j2c_path (int f, Eyes e, bool t) const
 {
        boost::filesystem::path p;
@@ -721,25 +721,33 @@ Film::j2c_path (int f, Eyes e, bool t) const
        }
 
        p /= s.str();
-       return file (p.string ());
+       return file (p);
 }
 
-/** Make an educated guess as to whether we have a complete DCP
- *  or not.
- *  @return true if we do.
- */
-
-bool
-Film::have_dcp () const
+/** @return List of subdirectories (not full paths) containing DCPs that can be successfully libdcp::DCP::read() */
+list<boost::filesystem::path>
+Film::dcps () const
 {
-       try {
-               libdcp::DCP dcp (dir (dcp_name()));
-               dcp.read ();
-       } catch (...) {
-               return false;
-       }
+       list<boost::filesystem::path> out;
+       
+       boost::filesystem::path const dir = directory ();
+       for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
+               if (
+                       boost::filesystem::is_directory (*i) &&
+                       i->path().leaf() != "j2c" && i->path().leaf() != "video" && i->path().leaf() != "info" && i->path().leaf() != "analysis"
+                       ) {
 
-       return true;
+                       try {
+                               libdcp::DCP dcp (*i);
+                               dcp.read ();
+                               out.push_back (i->path().leaf ());
+                       } catch (...) {
+
+                       }
+               }
+       }
+       
+       return out;
 }
 
 shared_ptr<Player>
@@ -910,32 +918,14 @@ Film::full_frame () const
 libdcp::KDM
 Film::make_kdm (
        shared_ptr<libdcp::Certificate> target,
+       boost::filesystem::path dcp_dir,
        boost::posix_time::ptime from,
        boost::posix_time::ptime until
        ) const
 {
        shared_ptr<const Signer> signer = make_signer ();
 
-       /* Find the DCP to make the KDM for */
-       string const dir = this->directory ();
-       list<boost::filesystem::path> dcps;
-       for (boost::filesystem::directory_iterator i = boost::filesystem::directory_iterator(dir); i != boost::filesystem::directory_iterator(); ++i) {
-               if (
-                       boost::filesystem::is_directory (*i) &&
-                       i->path().leaf() != "j2c" && i->path().leaf() != "video" && i->path().leaf() != "info" && i->path().leaf() != "analysis"
-                       ) {
-                       
-                       dcps.push_back (i->path());
-               }
-       }
-
-       if (dcps.empty()) {
-               throw KDMError (_("Could not find DCP to make KDM for"));
-       } else if (dcps.size() > 1) {
-               throw KDMError (_("More than one possible DCP to make KDM for"));
-       }
-
-       libdcp::DCP dcp (dcps.front ());
+       libdcp::DCP dcp (dir (dcp_dir.string ()));
        
        try {
                dcp.read ();
@@ -955,6 +945,7 @@ Film::make_kdm (
 list<libdcp::KDM>
 Film::make_kdms (
        list<shared_ptr<Screen> > screens,
+       boost::filesystem::path dcp,
        boost::posix_time::ptime from,
        boost::posix_time::ptime until
        ) const
@@ -962,7 +953,7 @@ Film::make_kdms (
        list<libdcp::KDM> kdms;
 
        for (list<shared_ptr<Screen> >::iterator i = screens.begin(); i != screens.end(); ++i) {
-               kdms.push_back (make_kdm ((*i)->certificate, from, until));
+               kdms.push_back (make_kdm ((*i)->certificate, dcp, from, until));
        }
 
        return kdms;