X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=src%2Flib%2Fconfig.cc;h=14539044d2eb53b11f2465ea4e753e75a0ab1f93;hb=04eebe07e2f64bd15f6887a10ab51fb92c52901a;hp=3a3a87faa53f227bee8d8a66a23128b3c026fbde;hpb=13d924ad844ca6b642880910e21c5e322dbc4408;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 3a3a87faa..14539044d 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012 Carl Hetherington + Copyright (C) 2012-2014 Carl Hetherington This program is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -22,7 +22,11 @@ #include #include #include -#include +#include +#include +#include +#include +#include #include #include "config.h" #include "server.h" @@ -30,34 +34,47 @@ #include "filter.h" #include "ratio.h" #include "dcp_content_type.h" -#include "sound_processor.h" +#include "cinema_sound_processor.h" #include "colour_conversion.h" #include "cinema.h" +#include "util.h" +#include "cross.h" #include "i18n.h" using std::vector; using std::ifstream; using std::string; -using std::ofstream; using std::list; using std::max; +using std::exception; +using std::cerr; using boost::shared_ptr; -using boost::lexical_cast; using boost::optional; +using boost::algorithm::is_any_of; +using boost::algorithm::split; +using dcp::raw_convert; Config* Config::_instance = 0; /** Construct default configuration */ Config::Config () : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency())) - , _server_port (6192) - , _tms_path (N_(".")) - , _sound_processor (SoundProcessor::from_id (N_("dolby_cp750"))) + , _server_port_base (6192) + , _use_any_servers (true) + , _tms_path (".") + , _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_container (Ratio::from_id ("185")) - , _default_dcp_content_type (DCPContentType::from_dci_name ("TST")) - , _default_j2k_bandwidth (200000000) + , _default_dcp_content_type (DCPContentType::from_isdcf_name ("TST")) + , _default_j2k_bandwidth (100000000) + , _default_audio_delay (0) + , _check_for_updates (false) + , _check_for_test_updates (false) + , _maximum_j2k_bandwidth (250000000) + , _log_types (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR) { _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); @@ -66,15 +83,17 @@ Config::Config () _allowed_dcp_frame_rates.push_back (50); _allowed_dcp_frame_rates.push_back (60); - _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, libdcp::colour_matrix::srgb_to_xyz, 2.6)); - _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, libdcp::colour_matrix::srgb_to_xyz, 2.6)); + _colour_conversions.push_back (PresetColourConversion (_("sRGB"), 2.4, true, dcp::colour_matrix::srgb_to_xyz, 2.6)); + _colour_conversions.push_back (PresetColourConversion (_("sRGB non-linearised"), 2.4, false, dcp::colour_matrix::srgb_to_xyz, 2.6)); + _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); + + reset_kdm_email (); } void Config::read () { if (!boost::filesystem::exists (file (false))) { - read_old_metadata (); return; } @@ -82,15 +101,29 @@ Config::read () f.read_file (file (false)); optional c; + optional version = f.optional_number_child ("Version"); + _num_local_encoding_threads = f.number_child ("NumLocalEncodingThreads"); _default_directory = f.string_child ("DefaultDirectory"); - _server_port = f.number_child ("ServerPort"); - - list > servers = f.node_children ("Server"); - for (list >::iterator i = servers.begin(); i != servers.end(); ++i) { - _servers.push_back (ServerDescription (*i)); + + boost::optional b = f.optional_number_child ("ServerPort"); + if (!b) { + b = f.optional_number_child ("ServerPortBase"); } + _server_port_base = b.get (); + boost::optional u = f.optional_bool_child ("UseAnyServers"); + _use_any_servers = u.get_value_or (true); + + list servers = f.node_children ("Server"); + for (list::iterator i = servers.begin(); i != servers.end(); ++i) { + if ((*i)->node_children("HostName").size() == 1) { + _servers.push_back ((*i)->string_child ("HostName")); + } else { + _servers.push_back ((*i)->content ()); + } + } + _tms_ip = f.string_child ("TMSIP"); _tms_path = f.string_child ("TMSPath"); _tms_user = f.string_child ("TMSUser"); @@ -98,11 +131,20 @@ Config::read () c = f.optional_string_child ("SoundProcessor"); if (c) { - _sound_processor = SoundProcessor::from_id (c.get ()); + _cinema_sound_processor = CinemaSoundProcessor::from_id (c.get ()); + } + c = f.optional_string_child ("CinemaSoundProcessor"); + if (c) { + _cinema_sound_processor = CinemaSoundProcessor::from_id (c.get ()); } _language = f.optional_string_child ("Language"); + c = f.optional_string_child ("DefaultScale"); + if (c) { + _default_scale = Ratio::from_id (c.get ()); + } + c = f.optional_string_child ("DefaultContainer"); if (c) { _default_container = Ratio::from_id (c.get ()); @@ -110,28 +152,41 @@ Config::read () c = f.optional_string_child ("DefaultDCPContentType"); if (c) { - _default_dcp_content_type = DCPContentType::from_dci_name (c.get ()); + _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 (""); - _default_dci_metadata = DCIMetadata (f.node_child ("DCIMetadata")); + if (version && version.get() >= 2) { + _default_isdcf_metadata = ISDCFMetadata (f.node_child ("ISDCFMetadata")); + } else { + _default_isdcf_metadata = ISDCFMetadata (f.node_child ("DCIMetadata")); + } + _default_still_length = f.optional_number_child("DefaultStillLength").get_value_or (10); _default_j2k_bandwidth = f.optional_number_child("DefaultJ2KBandwidth").get_value_or (200000000); + _default_audio_delay = f.optional_number_child("DefaultAudioDelay").get_value_or (0); - list > cc = f.node_children ("ColourConversion"); + list cc = f.node_children ("ColourConversion"); if (!cc.empty ()) { _colour_conversions.clear (); } - for (list >::iterator i = cc.begin(); i != cc.end(); ++i) { + for (list::iterator i = cc.begin(); i != cc.end(); ++i) { _colour_conversions.push_back (PresetColourConversion (*i)); } - list > cin = f.node_children ("Cinema"); - for (list >::iterator i = cin.begin(); i != cin.end(); ++i) { + if (!version) { + /* Loading version 0 (before Rec. 709 was added as a preset). + Add it in. + */ + _colour_conversions.push_back (PresetColourConversion (_("Rec. 709"), 2.2, false, dcp::colour_matrix::rec709_to_xyz, 2.6)); + } + + list cin = f.node_children ("Cinema"); + for (list::iterator i = cin.begin(); i != cin.end(); ++i) { /* Slightly grotty two-part construction of Cinema here so that we can use shared_from_this. */ @@ -141,68 +196,51 @@ Config::read () } _mail_server = f.string_child ("MailServer"); + _mail_user = f.optional_string_child("MailUser").get_value_or (""); + _mail_password = f.optional_string_child("MailPassword").get_value_or (""); + _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"); -void -Config::read_old_metadata () -{ - ifstream f (file(true).c_str ()); - string line; + _check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false); + _check_for_test_updates = f.optional_bool_child("CheckForTestUpdates").get_value_or (false); - while (getline (f, line)) { - if (line.empty ()) { - continue; - } + _maximum_j2k_bandwidth = f.optional_number_child ("MaximumJ2KBandwidth").get_value_or (250000000); + _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate"); - if (line[0] == '#') { - continue; - } + _log_types = f.optional_number_child ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); - size_t const s = line.find (' '); - if (s == string::npos) { - continue; - } - - string const k = line.substr (0, s); - string const v = line.substr (s + 1); - - if (k == N_("num_local_encoding_threads")) { - _num_local_encoding_threads = atoi (v.c_str ()); - } else if (k == N_("default_directory")) { - _default_directory = v; - } else if (k == N_("server_port")) { - _server_port = atoi (v.c_str ()); - } else if (k == N_("server")) { - optional server = ServerDescription::create_from_metadata (v); - if (server) { - _servers.push_back (server.get ()); - } - } else if (k == N_("tms_ip")) { - _tms_ip = v; - } else if (k == N_("tms_path")) { - _tms_path = v; - } else if (k == N_("tms_user")) { - _tms_user = v; - } else if (k == N_("tms_password")) { - _tms_password = v; - } else if (k == N_("sound_processor")) { - _sound_processor = SoundProcessor::from_id (v); - } else if (k == "language") { - _language = v; - } else if (k == "default_container") { - _default_container = Ratio::from_id (v); - } else if (k == "default_dcp_content_type") { - _default_dcp_content_type = DCPContentType::from_dci_name (v); - } else if (k == "dcp_metadata_issuer") { - _dcp_metadata.issuer = v; - } else if (k == "dcp_metadata_creator") { - _dcp_metadata.creator = v; - } else if (k == "dcp_metadata_issue_date") { - _dcp_metadata.issue_date = v; + cxml::NodePtr signer = f.optional_node_child ("Signer"); + dcp::CertificateChain signer_chain; + if (signer) { + /* Read the signing certificates and private key in from the config file */ + list certificates = signer->node_children ("Certificate"); + for (list::const_iterator i = certificates.begin(); i != certificates.end(); ++i) { + signer_chain.add (dcp::Certificate ((*i)->content ())); } - _default_dci_metadata.read_old_metadata (k, v); + _signer.reset (new dcp::Signer (signer_chain, signer->string_child ("PrivateKey"))); + } else { + /* Make a new set of signing certificates and key */ + _signer.reset (new dcp::Signer (openssl_path ())); + } + + if (f.optional_string_child ("DecryptionCertificate")) { + _decryption_certificate = dcp::Certificate (f.string_child ("DecryptionCertificate")); + } + + if (f.optional_string_child ("DecryptionPrivateKey")) { + _decryption_private_key = f.string_child ("DecryptionPrivateKey"); + } + + 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); } } @@ -217,22 +255,13 @@ Config::file (bool old) const if (old) { p /= ".dvdomatic"; } else { - p /= "dcpomatic.xml"; + p /= "dcpomatic"; + boost::filesystem::create_directory (p, ec); + p /= "config.xml"; } return p; } -boost::filesystem::path -Config::signer_chain_directory () const -{ - boost::filesystem::path p; - p /= g_get_user_config_dir (); - p /= "dvdomatic"; - p /= "crypt"; - boost::filesystem::create_directories (p); - return p; -} - /** @return Singleton instance */ Config * Config::instance () @@ -241,10 +270,13 @@ Config::instance () _instance = new Config; try { _instance->read (); - } catch (...) { + } catch (exception& e) { /* configuration load failed; never mind, just stick with the default. */ + cerr << "dcpomatic: failed to load configuration (" << e.what() << ")\n"; + } catch (...) { + cerr << "dcpomatic: failed to load configuration\n"; } } @@ -258,37 +290,43 @@ Config::write () const xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Config"); - root->add_child("NumLocalEncodingThreads")->add_child_text (lexical_cast (_num_local_encoding_threads)); + root->add_child("Version")->add_child_text ("2"); + root->add_child("NumLocalEncodingThreads")->add_child_text (raw_convert (_num_local_encoding_threads)); root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ()); - root->add_child("ServerPort")->add_child_text (lexical_cast (_server_port)); + root->add_child("ServerPortBase")->add_child_text (raw_convert (_server_port_base)); + root->add_child("UseAnyServers")->add_child_text (_use_any_servers ? "1" : "0"); - for (vector::const_iterator i = _servers.begin(); i != _servers.end(); ++i) { - i->as_xml (root->add_child ("Server")); + for (vector::const_iterator i = _servers.begin(); i != _servers.end(); ++i) { + root->add_child("Server")->add_child_text (*i); } root->add_child("TMSIP")->add_child_text (_tms_ip); root->add_child("TMSPath")->add_child_text (_tms_path); root->add_child("TMSUser")->add_child_text (_tms_user); root->add_child("TMSPassword")->add_child_text (_tms_password); - if (_sound_processor) { - root->add_child("SoundProcessor")->add_child_text (_sound_processor->id ()); + if (_cinema_sound_processor) { + root->add_child("CinemaSoundProcessor")->add_child_text (_cinema_sound_processor->id ()); } if (_language) { root->add_child("Language")->add_child_text (_language.get()); } + if (_default_scale) { + 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->dci_name ()); + 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); - _default_dci_metadata.as_xml (root->add_child ("DCIMetadata")); + _default_isdcf_metadata.as_xml (root->add_child ("ISDCFMetadata")); - root->add_child("DefaultStillLength")->add_child_text (lexical_cast (_default_still_length)); - root->add_child("DefaultJ2KBandwidth")->add_child_text (lexical_cast (_default_j2k_bandwidth)); + root->add_child("DefaultStillLength")->add_child_text (raw_convert (_default_still_length)); + root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert (_default_j2k_bandwidth)); + root->add_child("DefaultAudioDelay")->add_child_text (raw_convert (_default_audio_delay)); for (vector::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) { i->as_xml (root->add_child ("ColourConversion")); @@ -299,7 +337,30 @@ Config::write () const } root->add_child("MailServer")->add_child_text (_mail_server); + root->add_child("MailUser")->add_child_text (_mail_user); + root->add_child("MailPassword")->add_child_text (_mail_password); + 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"); + root->add_child("CheckForTestUpdates")->add_child_text (_check_for_test_updates ? "1" : "0"); + + root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert (_maximum_j2k_bandwidth)); + root->add_child("AllowAnyDCPFrameRate")->add_child_text (_allow_any_dcp_frame_rate ? "1" : "0"); + root->add_child("LogTypes")->add_child_text (raw_convert (_log_types)); + + xmlpp::Element* signer = root->add_child ("Signer"); + dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf (); + for (dcp::CertificateChain::List::const_iterator i = certs.begin(); i != certs.end(); ++i) { + signer->add_child("Certificate")->add_child_text (i->certificate (true)); + } + signer->add_child("PrivateKey")->add_child_text (_signer->key ()); + + root->add_child("DecryptionCertificate")->add_child_text (_decryption_certificate.certificate (true)); + root->add_child("DecryptionPrivateKey")->add_child_text (_decryption_private_key); doc.write_to_file_formatted (file(false).string ()); } @@ -307,7 +368,13 @@ Config::write () const boost::filesystem::path Config::default_directory_or (boost::filesystem::path a) const { - if (_default_directory.empty() || !boost::filesystem::exists (_default_directory)) { + if (_default_directory.empty()) { + return a; + } + + boost::system::error_code ec; + bool const e = boost::filesystem::exists (_default_directory, ec); + if (ec || !e) { return a; } @@ -320,3 +387,23 @@ Config::drop () delete _instance; _instance = 0; } + +void +Config::changed () +{ + write (); + Changed (); +} + +void +Config::reset_kdm_email () +{ + _kdm_email = _( + "Dear Projectionist\n\n" + "Please find attached KDMs for $CPL_NAME.\n\n" + "Cinema: $CINEMA_NAME\n" + "Screen(s): $SCREENS\n\n" + "The KDMs are valid from $START_TIME until $END_TIME.\n\n" + "Best regards,\nDCP-o-matic" + ); +}