X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=b75791a45e96c52992d2bacdb39a8b6db742e045;hb=0242efb9802d7bcbde0701a7267972d4dbe5abb8;hp=5f48262fbfb783a4e87c285ff9239685b0efc22b;hpb=58f0530b1687673ea6e24a083063c3fdf2bff0b2;p=dcpomatic.git diff --git a/src/lib/config.cc b/src/lib/config.cc index 5f48262fb..b75791a45 100644 --- a/src/lib/config.cc +++ b/src/lib/config.cc @@ -1,5 +1,5 @@ /* - Copyright (C) 2012-2014 Carl Hetherington + Copyright (C) 2012-2015 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 @@ -17,27 +17,26 @@ */ -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include #include "config.h" #include "server.h" -#include "scaler.h" #include "filter.h" #include "ratio.h" +#include "types.h" #include "dcp_content_type.h" #include "cinema_sound_processor.h" #include "colour_conversion.h" #include "cinema.h" #include "util.h" #include "cross.h" +#include "raw_convert.h" +#include +#include +#include +#include +#include +#include +#include +#include #include "i18n.h" @@ -52,33 +51,53 @@ using std::exception; using std::cerr; using boost::shared_ptr; using boost::optional; -using boost::algorithm::is_any_of; -using boost::algorithm::split; -using dcp::raw_convert; +using boost::algorithm::trim; Config* Config::_instance = 0; /** Construct default configuration */ Config::Config () - : _num_local_encoding_threads (max (2U, boost::thread::hardware_concurrency())) - , _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_container (Ratio::from_id ("185")) - , _default_dcp_content_type (DCPContentType::from_isdcf_name ("FTR")) - , _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) -#ifdef DCPOMATIC_WINDOWS - , _win32_console (false) -#endif { + set_defaults (); +} + +void +Config::set_defaults () +{ + _num_local_encoding_threads = max (2U, boost::thread::hardware_concurrency ()); + _server_port_base = 6192; + _use_any_servers = true; + _servers.clear (); + _tms_protocol = PROTOCOL_SCP; + _tms_ip = ""; + _tms_path = "."; + _tms_user = ""; + _tms_password = ""; + _cinema_sound_processor = CinemaSoundProcessor::from_id (N_("dolby_cp750")); + _allow_any_dcp_frame_rate = false; + _language = optional (); + _default_still_length = 10; + _default_container = Ratio::from_id ("185"); + _default_dcp_content_type = DCPContentType::from_isdcf_name ("FTR"); + _default_j2k_bandwidth = 100000000; + _default_audio_delay = 0; + _mail_server = ""; + _mail_port = 25; + _mail_user = ""; + _mail_password = ""; + _kdm_subject = _("KDM delivery"); + _kdm_from = ""; + _kdm_cc = ""; + _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; +#ifdef DCPOMATIC_WINDOWS + _win32_console = false; +#endif + + _allowed_dcp_frame_rates.clear (); _allowed_dcp_frame_rates.push_back (24); _allowed_dcp_frame_rates.push_back (25); _allowed_dcp_frame_rates.push_back (30); @@ -86,11 +105,14 @@ 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, 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)); + set_kdm_email_to_default (); +} - reset_kdm_email (); +void +Config::restore_defaults () +{ + Config::instance()->set_defaults (); + Config::instance()->changed (); } void @@ -98,7 +120,7 @@ Config::read () { if (!boost::filesystem::exists (file ())) { /* Make a new set of signing certificates and key */ - _signer.reset (new dcp::Signer (openssl_path ())); + _signer.reset (new dcp::CertificateChain (openssl_path ())); /* And decryption keys */ make_decryption_keys (); return; @@ -130,7 +152,8 @@ Config::read () _servers.push_back ((*i)->content ()); } } - + + _tms_protocol = static_cast (f.optional_number_child ("TMSProtocol").get_value_or (static_cast (PROTOCOL_SCP))); _tms_ip = f.string_child ("TMSIP"); _tms_path = f.string_child ("TMSPath"); _tms_user = f.string_child ("TMSUser"); @@ -162,34 +185,17 @@ Config::read () } 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 { _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"); - - if (!cc.empty ()) { - _colour_conversions.clear (); - } - - for (list::iterator i = cc.begin(); i != cc.end(); ++i) { - _colour_conversions.push_back (PresetColourConversion (*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 @@ -201,6 +207,7 @@ Config::read () } _mail_server = f.string_child ("MailServer"); + _mail_port = f.optional_number_child ("MailPort").get_value_or (25); _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")); @@ -216,9 +223,9 @@ Config::read () _allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate"); _log_types = f.optional_number_child ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR); -#ifdef DCPOMATIC_WINDOWS +#ifdef DCPOMATIC_WINDOWS _win32_console = f.optional_bool_child ("Win32Console").get_value_or (false); -#endif +#endif list his = f.node_children ("History"); for (list::const_iterator i = his.begin(); i != his.end(); ++i) { @@ -228,16 +235,17 @@ Config::read () cxml::NodePtr signer = f.optional_node_child ("Signer"); dcp::CertificateChain signer_chain; if (signer) { + shared_ptr c (new dcp::CertificateChain ()); /* 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 ())); + c->add (dcp::Certificate ((*i)->content ())); } - - _signer.reset (new dcp::Signer (signer_chain, signer->string_child ("PrivateKey"))); + c->set_key (signer->string_child ("PrivateKey")); + _signer = c; } else { /* Make a new set of signing certificates and key */ - _signer.reset (new dcp::Signer (openssl_path ())); + _signer.reset (new dcp::CertificateChain (openssl_path ())); } if (f.optional_string_child ("DecryptionCertificate")) { @@ -257,10 +265,9 @@ Config::read () 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); + dcp::CertificateChain c (openssl_path ()); + _decryption_certificate = c.leaf (); + _decryption_private_key = c.key().get (); } /** @return Filename to write configuration to */ @@ -268,11 +275,18 @@ boost::filesystem::path Config::file () const { boost::filesystem::path p; +#ifdef DCPOMATIC_OSX + p /= g_get_home_dir (); + p /= "Library"; + p /= "Preferences"; + p /= "com.dcpomatic"; + p /= "2"; +#else p /= g_get_user_config_dir (); - boost::system::error_code ec; - boost::filesystem::create_directory (p, ec); p /= "dcpomatic2"; - boost::filesystem::create_directory (p, ec); +#endif + boost::system::error_code ec; + boost::filesystem::create_directories (p, ec); p /= "config.xml"; return p; } @@ -310,11 +324,12 @@ Config::write () const root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ()); 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) { root->add_child("Server")->add_child_text (*i); } + root->add_child("TMSProtocol")->add_child_text (raw_convert (_tms_protocol)); 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); @@ -339,15 +354,12 @@ Config::write () const 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")); - } - for (list >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) { (*i)->as_xml (root->add_child ("Cinema")); } 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); @@ -362,16 +374,16 @@ 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)); -#ifdef DCPOMATIC_WINDOWS +#ifdef DCPOMATIC_WINDOWS root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0"); -#endif +#endif xmlpp::Element* signer = root->add_child ("Signer"); - dcp::CertificateChain::List certs = _signer->certificates().root_to_leaf (); + dcp::CertificateChain::List certs = _signer->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 ()); + signer->add_child("PrivateKey")->add_child_text (_signer->key().get ()); root->add_child("DecryptionCertificate")->add_child_text (_decryption_certificate.certificate (true)); root->add_child("DecryptionPrivateKey")->add_child_text (_decryption_private_key); @@ -379,8 +391,14 @@ Config::write () const 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().string ()); + + try { + doc.write_to_file_formatted (file().string ()); + } catch (xmlpp::exception& e) { + string s = e.what (); + trim (s); + throw FileError (s, file ()); + } } boost::filesystem::path @@ -407,14 +425,13 @@ Config::drop () } void -Config::changed () +Config::changed (Property what) { - write (); - Changed (); + Changed (what); } void -Config::reset_kdm_email () +Config::set_kdm_email_to_default () { _kdm_email = _( "Dear Projectionist\n\n" @@ -426,12 +443,19 @@ Config::reset_kdm_email () ); } +void +Config::reset_kdm_email () +{ + set_kdm_email_to_default (); + changed (); +} + 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 ();