X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=e6f3637292939955df627752c7f8118e87504020;hb=e60bb3e51bd1508b149e6b8f6608f09b5196ae26;hp=bb1fcd21173655a276055bf0becdcc67527396b5;hpb=f1d30fb114b3b2c6ccd8fdf5823e7cd6b26c1eef;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index bb1fcd211..e6f363729 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2012-2014 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2012-2015 Carl Hetherington <cth@carlh.net>
 
     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,61 +17,73 @@
 
 */
 
-#include <sstream>
-#include <cstdlib>
-#include <fstream>
-#include <glib.h>
-#include <boost/filesystem.hpp>
-#include <boost/algorithm/string.hpp>
-#include <dcp/colour_matrix.h>
-#include <dcp/raw_convert.h>
-#include <libcxml/cxml.h>
 #include "config.h"
 #include "server.h"
-#include "scaler.h"
 #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 "raw_convert.h"
+#include <dcp/colour_matrix.h>
+#include <dcp/signer.h>
+#include <dcp/certificate_chain.h>
+#include <libcxml/cxml.h>
+#include <glib.h>
+#include <boost/filesystem.hpp>
+#include <boost/algorithm/string.hpp>
+#include <cstdlib>
+#include <fstream>
 
 #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;
 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 (".")
-	, _sound_processor (SoundProcessor::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 ("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)
 {
+	set_defaults ();
+}
+
+void
+Config::set_defaults ()
+{
+	_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 | Log::TYPE_DEBUG;
+#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);
@@ -79,23 +91,29 @@ 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
 Config::read ()
 {
-	if (!boost::filesystem::exists (file (false))) {
-		read_old_metadata ();
+	if (!boost::filesystem::exists (file ())) {
+		/* Make a new set of signing certificates and key */
+		_signer.reset (new dcp::Signer (openssl_path ()));
+		/* And decryption keys */
+		make_decryption_keys ();
 		return;
 	}
 
 	cxml::Document f ("Config");
-	f.read_file (file (false));
+	f.read_file (file ());
 	optional<string> c;
 
 	optional<int> version = f.optional_number_child<int> ("Version");
@@ -120,7 +138,7 @@ Config::read ()
 			_servers.push_back ((*i)->content ());
 		}
 	}
-	
+
 	_tms_ip = f.string_child ("TMSIP");
 	_tms_path = f.string_child ("TMSPath");
 	_tms_user = f.string_child ("TMSUser");
@@ -128,7 +146,11 @@ 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");
@@ -143,36 +165,22 @@ 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 {
 		_default_isdcf_metadata = ISDCFMetadata (f.node_child ("DCIMetadata"));
 	}
-	
+
 	_default_still_length = f.optional_number_child<int>("DefaultStillLength").get_value_or (10);
 	_default_j2k_bandwidth = f.optional_number_child<int>("DefaultJ2KBandwidth").get_value_or (200000000);
 	_default_audio_delay = f.optional_number_child<int>("DefaultAudioDelay").get_value_or (0);
 
-	list<cxml::NodePtr> cc = f.node_children ("ColourConversion");
-
-	if (!cc.empty ()) {
-		_colour_conversions.clear ();
-	}
-	
-	for (list<cxml::NodePtr>::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<cxml::NodePtr> cin = f.node_children ("Cinema");
 	for (list<cxml::NodePtr>::iterator i = cin.begin(); i != cin.end(); ++i) {
 		/* Slightly grotty two-part construction of Cinema here so that we can use
@@ -186,8 +194,10 @@ 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");
 
 	_check_for_updates = f.optional_bool_child("CheckForUpdates").get_value_or (false);
@@ -197,98 +207,71 @@ Config::read ()
 	_allow_any_dcp_frame_rate = f.optional_bool_child ("AllowAnyDCPFrameRate");
 
 	_log_types = f.optional_number_child<int> ("LogTypes").get_value_or (Log::TYPE_GENERAL | Log::TYPE_WARNING | Log::TYPE_ERROR);
-}
+#ifdef DCPOMATIC_WINDOWS
+	_win32_console = f.optional_bool_child ("Win32Console").get_value_or (false);
+#endif
 
-void
-Config::read_old_metadata ()
-{
-	/* XXX: this won't work with non-Latin filenames */
-	ifstream f (file(true).string().c_str ());
-	string line;
+	list<cxml::NodePtr> his = f.node_children ("History");
+	for (list<cxml::NodePtr>::const_iterator i = his.begin(); i != his.end(); ++i) {
+		_history.push_back ((*i)->content ());
+	}
 
-	while (getline (f, line)) {
-		if (line.empty ()) {
-			continue;
+	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<cxml::NodePtr> certificates = signer->node_children ("Certificate");
+		for (list<cxml::NodePtr>::const_iterator i = certificates.begin(); i != certificates.end(); ++i) {
+			signer_chain.add (dcp::Certificate ((*i)->content ()));
 		}
 
-		if (line[0] == '#') {
-			continue;
-		}
+		_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 ()));
+	}
 
-		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_base = atoi (v.c_str ());
-		} else if (k == N_("server")) {
-			vector<string> b;
-			split (b, v, is_any_of (" "));
-			if (b.size() == 2) {
-				_servers.push_back (b[0]);
-			}
-		} 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_isdcf_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;
-		}
+	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");
+	}
 
-		_default_isdcf_metadata.read_old_metadata (k, v);
+	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 */
+		make_decryption_keys ();
 	}
 }
 
-/** @return Filename to write configuration to */
-boost::filesystem::path
-Config::file (bool old) const
+void
+Config::make_decryption_keys ()
 {
-	boost::filesystem::path p;
-	p /= g_get_user_config_dir ();
-	boost::system::error_code ec;
-	boost::filesystem::create_directory (p, ec);
-	if (old) {
-		p /= ".dvdomatic";
-	} else {
-		p /= "dcpomatic";
-		boost::filesystem::create_directory (p, ec);
-		p /= "config.xml";
-	}
-	return p;
+	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::signer_chain_directory () const
+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 ();
-	p /= "dcpomatic";
-	p /= "crypt";
-	boost::filesystem::create_directories (p);
+	p /= "dcpomatic2";
+#endif
+	boost::system::error_code ec;
+	boost::filesystem::create_directories (p, ec);
+	p /= "config.xml";
 	return p;
 }
 
@@ -325,7 +308,7 @@ Config::write () const
 	root->add_child("DefaultDirectory")->add_child_text (_default_directory.string ());
 	root->add_child("ServerPortBase")->add_child_text (raw_convert<string> (_server_port_base));
 	root->add_child("UseAnyServers")->add_child_text (_use_any_servers ? "1" : "0");
-	
+
 	for (vector<string>::const_iterator i = _servers.begin(); i != _servers.end(); ++i) {
 		root->add_child("Server")->add_child_text (*i);
 	}
@@ -334,8 +317,8 @@ Config::write () const
 	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());
@@ -346,8 +329,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("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"));
 
@@ -355,10 +337,6 @@ Config::write () const
 	root->add_child("DefaultJ2KBandwidth")->add_child_text (raw_convert<string> (_default_j2k_bandwidth));
 	root->add_child("DefaultAudioDelay")->add_child_text (raw_convert<string> (_default_audio_delay));
 
-	for (vector<PresetColourConversion>::const_iterator i = _colour_conversions.begin(); i != _colour_conversions.end(); ++i) {
-		i->as_xml (root->add_child ("ColourConversion"));
-	}
-
 	for (list<shared_ptr<Cinema> >::const_iterator i = _cinemas.begin(); i != _cinemas.end(); ++i) {
 		(*i)->as_xml (root->add_child ("Cinema"));
 	}
@@ -366,8 +344,10 @@ 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");
@@ -376,8 +356,31 @@ Config::write () const
 	root->add_child("MaximumJ2KBandwidth")->add_child_text (raw_convert<string> (_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<string> (_log_types));
-	
-	doc.write_to_file_formatted (file(false).string ());
+#ifdef DCPOMATIC_WINDOWS
+	root->add_child("Win32Console")->add_child_text (_win32_console ? "1" : "0");
+#endif
+
+	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);
+
+	for (vector<boost::filesystem::path>::const_iterator i = _history.begin(); i != _history.end(); ++i) {
+		root->add_child("History")->add_child_text (i->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
@@ -406,12 +409,11 @@ Config::drop ()
 void
 Config::changed ()
 {
-	write ();
 	Changed ();
 }
 
 void
-Config::reset_kdm_email ()
+Config::set_kdm_email_to_default ()
 {
 	_kdm_email = _(
 		"Dear Projectionist\n\n"
@@ -422,3 +424,24 @@ Config::reset_kdm_email ()
 		"Best regards,\nDCP-o-matic"
 		);
 }
+
+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 ();
+	}
+
+	changed ();
+}