diff options
| author | Carl Hetherington <cth@carlh.net> | 2023-09-04 20:08:03 +0200 |
|---|---|---|
| committer | Carl Hetherington <cth@carlh.net> | 2023-09-04 20:08:03 +0200 |
| commit | 8571f2313029fe6398622c6d337c0066b58b1680 (patch) | |
| tree | bd6c408667cbd3ebb4e6b0adb4bbbe2e4db0ffff | |
| parent | 11a47a4544f77a47b508e4cf1983aca7d5b6cd2a (diff) | |
Use configured issuer/creator for DCPs made by map (#2585).
| -rw-r--r-- | src/lib/map_cli.cc | 2 | ||||
| -rw-r--r-- | test/map_cli_test.cc | 38 |
2 files changed, 40 insertions, 0 deletions
diff --git a/src/lib/map_cli.cc b/src/lib/map_cli.cc index 31adf3a51..86f5057c0 100644 --- a/src/lib/map_cli.cc +++ b/src/lib/map_cli.cc @@ -305,6 +305,8 @@ map_cli(int argc, char* argv[], std::function<void (string)> out) dcp.resolve_refs(assets); dcp.set_annotation_text(cpls[0]->annotation_text().get_value_or("")); try { + dcp.set_creator(Config::instance()->dcp_creator()); + dcp.set_issuer(Config::instance()->dcp_issuer()); dcp.write_xml(Config::instance()->signer_chain()); } catch (dcp::UnresolvedRefError& e) { return String::compose("%1\nPerhaps you need to give a -d parameter to say where this asset is located.", e.what()); diff --git a/test/map_cli_test.cc b/test/map_cli_test.cc index 1267e9b4c..a4056dc46 100644 --- a/test/map_cli_test.cc +++ b/test/map_cli_test.cc @@ -504,3 +504,41 @@ BOOST_AUTO_TEST_CASE(map_multireel_interop_ov_and_vf_adding_ccaps) } +BOOST_AUTO_TEST_CASE(map_uses_config_for_issuer_and_creator) +{ + ConfigRestorer cr; + + Config::instance()->set_dcp_issuer("ostrabagalous"); + Config::instance()->set_dcp_creator("Fred"); + + string const name = "map_uses_config_for_issuer_and_creator"; + string const out = String::compose("build/test/%1_out", name); + + auto content = content_factory("test/data/flat_red.png"); + auto film = new_test_film2(name + "_in", content); + make_and_verify_dcp(film); + + vector<string> const args = { + "map_cli", + "-o", out, + "-d", film->dir(film->dcp_name()).string(), + find_cpl(film->dir(film->dcp_name())).string() + }; + + boost::filesystem::remove_all(out); + + vector<string> output_messages; + auto error = run(args, output_messages); + BOOST_CHECK(!error); + + cxml::Document assetmap("AssetMap"); + assetmap.read_file(film->dir(film->dcp_name()) / "ASSETMAP.xml"); + BOOST_CHECK(assetmap.string_child("Issuer") == "ostrabagalous"); + BOOST_CHECK(assetmap.string_child("Creator") == "Fred"); + + cxml::Document pkl("PackingList"); + pkl.read_file(find_prefix(out, "pkl_")); + BOOST_CHECK(pkl.string_child("Issuer") == "ostrabagalous"); + BOOST_CHECK(pkl.string_child("Creator") == "Fred"); +} + |