Remove Fade{Up,Down}Time tags when writing text FOR_CCAP.

[libdcp.git] / src / dcp.cc

diff --git a/src/dcp.cc b/src/dcp.cc
index 7fa847987a2505e459b48b1e9de6f6c7c80344bf..d603cfae48694ae71d89ae9f0b57a673efd0381a 100644 (file)
--- a/src/dcp.cc
+++ b/src/dcp.cc
@@ -47,6 +47,7 @@
 #include "decrypted_kdm.h"
 #include "decrypted_kdm_key.h"
 #include "exceptions.h"
+#include "filesystem.h"
 #include "font_asset.h"
 #include "interop_subtitle_asset.h"
 #include "metadata.h"
@@ -71,7 +72,6 @@ LIBDCP_DISABLE_WARNINGS
 #include <libxml++/libxml++.h>
 LIBDCP_ENABLE_WARNINGS
 #include <boost/algorithm/string.hpp>
-#include <boost/filesystem.hpp>
 #include <numeric>
 
 
@@ -98,11 +98,11 @@ static string const volindex_smpte_ns   = "http://www.smpte-ra.org/schemas/429-9
 DCP::DCP (boost::filesystem::path directory)
        : _directory (directory)
 {
-       if (!boost::filesystem::exists (directory)) {
-               boost::filesystem::create_directories (directory);
+       if (!filesystem::exists(directory)) {
+               filesystem::create_directories(directory);
        }
 
-       _directory = boost::filesystem::canonical (_directory);
+       _directory = filesystem::canonical(_directory);
 }
 
 
@@ -141,9 +141,9 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
        /* Read the ASSETMAP and PKL */
 
        boost::filesystem::path asset_map_path;
-       if (boost::filesystem::exists(_directory / "ASSETMAP")) {
+       if (filesystem::exists(_directory / "ASSETMAP")) {
                asset_map_path = _directory / "ASSETMAP";
-       } else if (boost::filesystem::exists(_directory / "ASSETMAP.xml")) {
+       } else if (filesystem::exists(_directory / "ASSETMAP.xml")) {
                asset_map_path = _directory / "ASSETMAP.xml";
        } else {
                boost::throw_exception(MissingAssetmapError(_directory));
@@ -189,7 +189,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
                        continue;
                }
 
-               if (!boost::filesystem::exists(path)) {
+               if (!filesystem::exists(path)) {
                        if (notes) {
                                notes->push_back ({VerificationNote::Type::ERROR, VerificationNote::Code::MISSING_ASSET, path});
                        }
@@ -224,7 +224,7 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
                        pkl_type == remove_parameters(InteropSubtitleAsset::static_pkl_type(standard))) {
                        auto p = new xmlpp::DomParser;
                        try {
-                               p->parse_file (path.string());
+                               p->parse_file(dcp::filesystem::fix_long_path(path).string());
                        } catch (std::exception& e) {
                                delete p;
                                throw ReadError(String::compose("XML error in %1", path.string()), e.what());
@@ -253,7 +253,11 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
                        ) {
 
                        bool found_threed_marked_as_twod = false;
-                       other_assets.push_back (asset_factory(path, ignore_incorrect_picture_mxf_type, &found_threed_marked_as_twod));
+                       auto asset = asset_factory(path, ignore_incorrect_picture_mxf_type, &found_threed_marked_as_twod);
+                       if (asset->id() != id) {
+                               notes->push_back(VerificationNote(VerificationNote::Type::ERROR, VerificationNote::Code::MISMATCHED_ASSET_MAP_ID).set_id(id).set_other_id(asset->id()));
+                       }
+                       other_assets.push_back(asset);
                        if (found_threed_marked_as_twod && notes) {
                                notes->push_back ({VerificationNote::Type::WARNING, VerificationNote::Code::THREED_ASSET_MARKED_AS_TWOD, path});
                        }
@@ -266,6 +270,48 @@ DCP::read (vector<dcp::VerificationNote>* notes, bool ignore_incorrect_picture_m
                }
        }
 
+       /* Set hashes for assets where we have an idea of what the hash should be in either a CPL or PKL.
+        * This means that when the hash is later read from these objects the result will be the one that
+        * it should be, rather the one that it currently is.  This should prevent errors being concealed
+        * when an asset is corrupted - the hash from the CPL/PKL will disagree with the actual hash of the
+        * file, revealing the problem.
+        */
+
+       auto hash_from_pkl = [this](string id) -> optional<string> {
+               for (auto pkl: _pkls) {
+                       if (auto pkl_hash = pkl->hash(id)) {
+                               return pkl_hash;
+                       }
+               }
+
+               return {};
+       };
+
+       auto hash_from_cpl_or_pkl = [this, &hash_from_pkl](string id) -> optional<string> {
+               for (auto cpl: cpls()) {
+                       for (auto reel_file_asset: cpl->reel_file_assets()) {
+                               if (reel_file_asset->asset_ref().id() == id && reel_file_asset->hash()) {
+                                       return reel_file_asset->hash();
+                               }
+                       }
+               }
+
+               return hash_from_pkl(id);
+       };
+
+       for (auto asset: other_assets) {
+               if (auto hash = hash_from_cpl_or_pkl(asset->id())) {
+                       asset->set_hash(*hash);
+               }
+       }
+
+       for (auto cpl: cpls()) {
+               if (auto hash = hash_from_pkl(cpl->id())) {
+                       cpl->set_hash(*hash);
+               }
+       }
+
+       /* Resolve references */
        resolve_refs (other_assets);
 
        /* While we've got the ASSETMAP lets look and see if this DCP refers to things that are not in its ASSETMAP */
@@ -291,7 +337,7 @@ DCP::resolve_refs (vector<shared_ptr<Asset>> assets)
 
 
 bool
-DCP::equals (DCP const & other, EqualityOptions opt, NoteHandler note) const
+DCP::equals(DCP const & other, EqualityOptions const& opt, NoteHandler note) const
 {
        auto a = cpls ();
        auto b = other.cpls ();
@@ -396,7 +442,7 @@ DCP::write_volindex (Standard standard) const
        }
 
        root->add_child("Index")->add_child_text ("1");
-       doc.write_to_file_formatted (p.string (), "UTF-8");
+       doc.write_to_file_formatted(dcp::filesystem::fix_long_path(p).string(), "UTF-8");
 }