X-Git-Url: https://git.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Fconfig.cc;h=18c792223b020ff1c195f2fb0eca7c1b06e1f84e;hb=3005c17f626e739b2f8d63f203a0b0a3240eb530;hp=aacc71edfc4b4ce12ac4481a441eb1e47231cac6;hpb=a876dc03d70b6d3971ba0fc6e28c59b412c5f0a3;p=dcpomatic.git

diff --git a/src/lib/config.cc b/src/lib/config.cc
index aacc71edf..18c792223 100644
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -69,7 +69,7 @@ using dcp::raw_convert;
 
 Config* Config::_instance = 0;
 int const Config::_current_version = 3;
-boost::signals2::signal<void ()> Config::FailedToLoad;
+boost::signals2::signal<void (Config::LoadFailure)> Config::FailedToLoad;
 boost::signals2::signal<void (string)> Config::Warning;
 boost::signals2::signal<bool (Config::BadReason)> Config::Bad;
 
@@ -193,6 +193,7 @@ Config::set_defaults ()
 	_default_kdm_type = dcp::Formulation::MODIFIED_TRANSITIONAL_1;
 	_default_kdm_duration = RoughDuration(1, RoughDuration::Unit::WEEKS);
 	_auto_crop_threshold = 0.1;
+	_last_release_notes_version = boost::none;
 
 	_allowed_dcp_frame_rates.clear ();
 	_allowed_dcp_frame_rates.push_back (24);
@@ -269,6 +270,15 @@ Config::backup ()
 
 void
 Config::read ()
+{
+	read_config();
+	read_cinemas();
+	read_dkdm_recipients();
+}
+
+
+void
+Config::read_config()
 try
 {
 	cxml::Document f ("Config");
@@ -593,35 +603,59 @@ try
 		_default_kdm_duration = RoughDuration(1, RoughDuration::Unit::WEEKS);
 	}
 	_auto_crop_threshold = f.optional_number_child<double>("AutoCropThreshold").get_value_or(0.1);
+	_last_release_notes_version = f.optional_string_child("LastReleaseNotesVersion");
 
 	_export.read(f.optional_node_child("Export"));
-
-	if (boost::filesystem::exists (_cinemas_file)) {
-		cxml::Document f ("Cinemas");
-		f.read_file (_cinemas_file);
-		read_cinemas (f);
-	}
-
-	if (boost::filesystem::exists (_dkdm_recipients_file)) {
-		cxml::Document f ("DKDMRecipients");
-		f.read_file (_dkdm_recipients_file);
-		read_dkdm_recipients (f);
-	}
 }
 catch (...) {
-	if (have_existing("config.xml") || have_existing("cinemas.xml") || have_existing("dkdm_recipients.xml")) {
+	if (have_existing("config.xml")) {
 		backup ();
 		/* We have a config file but it didn't load */
-		FailedToLoad ();
+		FailedToLoad(LoadFailure::CONFIG);
 	}
 	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 ();
+	write_config();
 }
 
+
+void
+Config::read_cinemas()
+{
+	if (boost::filesystem::exists (_cinemas_file)) {
+		try {
+			cxml::Document f("Cinemas");
+			f.read_file(_cinemas_file);
+			read_cinemas(f);
+		} catch (...) {
+			backup();
+			FailedToLoad(LoadFailure::CINEMAS);
+			write_cinemas();
+		}
+	}
+}
+
+
+void
+Config::read_dkdm_recipients()
+{
+	if (boost::filesystem::exists (_dkdm_recipients_file)) {
+		try {
+			cxml::Document f("DKDMRecipients");
+			f.read_file(_dkdm_recipients_file);
+			read_dkdm_recipients(f);
+		} catch (...) {
+			backup();
+			FailedToLoad(LoadFailure::DKDM_RECIPIENTS);
+			write_dkdm_recipients();
+		}
+	}
+}
+
+
 /** @return Singleton instance */
 Config *
 Config::instance ()
@@ -1034,6 +1068,9 @@ Config::write_config () const
 	root->add_child("EmailKDMs")->add_child_text(_email_kdms ? "1" : "0");
 	root->add_child("DefaultKDMType")->add_child_text(dcp::formulation_to_string(_default_kdm_type));
 	root->add_child("AutoCropThreshold")->add_child_text(raw_convert<string>(_auto_crop_threshold));
+	if (_last_release_notes_version) {
+		root->add_child("LastReleaseNotesVersion")->add_child_text(*_last_release_notes_version);
+	}
 
 	_export.write(root->add_child("Export"));
 
@@ -1286,6 +1323,7 @@ Config::set_cinemas_file (boost::filesystem::path file)
 		read_cinemas (f);
 	}
 
+	changed (CINEMAS);
 	changed (OTHER);
 }