In-line run of subs_in_out so that it gets the environment more easily.

[libdcp.git] / src / interop_subtitle_asset.cc

diff --git a/src/interop_subtitle_asset.cc b/src/interop_subtitle_asset.cc
index d51472845c66e92c93d63194e806941d83fecff9..32c3f66a4268649985fb0c031313b54c5b9123cc 100644 (file)
--- a/src/interop_subtitle_asset.cc
+++ b/src/interop_subtitle_asset.cc
@@ -39,7 +39,10 @@
 
 #include "compose.hpp"
 #include "dcp_assert.h"
+#include "equality_options.h"
+#include "filesystem.h"
 #include "font_asset.h"
+#include "file.h"
 #include "interop_load_font_node.h"
 #include "interop_subtitle_asset.h"
 #include "raw_convert.h"
@@ -73,7 +76,7 @@ InteropSubtitleAsset::InteropSubtitleAsset (boost::filesystem::path file)
        _raw_xml = dcp::file_to_string (file);
 
        auto xml = make_shared<cxml::Document>("DCSubtitle");
-       xml->read_file (file);
+       xml->read_file(dcp::filesystem::fix_long_path(file));
        _id = xml->string_child ("SubtitleID");
        _reel_number = xml->string_child ("ReelNumber");
        _language = xml->string_child ("Language");
@@ -125,7 +128,7 @@ InteropSubtitleAsset::xml_as_string () const
 
        subtitles_as_xml (root, 250, Standard::INTEROP);
 
-       return doc.write_to_string ("UTF-8");
+       return format_xml(doc, {});
 }
 
 
@@ -139,7 +142,7 @@ InteropSubtitleAsset::add_font (string load_id, dcp::ArrayData data)
 
 
 bool
-InteropSubtitleAsset::equals (shared_ptr<const Asset> other_asset, EqualityOptions options, NoteHandler note) const
+InteropSubtitleAsset::equals(shared_ptr<const Asset> other_asset, EqualityOptions const& options, NoteHandler note) const
 {
        if (!SubtitleAsset::equals (other_asset, options, note)) {
                return false;
@@ -191,15 +194,14 @@ InteropSubtitleAsset::load_font_nodes () const
 void
 InteropSubtitleAsset::write (boost::filesystem::path p) const
 {
-       auto f = fopen_boost (p, "w");
+       File f(p, "wb");
        if (!f) {
                throw FileError ("Could not open file for writing", p, -1);
        }
 
        _raw_xml = xml_as_string ();
        /* length() here gives bytes not characters */
-       fwrite (_raw_xml->c_str(), 1, _raw_xml->length(), f);
-       fclose (f);
+       f.write(_raw_xml->c_str(), 1, _raw_xml->length());
 
        _file = p;
 
@@ -214,13 +216,10 @@ InteropSubtitleAsset::write (boost::filesystem::path p) const
        /* Fonts */
        for (auto i: _load_font_nodes) {
                auto file = p.parent_path() / i->uri;
-               auto j = _fonts.begin();
-               while (j != _fonts.end() && j->load_id != i->id) {
-                       ++j;
-               }
-               if (j != _fonts.end ()) {
-                       j->data.write (file);
-                       j->file = file;
+               auto font_with_id = std::find_if(_fonts.begin(), _fonts.end(), [i](Font const& font) { return font.load_id == i->id; });
+               if (font_with_id != _fonts.end()) {
+                       font_with_id->data.write(file);
+                       font_with_id->file = file;
                }
        }
 }
@@ -233,49 +232,63 @@ InteropSubtitleAsset::write (boost::filesystem::path p) const
 void
 InteropSubtitleAsset::resolve_fonts (vector<shared_ptr<Asset>> assets)
 {
-       for (auto i: assets) {
-               auto font = dynamic_pointer_cast<FontAsset> (i);
+       for (auto asset: assets) {
+               auto font = dynamic_pointer_cast<FontAsset>(asset);
                if (!font) {
                        continue;
                }
 
-               for (auto j: _load_font_nodes) {
-                       bool got = false;
-                       for (auto const& k: _fonts) {
-                               if (k.load_id == j->id) {
-                                       got = true;
-                                       break;
-                               }
-                       }
+               DCP_ASSERT(_file);
 
-                       if (!got && font->file() && j->uri == font->file()->leaf().string()) {
-                               _fonts.push_back (Font (j->id, i->id(), font->file().get()));
+               for (auto load_font_node: _load_font_nodes) {
+                       auto const path_in_load_font_node = _file->parent_path() / load_font_node->uri;
+                       if (font->file() && path_in_load_font_node == *font->file()) {
+                               auto existing = std::find_if(_fonts.begin(), _fonts.end(), [load_font_node](Font const& font) { return font.load_id == load_font_node->id; });
+                               if (existing != _fonts.end()) {
+                                       *existing = Font(load_font_node->id, asset->id(), font->file().get());
+                               } else {
+                                       _fonts.push_back(Font(load_font_node->id, asset->id(), font->file().get()));
+                               }
                        }
                }
        }
 }
 
 
-void
-InteropSubtitleAsset::add_font_assets (vector<shared_ptr<Asset>>& assets)
+vector<shared_ptr<Asset>>
+InteropSubtitleAsset::font_assets()
+{
+       vector<shared_ptr<Asset>> assets;
+       for (auto const& i: _fonts) {
+               DCP_ASSERT (i.file);
+               assets.push_back(make_shared<FontAsset>(i.uuid, i.file.get()));
+       }
+       return assets;
+}
+
+
+vector<shared_ptr<const Asset>>
+InteropSubtitleAsset::font_assets() const
 {
+       vector<shared_ptr<const Asset>> assets;
        for (auto const& i: _fonts) {
                DCP_ASSERT (i.file);
-               assets.push_back (make_shared<FontAsset>(i.uuid, i.file.get()));
+               assets.push_back(make_shared<const FontAsset>(i.uuid, i.file.get()));
        }
+       return assets;
 }
 
 
 void
-InteropSubtitleAsset::write_to_assetmap (xmlpp::Node* node, boost::filesystem::path root) const
+InteropSubtitleAsset::add_to_assetmap (AssetMap& asset_map, boost::filesystem::path root) const
 {
-       Asset::write_to_assetmap (node, root);
+       Asset::add_to_assetmap(asset_map, root);
 
        for (auto i: _subtitles) {
-               auto im = dynamic_pointer_cast<dcp::SubtitleImage> (i);
+               auto im = dynamic_pointer_cast<dcp::SubtitleImage>(i);
                if (im) {
-                       DCP_ASSERT (im->file());
-                       write_file_to_assetmap (node, root, im->file().get(), im->id());
+                       DCP_ASSERT(im->file());
+                       add_file_to_assetmap(asset_map, root, im->file().get(), im->id());
                }
        }
 }
@@ -290,7 +303,7 @@ InteropSubtitleAsset::add_to_pkl (shared_ptr<PKL> pkl, boost::filesystem::path r
                auto im = dynamic_pointer_cast<dcp::SubtitleImage> (i);
                if (im) {
                        auto png_image = im->png_image ();
-                       pkl->add_asset (im->id(), optional<string>(), make_digest(png_image), png_image.size(), "image/png");
+                       pkl->add_asset(im->id(), optional<string>(), make_digest(png_image), png_image.size(), "image/png", root.filename().string());
                }
        }
 }
@@ -312,3 +325,16 @@ InteropSubtitleAsset::set_font_file (string load_id, boost::filesystem::path fil
        }
 }
 
+
+vector<string>
+InteropSubtitleAsset::unresolved_fonts() const
+{
+       vector<string> unresolved;
+       for (auto load_font_node: _load_font_nodes) {
+               if (std::find_if(_fonts.begin(), _fonts.end(), [load_font_node](Font const& font) { return font.load_id == load_font_node->id; }) == _fonts.end()) {
+                       unresolved.push_back(load_font_node->id);
+               }
+       }
+       return unresolved;
+}
+