Add preference for default KDM target directory (#1013).

2 files changed, 37 insertions, 3 deletions

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 30ed1243b..653012960 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -232,6 +232,7 @@ try
 	_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);
 	_default_interop = f.optional_bool_child("DefaultInterop").get_value_or (false);
+	_default_kdm_directory = f.optional_string_child("DefaultKDMDirectory");
 
 	/* Load any cinemas from config.xml */
 	read_cinemas (f);
@@ -416,6 +417,9 @@ Config::write_config_xml () 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));
 	root->add_child("DefaultInterop")->add_child_text (_default_interop ? "1" : "0");
+	if (_default_kdm_directory) {
+		root->add_child("DefaultKDMDirectory")->add_child_text (_default_kdm_directory->string ());
+	}
 	root->add_child("MailServer")->add_child_text (_mail_server);
 	root->add_child("MailPort")->add_child_text (raw_convert<string> (_mail_port));
 	root->add_child("MailUser")->add_child_text (_mail_user);
@@ -501,17 +505,29 @@ Config::write_cinemas_xml () const
 boost::filesystem::path
 Config::default_directory_or (boost::filesystem::path a) const
 {
-	if (!_default_directory) {
+	return directory_or (_default_directory, a);
+}
+
+boost::filesystem::path
+Config::default_kdm_directory_or (boost::filesystem::path a) const
+{
+	return directory_or (_default_kdm_directory, a);
+}
+
+boost::filesystem::path
+Config::directory_or (optional<boost::filesystem::path> dir, boost::filesystem::path a) const
+{
+	if (!dir) {
 		return a;
 	}
 
 	boost::system::error_code ec;
-	bool const e = boost::filesystem::exists (*_default_directory, ec);
+	bool const e = boost::filesystem::exists (*dir, ec);
 	if (ec || !e) {
 		return a;
 	}
 
-	return *_default_directory;
+	return *dir;
 }
 
 void
diff --git a/src/lib/config.h b/src/lib/config.h
index c50846707..8b8d7c38a 100644
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -56,7 +56,12 @@ public:
 		return _default_directory;
 	}
 
+	boost::optional<boost::filesystem::path> default_kdm_directory () const {
+		return _default_kdm_directory;
+	}
+
 	boost::filesystem::path default_directory_or (boost::filesystem::path a) const;
+	boost::filesystem::path default_kdm_directory_or (boost::filesystem::path a) const;
 
 	enum Property {
 		USE_ANY_SERVERS,
@@ -178,6 +183,14 @@ public:
 		return _default_interop;
 	}
 
+	void set_default_kdm_directory (boost::filesystem::path d) {
+		if (_default_kdm_directory && _default_kdm_directory.get() == d) {
+			return;
+		}
+		_default_kdm_directory = d;
+		changed ();
+	}
+
 	std::string mail_server () const {
 		return _mail_server;
 	}
@@ -549,6 +562,7 @@ private:
 	void write_cinemas_xml () const;
 	void read_cinemas (cxml::Document const & f);
 	boost::shared_ptr<dcp::CertificateChain> create_certificate_chain ();
+	boost::filesystem::path directory_or (boost::optional<boost::filesystem::path> dir, boost::filesystem::path a) const;
 
 	template <class T>
 	void maybe_set (T& member, T new_value) {
@@ -599,6 +613,10 @@ private:
 	int _default_j2k_bandwidth;
 	int _default_audio_delay;
 	bool _default_interop;
+	/** Default directory to offer to write KDMs to; if it's not set,
+	    the home directory will be offered.
+	*/
+	boost::optional<boost::filesystem::path> _default_kdm_directory;
 	std::list<boost::shared_ptr<Cinema> > _cinemas;
 	std::string _mail_server;
 	int _mail_port;