X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=c6c6cac8b3d38be39e650d13f2ebb9a17aa1177e;hp=6862cc565550f6af5e8e3cd13b005260cbb12450;hb=422be0eece2bf6ee80db1d3c21553cd82efff789;hpb=1858190cff2f960f3d1f0a5cc02c69da86088f5b diff --git a/src/lib/config.cc b/src/lib/config.cc index 6862cc565..c6c6cac8b 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1,24 +1,24 @@ /* - Copyright (C) 2012-2015 Carl Hetherington + Copyright (C) 2012-2016 Carl Hetherington - This program is free software; you can redistribute it and/or modify + This file is part of DCP-o-matic. + + DCP-o-matic is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by the Free Software Foundation; either version 2 of the License, or (at your option) any later version. - This program is distributed in the hope that it will be useful, + DCP-o-matic is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. You should have received a copy of the GNU General Public License - along with this program; if not, write to the Free Software - Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA. + along with DCP-o-matic. If not, see . */ #include "config.h" -#include "server.h" #include "filter.h" #include "ratio.h" #include "types.h" @@ -38,6 +38,7 @@ #include #include #include +#include #include #include #include @@ -58,6 +59,7 @@ using boost::optional; using boost::algorithm::trim; Config* Config::_instance = 0; +boost::signals2::signal Config::FailedToLoad; /** Construct default configuration */ Config::Config () @@ -84,24 +86,28 @@ Config::set_defaults () _default_still_length = 10; _default_container = Ratio::from_id ("185"); _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR"); + _default_dcp_audio_channels = 6; _default_j2k_bandwidth = 100000000; _default_audio_delay = 0; + _default_interop = false; _mail_server = ""; _mail_port = 25; _mail_user = ""; _mail_password = ""; - _kdm_subject = _("KDM delivery"); _kdm_from = ""; - _kdm_cc = ""; + _kdm_cc.clear (); _kdm_bcc = ""; _check_for_updates = false; _check_for_test_updates = false; _maximum_j2k_bandwidth = 250000000; - _log_types = Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR; + _log_types = LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR; + _analyse_ebur128 = true; _automatic_audio_analysis = false; #ifdef DCPOMATIC_WINDOWS _win32_console = false; #endif + _cinemas_file = path ("cinemas.xml"); + _show_hints_before_make_dcp = true; _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); @@ -121,20 +127,27 @@ Config::restore_defaults () Config::instance()->changed (); } +shared_ptr +Config::create_certificate_chain () +{ + return shared_ptr ( + new dcp::CertificateChain ( + openssl_path(), + "dcpomatic.com", + "dcpomatic.com", + ".dcpomatic.smpte-430-2.ROOT", + ".dcpomatic.smpte-430-2.INTERMEDIATE", + "CS.dcpomatic.smpte-430-2.LEAF" + ) + ); +} + void Config::read () +try { - if (!have_existing ()) { - /* Make a new set of signing certificates and key */ - _signer_chain.reset (new dcp::CertificateChain (openssl_path ())); - /* And similar for decryption of KDMs */ - _decryption_chain.reset (new dcp::CertificateChain (openssl_path ())); - write (); - return; - } - cxml::Document f ("Config"); - f.read_file (file ()); + f.read_file (path ("config.xml")); optional c; optional version = f.optional_number_child ("Version"); @@ -188,6 +201,8 @@ Config::read () _default_dcp_content_type = DCPContentType::from_isdcf_name (c.get ()); } + _default_dcp_audio_channels = f.optional_number_child("DefaultDCPAudioChannels").get_value_or (6); + if (f.optional_string_child ("DCPMetadataIssuer")) { _dcp_issuer = f.string_child ("DCPMetadataIssuer"); } else if (f.optional_string_child ("DCPIssuer")) { @@ -205,16 +220,10 @@ Config::read () _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); + _default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false); - 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. - */ - shared_ptr cinema (new Cinema (*i)); - cinema->read_screens (*i); - _cinemas.push_back (cinema); - } + /* Load any cinemas from config.xml */ + read_cinemas (f); _mail_server = f.string_child ("MailServer"); _mail_port = f.optional_number_child ("MailPort").get_value_or (25); @@ -222,7 +231,11 @@ Config::read () _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 (""); + BOOST_FOREACH (cxml::ConstNodePtr i, f.node_children("KDMCC")) { + if (!i->content().empty()) { + _kdm_cc.push_back (i->content ()); + } + } _kdm_bcc = f.optional_string_child ("KDMBCC").get_value_or (""); _kdm_email = f.string_child ("KDMEmail"); @@ -230,9 +243,10 @@ Config::read () _check_for_test_updates = f.optional_bool_child("CheckForTestUpdates").get_value_or (false); _maximum_j2k_bandwidth = f.optional_number_child ("MaximumJ2KBandwidth").get_value_or (250000000); - _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate"); + _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate").get_value_or (false); - _log_types = f.optional_number_child ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); + _log_types = f.optional_number_child ("LogTypes").get_value_or (LogEntry::TYPE_GENERAL | LogEntry::TYPE_WARNING | LogEntry::TYPE_ERROR); + _analyse_ebur128 = f.optional_bool_child("AnalyseEBUR128").get_value_or (true); _automatic_audio_analysis = f.optional_bool_child ("AutomaticAudioAnalysis").get_value_or (false); #ifdef DCPOMATIC_WINDOWS _win32_console = f.optional_bool_child ("Win32Console").get_value_or (false); @@ -254,7 +268,7 @@ Config::read () _signer_chain = c; } else { /* Make a new set of signing certificates and key */ - _signer_chain.reset (new dcp::CertificateChain (openssl_path ())); + _signer_chain = create_certificate_chain (); } cxml::NodePtr decryption = f.optional_node_child ("Decryption"); @@ -266,13 +280,41 @@ Config::read () c->set_key (decryption->string_child ("PrivateKey")); _decryption_chain = c; } else { - _decryption_chain.reset (new dcp::CertificateChain (openssl_path ())); + _decryption_chain = create_certificate_chain (); + } + + list dkdm = f.node_children ("DKDM"); + BOOST_FOREACH (cxml::NodePtr i, f.node_children ("DKDM")) { + _dkdms.push_back (dcp::EncryptedKDM (i->content ())); + } + + _cinemas_file = f.optional_string_child("CinemasFile").get_value_or (path ("cinemas.xml").string ()); + _show_hints_before_make_dcp = f.optional_bool_child("ShowHintsBeforeMakeDCP").get_value_or (true); + + /* Replace any cinemas from config.xml with those from the configured file */ + if (boost::filesystem::exists (_cinemas_file)) { + cxml::Document f ("Cinemas"); + f.read_file (_cinemas_file); + read_cinemas (f); } } +catch (...) { + if (have_existing ("config.xml")) { + /* We have a config file but it didn't load */ + FailedToLoad (); + } + set_defaults (); + /* Make a new set of signing certificates and key */ + _signer_chain = create_certificate_chain (); + /* And similar for decryption of KDMs */ + _decryption_chain = create_certificate_chain (); + write (); +} + /** @return Filename to write configuration to */ boost::filesystem::path -Config::file (bool create_directories) +Config::path (string file, bool create_directories) { boost::filesystem::path p; #ifdef DCPOMATIC_OSX @@ -289,7 +331,7 @@ Config::file (bool create_directories) if (create_directories) { boost::filesystem::create_directories (p, ec); } - p /= "config.xml"; + p /= file; return p; } @@ -299,16 +341,7 @@ Config::instance () { if (_instance == 0) { _instance = new Config; - try { - _instance->read (); - } catch (exception& e) { - /* configuration load failed; never mind, just - stick with the default. - */ - cerr << "dcpomatic: warning: configuration did not load (" << e.what() << "); using defaults\n"; - } catch (...) { - cerr << "dcpomatic: warning: configuration did not load; using defaults\n"; - } + _instance->read (); } return _instance; @@ -317,6 +350,13 @@ Config::instance () /** Write our configuration to disk */ void Config::write () const +{ + write_config_xml (); + write_cinemas_xml (); +} + +void +Config::write_config_xml () const { xmlpp::Document doc; xmlpp::Element* root = doc.create_root_node ("Config"); @@ -349,6 +389,7 @@ Config::write () const if (_default_dcp_content_type) { root->add_child("DefaultDCPContentType")->add_child_text (_default_dcp_content_type->isdcf_name ()); } + root->add_child("DefaultDCPAudioChannels")->add_child_text (raw_convert (_default_dcp_audio_channels)); root->add_child("DCPIssuer")->add_child_text (_dcp_issuer); root->add_child("DCPCreator")->add_child_text (_dcp_creator); @@ -357,18 +398,16 @@ Config::write () const 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 (list >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) { - (*i)->as_xml (root->add_child ("Cinema")); - } - + root->add_child("DefaultInterop")->add_child_text (_default_interop ? "1" : "0"); root->add_child("MailServer")->add_child_text (_mail_server); root->add_child("MailPort")->add_child_text (raw_convert (_mail_port)); 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); + BOOST_FOREACH (string i, _kdm_cc) { + root->add_child("KDMCC")->add_child_text (i); + } root->add_child("KDMBCC")->add_child_text (_kdm_bcc); root->add_child("KDMEmail")->add_child_text (_kdm_email); @@ -378,18 +417,21 @@ Config::write () const 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)); + root->add_child("AnalyseEBUR128")->add_child_text (_analyse_ebur128 ? "1" : "0"); root->add_child("AutomaticAudioAnalysis")->add_child_text (_automatic_audio_analysis ? "1" : "0"); #ifdef DCPOMATIC_WINDOWS root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0"); #endif xmlpp::Element* signer = root->add_child ("Signer"); + DCPOMATIC_ASSERT (_signer_chain); BOOST_FOREACH (dcp::Certificate const & i, _signer_chain->root_to_leaf ()) { signer->add_child("Certificate")->add_child_text (i.certificate (true)); } signer->add_child("PrivateKey")->add_child_text (_signer_chain->key().get ()); xmlpp::Element* decryption = root->add_child ("Decryption"); + DCPOMATIC_ASSERT (_decryption_chain); BOOST_FOREACH (dcp::Certificate const & i, _decryption_chain->root_to_leaf ()) { decryption->add_child("Certificate")->add_child_text (i.certificate (true)); } @@ -399,12 +441,39 @@ Config::write () const root->add_child("History")->add_child_text (i->string ()); } + BOOST_FOREACH (dcp::EncryptedKDM i, _dkdms) { + root->add_child("DKDM")->add_child_text (i.as_xml ()); + } + + root->add_child("CinemasFile")->add_child_text (_cinemas_file.string()); + root->add_child("ShowHintsBeforeMakeDCP")->add_child_text (_show_hints_before_make_dcp ? "1" : "0"); + + try { + doc.write_to_file_formatted (path("config.xml").string ()); + } catch (xmlpp::exception& e) { + string s = e.what (); + trim (s); + throw FileError (s, path("config.xml")); + } +} + +void +Config::write_cinemas_xml () const +{ + xmlpp::Document doc; + xmlpp::Element* root = doc.create_root_node ("Cinemas"); + root->add_child("Version")->add_child_text ("1"); + + for (list >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) { + (*i)->as_xml (root->add_child ("Cinema")); + } + try { - doc.write_to_file_formatted (file().string ()); + doc.write_to_file_formatted (_cinemas_file.string ()); } catch (xmlpp::exception& e) { string s = e.what (); trim (s); - throw FileError (s, file ()); + throw FileError (s, _cinemas_file); } } @@ -440,6 +509,8 @@ Config::changed (Property what) void Config::set_kdm_email_to_default () { + _kdm_subject = _("KDM delivery: $CPL_NAME"); + _kdm_email = _( "Dear Projectionist\n\n" "Please find attached KDMs for $CPL_NAME.\n\n" @@ -472,7 +543,37 @@ Config::add_to_history (boost::filesystem::path p) } bool -Config::have_existing () +Config::have_existing (string file) { - return boost::filesystem::exists (file (false)); + return boost::filesystem::exists (path (file, false)); +} + +void +Config::read_cinemas (cxml::Document const & f) +{ + _cinemas.clear (); + 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. + */ + shared_ptr cinema (new Cinema (*i)); + cinema->read_screens (*i); + _cinemas.push_back (cinema); + } +} + +void +Config::set_cinemas_file (boost::filesystem::path file) +{ + _cinemas_file = file; + + if (boost::filesystem::exists (_cinemas_file)) { + /* Existing file; read it in */ + cxml::Document f ("Cinemas"); + f.read_file (_cinemas_file); + read_cinemas (f); + } + + changed (OTHER); }