X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=114fc5c274c7753cdc0f2e0f721603ecaf47cd12;hb=5dc2dbdb6639f8d617a40209ad603d2a38f9df2a;hp=1fd4792c3bbf80f6d721a190264f4479b7659793;hpb=ac35bf2a80c9afae9dc5fcb0261929053162f44d;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 1fd4792c3..114fc5c27 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -17,7 +17,6 @@ */ -#include #include #include #include @@ -43,10 +42,12 @@ #include "i18n.h" using std::vector; +using std::cout; using std::ifstream; using std::string; using std::list; using std::max; +using std::remove; using std::exception; using std::cerr; using boost::shared_ptr; @@ -66,7 +67,7 @@ Config::Config () , _cinema_sound_processor (CinemaSoundProcessor::from_id (N_("dolby_cp750"))) , _allow_any_dcp_frame_rate (false) , _default_still_length (10) - , _default_scale (Ratio::from_id ("185")) + , _default_scale (VideoContentScale (Ratio::from_id ("185"))) , _default_container (Ratio::from_id ("185")) , _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST")) , _default_j2k_bandwidth (100000000) @@ -94,6 +95,10 @@ void Config::read () { if (!boost::filesystem::exists (file (false))) { + /* Make a new set of signing certificates and key */ + _signer.reset (new dcp::Signer (openssl_path ())); + /* And decryption keys */ + make_decryption_keys (); return; } @@ -142,7 +147,7 @@ Config::read () c = f.optional_string_child ("DefaultScale"); if (c) { - _default_scale = Ratio::from_id (c.get ()); + _default_scale = VideoContentScale::from_id (c.get ()); } c = f.optional_string_child ("DefaultContainer"); @@ -155,9 +160,12 @@ Config::read () _default_dcp_content_type = DCPContentType::from_isdcf_name (c.get ()); } - _dcp_metadata.issuer = f.optional_string_child ("DCPMetadataIssuer").get_value_or (""); - _dcp_metadata.creator = f.optional_string_child ("DCPMetadataCreator").get_value_or (""); - + if (f.optional_string_child ("DCPMetadataIssuer")) { + _dcp_issuer = f.string_child ("DCPMetadataIssuer"); + } else if (f.optional_string_child ("DCPIssuer")) { + _dcp_issuer = f.string_child ("DCPIssuer"); + } + if (version && version.get() >= 2) { _default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata")); } else { @@ -201,6 +209,7 @@ Config::read () _kdm_subject = f.optional_string_child ("KDMSubject").get_value_or (_("KDM delivery: $CPL_NAME")); _kdm_from = f.string_child ("KDMFrom"); _kdm_cc = f.optional_string_child ("KDMCC").get_value_or (""); + _kdm_bcc = f.optional_string_child ("KDMBCC").get_value_or (""); _kdm_email = f.string_child ("KDMEmail"); _check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false); @@ -211,6 +220,11 @@ Config::read () _log_types = f.optional_number_child ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); + list his = f.node_children ("History"); + for (list::const_iterator i = his.begin(); i != his.end(); ++i) { + _history.push_back ((*i)->content ()); + } + cxml::NodePtr signer = f.optional_node_child ("Signer"); dcp::CertificateChain signer_chain; if (signer) { @@ -236,13 +250,19 @@ Config::read () if (!f.optional_string_child ("DecryptionCertificate") || !f.optional_string_child ("DecryptionPrivateKey")) { /* Generate our own decryption certificate and key if either is not present in config */ - boost::filesystem::path p = dcp::make_certificate_chain (openssl_path ()); - _decryption_certificate = dcp::Certificate (dcp::file_to_string (p / "leaf.signed.pem")); - _decryption_private_key = dcp::file_to_string (p / "leaf.key"); - boost::filesystem::remove_all (p); + make_decryption_keys (); } } +void +Config::make_decryption_keys () +{ + boost::filesystem::path p = dcp::make_certificate_chain (openssl_path ()); + _decryption_certificate = dcp::Certificate (dcp::file_to_string (p / "leaf.signed.pem")); + _decryption_private_key = dcp::file_to_string (p / "leaf.key"); + boost::filesystem::remove_all (p); +} + /** @return Filename to write configuration to */ boost::filesystem::path Config::file (bool old) const @@ -309,17 +329,14 @@ Config::write () const if (_language) { root->add_child("Language")->add_child_text (_language.get()); } - if (_default_scale) { - root->add_child("DefaultScale")->add_child_text (_default_scale->id ()); - } + root->add_child("DefaultScale")->add_child_text (_default_scale.id ()); if (_default_container) { root->add_child("DefaultContainer")->add_child_text (_default_container->id ()); } if (_default_dcp_content_type) { root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ()); } - root->add_child("DCPMetadataIssuer")->add_child_text (_dcp_metadata.issuer); - root->add_child("DCPMetadataCreator")->add_child_text (_dcp_metadata.creator); + root->add_child("DCPIssuer")->add_child_text (_dcp_issuer); _default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata")); @@ -341,6 +358,7 @@ Config::write () const root->add_child("KDMSubject")->add_child_text (_kdm_subject); root->add_child("KDMFrom")->add_child_text (_kdm_from); root->add_child("KDMCC")->add_child_text (_kdm_cc); + root->add_child("KDMBCC")->add_child_text (_kdm_bcc); root->add_child("KDMEmail")->add_child_text (_kdm_email); root->add_child("CheckForUpdates")->add_child_text (_check_for_updates ? "1" : "0"); @@ -360,6 +378,10 @@ Config::write () const root->add_child("DecryptionCertificate")->add_child_text (_decryption_certificate.certificate (true)); root->add_child("DecryptionPrivateKey")->add_child_text (_decryption_private_key); + for (vector::const_iterator i = _history.begin(); i != _history.end(); ++i) { + root->add_child("History")->add_child_text (i->string ()); + } + doc.write_to_file_formatted (file(false).string ()); } @@ -405,3 +427,17 @@ Config::reset_kdm_email () "Best regards,\nDCP-o-matic" ); } + +void +Config::add_to_history (boost::filesystem::path p) +{ + /* Remove existing instances of this path in the history */ + _history.erase (remove (_history.begin(), _history.end(), p), _history.end ()); + + _history.insert (_history.begin (), p); + if (_history.size() > HISTORY_SIZE) { + _history.pop_back (); + } + + changed (); +}