Extract Dolby certificate download code to lib/

5 files changed, 189 insertions, 181 deletions

diff --git a/src/lib/download_certificate.cc b/src/lib/download_certificate.cc
index 505fa095d..84ba210fd 100644
--- a/src/lib/download_certificate.cc
+++ b/src/lib/download_certificate.cc
@@ -23,6 +23,7 @@
 #include "download_certificate.h"
 #include "internet.h"
 #include <dcp/exceptions.h>
+#include <dcp/raw_convert.h>
 #include <fmt/format.h>
 #include <string>
 #include <utility>
@@ -32,6 +33,9 @@
 
 using std::pair;
 using std::string;
+using std::vector;
+using dcp::raw_convert;
+using boost::optional;
 
 
 static
@@ -74,18 +78,191 @@ download_barco_certificate(string const& serial)
 }
 
 
+class Location
+{
+public:
+	Location(string url_, string file_)
+		: url(url_)
+		, file(file_)
+	{}
+
+	string url;
+	string file;
+};
+
+
+static void
+try_common(vector<Location>& locations, string prefix, string serial)
+{
+	auto files = ls_url(fmt::format("{}{}xxx/", prefix, serial.substr(0, 3)));
+
+	auto check = [&locations, prefix, files, serial](string format, string file) {
+		auto const zip = fmt::format(format, serial);
+		if (find(files.begin(), files.end(), zip) != files.end()) {
+			locations.push_back({
+				fmt::format("{}{}xxx/{}", prefix, serial.substr(0, 3), zip),
+				fmt::format(file, serial)
+			});
+		}
+	};
+
+	check("Dolby-DCP2000-{}.dcicerts.zip", "Dolby-DCP2000-{}.cert.sha256.pem");
+	check("Dolby-DCP2000-{}.certs.zip", "Dolby-DCP2000-{}.cert.sha256.pem");
+	check("dcp2000-{}.dcicerts.zip", "dcp2000-{}.cert.sha256.pem");
+	check("dcp2000-{}.certs.zip", "dcp2000-{}.cert.sha256.pem");
+	check("Dolby-IMB-{}.dcicerts.zip", "Dolby-IMB-{}.cert.sha256.pem");
+	check("imb-{}.dcicerts.zip", "imb-{}.cert.sha256.pem");
+	check("Dolby-IMS1000-{}.dcicerts.zip", "Dolby-IMS1000-{}.cert.sha256.pem");
+	check("Dolby-IMS2000-{}.dcicerts.zip", "Dolby-IMS2000-{}.cert.sha256.pem");
+	check("cert_Dolby-IMS3000-{}-SMPTE.zip", "cert_Dolby-IMS3000-{}-SMPTE.pem");
+	check("ims-{}.dcicerts.zip", "ims-{}.cert.sha256.pem");
+}
+
+
+static void
+try_cat862(vector<Location>& locations, string prefix, string serial)
+{
+	int const serial_int = raw_convert<int>(serial);
+
+	string cat862;
+	if (serial_int <= 510999) {
+		cat862 = "CAT862_510999_and_lower";
+	} else if (serial_int >= 617000) {
+		cat862 = "CAT862_617000_and_higher";
+	} else {
+		int const lower = serial_int - (serial_int % 1000);
+		cat862 = fmt::format("CAT862_{}-{}", lower, lower + 999);
+	}
+
+	locations.push_back({
+		fmt::format("{}{}/cert_Dolby256-CAT862-{}.zip", prefix, cat862, serial_int),
+		fmt::format("cert_Dolby256-CAT862-{}.pem.crt", serial_int)
+	});
+}
+
+
+static void
+try_dsp100(vector<Location>& locations, string prefix, string serial)
+{
+	int const serial_int = raw_convert<int>(serial);
+
+	string dsp100;
+	if (serial_int <= 999) {
+		dsp100 = "DSP100_053_thru_999";
+	} else if (serial_int >= 3000) {
+		dsp100 = "DSP100_3000_and_higher";
+	} else {
+		int const lower = serial_int - (serial_int % 1000);
+		dsp100 = fmt::format("DSP100_{}_thru_{}", lower, lower + 999);
+	}
+
+	locations.push_back({
+		fmt::format("{}{}/cert_Dolby256-DSP100-{}.zip", prefix, dsp100, serial_int),
+		fmt::format("cert_Dolby256-DSP100-{}.pem.crt", serial_int)
+	});
+}
+
+
+static void
+try_cat745(vector<Location>& locations, string prefix, string serial)
+{
+	int const serial_int = raw_convert<int>(serial.substr(1));
+
+	string cat745;
+	if (serial_int <= 999) {
+		cat745 = "CAT745_1_thru_999";
+	} else if (serial_int >= 6000) {
+		cat745 = "CAT745_6000_and_higher";
+	} else {
+		int const lower = serial_int - (serial_int % 1000);
+		cat745 = fmt::format("CAT745_{}_thru_{}", lower, lower + 999);
+	}
+
+	locations.push_back({
+		fmt::format("{}{}/cert_Dolby-CAT745-{}.zip", prefix, cat745, serial_int),
+		fmt::format("cert_Dolby-CAT745-{}.pem.crt", serial_int)
+	});
+}
+
+
+static void
+try_cp850(vector<Location>& locations, string prefix, string serial)
+{
+	int const serial_int = raw_convert<int>(serial.substr(1));
+
+	int const lower = serial_int - (serial_int % 1000);
+	locations.push_back({
+		fmt::format("{}CP850_CAT1600_F{}-F{}/cert_RMB_SPB_MDE_FMA.Dolby-CP850-F{}.zip", prefix, lower, lower + 999, serial_int),
+		fmt::format("cert_RMB_SPB_MDE_FMA.Dolby-CP850-F{}.pem.crt", serial_int)
+	});
+}
+
+
+static
 pair<dcp::Certificate, string>
-download_certificate(Manufacturer manufacturer, string const& serial)
+download_dolby_certificate(string const& serial, std::function<void ()> yield)
+{
+	/* Try dcp2000, imb and ims prefixes (see mantis #375) */
+
+	string const prefix = "ftp://ftp.cinema.dolby.com/Certificates/";
+	vector<Location> locations;
+
+	bool starts_with_digit = false;
+	optional<char> starting_char;
+
+	if (!serial.empty()) {
+		if (isdigit(serial[0])) {
+			starts_with_digit = true;
+		} else {
+			starting_char = serial[0];
+		}
+	}
+
+	vector<string> errors;
+
+	if (starts_with_digit) {
+		try_common(locations, prefix, serial);
+		yield();
+		try_cat862(locations, prefix, serial);
+		try_dsp100(locations, prefix, serial);
+	} else if (starting_char == 'H') {
+		try_cat745(locations, prefix, serial);
+	} else if (starting_char == 'F') {
+		try_cp850(locations, prefix, serial);
+	} else {
+		errors.push_back(_("Unrecognised serial number format (does not start with a number, H or F)"));
+	}
+
+	for (auto const& location: locations) {
+		yield();
+		try {
+			auto data = get_from_zip_url(location.url, location.file, true, true);
+			return { dcp::Certificate(get_from_zip_url(location.url, location.file, true, true).as_string()), location.url };
+		} catch (dcp:MiscError& e) {
+			throw CertificateDownloadError(fmt::format(_("Could not read certificate file ({})"), e.what()));
+		}
+	}
+
+	string s;
+	for (auto e: errors) {
+		s += e + "\n";
+	}
+	throw CertificateDownloadError(s);
+}
+
+
+pair<dcp::Certificate, string>
+download_certificate(Manufacturer manufacturer, string const& serial, std::function<void ()> yield)
 {
 	switch (manufacturer) {
 	case Manufacturer::GDC:
 		return download_gdc_certificate(serial);
 	case Manufacturer::BARCO:
 		return download_barco_certificate(serial);
+	case Manufacturer::DOLBY:
+		return download_dolby_certificate(serial, yield);
 	}
 
 	return {};
 }
 
-
-
diff --git a/src/lib/download_certificate.h b/src/lib/download_certificate.h
index 988b62138..4dbf0b306 100644
--- a/src/lib/download_certificate.h
+++ b/src/lib/download_certificate.h
@@ -26,8 +26,9 @@ enum class Manufacturer
 {
 	GDC,
 	BARCO,
+	DOLBY,
 };
 
 
-std::pair<dcp::Certificate, std::string> download_certificate(Manufacturer manufacturer, std::string const& serial);
+std::pair<dcp::Certificate, std::string> download_certificate(Manufacturer manufacturer, std::string const& serial, std::function<void ()> yield);
 
diff --git a/src/wx/barco_alchemy_certificate_panel.cc b/src/wx/barco_alchemy_certificate_panel.cc
index 014812e82..44a6defad 100644
--- a/src/wx/barco_alchemy_certificate_panel.cc
+++ b/src/wx/barco_alchemy_certificate_panel.cc
@@ -63,7 +63,7 @@ BarcoAlchemyCertificatePanel::do_download()
 	string serial = wx_to_std(_serial->GetValue());
 	trim(serial);
 	try {
-		std::tie(_certificate, _url) = download_certificate(Manufacturer::BARCO, serial);
+		std::tie(_certificate, _url) = download_certificate(Manufacturer::BARCO, serial, []() { wxYield(); });
 		_dialog->message()->SetLabel(_("Certificate downloaded"));
 		_dialog->setup_sensitivity();
 	} catch (std::exception& e) {
diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index 5d82e247f..783a3fa5a 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -22,6 +22,7 @@
 #include "dolby_doremi_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
+#include "lib/download_certificate.h"
 #include "lib/internet.h"
 #include "lib/signal_manager.h"
 #include "lib/util.h"
@@ -42,19 +43,6 @@ using namespace boost::placeholders;
 using dcp::raw_convert;
 
 
-class Location
-{
-public:
-	Location(string url_, string file_)
-		: url(url_)
-		, file(file_)
-	{}
-
-	string url;
-	string file;
-};
-
-
 DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel(DownloadCertificateDialog* dialog)
 	: DownloadCertificatePanel(dialog)
 {
@@ -62,177 +50,19 @@ DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel(DownloadCertificateDial
 }
 
 
-static void
-try_common(vector<Location>& locations, string prefix, string serial)
-{
-	auto files = ls_url(fmt::format("{}{}xxx/", prefix, serial.substr(0, 3)));
-
-	auto check = [&locations, prefix, files, serial](string format, string file) {
-		auto const zip = fmt::format(format, serial);
-		if (find(files.begin(), files.end(), zip) != files.end()) {
-			locations.push_back({
-				fmt::format("{}{}xxx/{}", prefix, serial.substr(0, 3), zip),
-				fmt::format(file, serial)
-			});
-		}
-	};
-
-	check("Dolby-DCP2000-{}.dcicerts.zip", "Dolby-DCP2000-{}.cert.sha256.pem");
-	check("Dolby-DCP2000-{}.certs.zip", "Dolby-DCP2000-{}.cert.sha256.pem");
-	check("dcp2000-{}.dcicerts.zip", "dcp2000-{}.cert.sha256.pem");
-	check("dcp2000-{}.certs.zip", "dcp2000-{}.cert.sha256.pem");
-	check("Dolby-IMB-{}.dcicerts.zip", "Dolby-IMB-{}.cert.sha256.pem");
-	check("imb-{}.dcicerts.zip", "imb-{}.cert.sha256.pem");
-	check("Dolby-IMS1000-{}.dcicerts.zip", "Dolby-IMS1000-{}.cert.sha256.pem");
-	check("Dolby-IMS2000-{}.dcicerts.zip", "Dolby-IMS2000-{}.cert.sha256.pem");
-	check("cert_Dolby-IMS3000-{}-SMPTE.zip", "cert_Dolby-IMS3000-{}-SMPTE.pem");
-	check("ims-{}.dcicerts.zip", "ims-{}.cert.sha256.pem");
-}
-
-
-static void
-try_cat862(vector<Location>& locations, string prefix, string serial)
-{
-	int const serial_int = raw_convert<int>(serial);
-
-	string cat862;
-	if (serial_int <= 510999) {
-		cat862 = "CAT862_510999_and_lower";
-	} else if (serial_int >= 617000) {
-		cat862 = "CAT862_617000_and_higher";
-	} else {
-		int const lower = serial_int - (serial_int % 1000);
-		cat862 = fmt::format("CAT862_{}-{}", lower, lower + 999);
-	}
-
-	locations.push_back({
-		fmt::format("{}{}/cert_Dolby256-CAT862-{}.zip", prefix, cat862, serial_int),
-		fmt::format("cert_Dolby256-CAT862-{}.pem.crt", serial_int)
-	});
-}
-
-
-static void
-try_dsp100(vector<Location>& locations, string prefix, string serial)
-{
-	int const serial_int = raw_convert<int>(serial);
-
-	string dsp100;
-	if (serial_int <= 999) {
-		dsp100 = "DSP100_053_thru_999";
-	} else if (serial_int >= 3000) {
-		dsp100 = "DSP100_3000_and_higher";
-	} else {
-		int const lower = serial_int - (serial_int % 1000);
-		dsp100 = fmt::format("DSP100_{}_thru_{}", lower, lower + 999);
-	}
-
-	locations.push_back({
-		fmt::format("{}{}/cert_Dolby256-DSP100-{}.zip", prefix, dsp100, serial_int),
-		fmt::format("cert_Dolby256-DSP100-{}.pem.crt", serial_int)
-	});
-}
-
-
-static void
-try_cat745(vector<Location>& locations, string prefix, string serial)
-{
-	int const serial_int = raw_convert<int>(serial.substr(1));
-
-	string cat745;
-	if (serial_int <= 999) {
-		cat745 = "CAT745_1_thru_999";
-	} else if (serial_int >= 6000) {
-		cat745 = "CAT745_6000_and_higher";
-	} else {
-		int const lower = serial_int - (serial_int % 1000);
-		cat745 = fmt::format("CAT745_{}_thru_{}", lower, lower + 999);
-	}
-
-	locations.push_back({
-		fmt::format("{}{}/cert_Dolby-CAT745-{}.zip", prefix, cat745, serial_int),
-		fmt::format("cert_Dolby-CAT745-{}.pem.crt", serial_int)
-	});
-}
-
-
-static void
-try_cp850(vector<Location>& locations, string prefix, string serial)
-{
-	int const serial_int = raw_convert<int>(serial.substr(1));
-
-	int const lower = serial_int - (serial_int % 1000);
-	locations.push_back({
-		fmt::format("{}CP850_CAT1600_F{}-F{}/cert_RMB_SPB_MDE_FMA.Dolby-CP850-F{}.zip", prefix, lower, lower + 999, serial_int),
-		fmt::format("cert_RMB_SPB_MDE_FMA.Dolby-CP850-F{}.pem.crt", serial_int)
-	});
-}
-
-
 void
 DolbyDoremiCertificatePanel::do_download()
 {
 	string serial = wx_to_std(_serial->GetValue());
 	trim(serial);
 
-	/* Try dcp2000, imb and ims prefixes (see mantis #375) */
-
-	string const prefix = "ftp://ftp.cinema.dolby.com/Certificates/";
-	vector<Location> locations;
-
-	bool starts_with_digit = false;
-	optional<char> starting_char;
-
-	if (!serial.empty()) {
-		if (isdigit(serial[0])) {
-			starts_with_digit = true;
-		} else {
-			starting_char = serial[0];
-		}
-	}
-
-	vector<string> errors;
-
-	if (starts_with_digit) {
-		try_common(locations, prefix, serial);
-		wxYield();
-		try_cat862(locations, prefix, serial);
-		try_dsp100(locations, prefix, serial);
-	} else if (starting_char == 'H') {
-		try_cat745(locations, prefix, serial);
-	} else if (starting_char == 'F') {
-		try_cp850(locations, prefix, serial);
-	} else {
-		errors.push_back(wx_to_std(_("Unrecognised serial number format (does not start with a number, H or F)")));
-	}
-
-	bool ok = false;
-	auto location = locations.begin();
-	while (!ok && location != locations.end()) {
-		wxYield();
-		try {
-			auto data = get_from_zip_url(location->url, location->file, true, true);
-			load_certificate(data, location->url);
-			ok = true;
-		} catch (std::exception& e) {
-			errors.push_back(e.what());
-		}
-
-		++location;
-	}
-
-	if (ok) {
+	try {
+		std::tie(_certificate, _url) = download_certificate(Manufacturer::DOLBY, serial, []() { wxYield(); });
 		_dialog->message()->SetLabel(_("Certificate downloaded"));
 		_dialog->setup_sensitivity();
-	} else {
+	} catch (std::exception& e) {
 		_dialog->message()->SetLabel({});
-
-		string s;
-		for (auto e: errors) {
-			s += e + "\n";
-		}
-
-		error_dialog(this, std_to_wx(s));
+		error_dialog(this, std_to_wx(e.what()));
 	}
 }
 
diff --git a/src/wx/gdc_certificate_panel.cc b/src/wx/gdc_certificate_panel.cc
index 83faf2698..1f1e7f059 100644
--- a/src/wx/gdc_certificate_panel.cc
+++ b/src/wx/gdc_certificate_panel.cc
@@ -57,7 +57,7 @@ GDCCertificatePanel::do_download ()
 	string serial = wx_to_std(_serial->GetValue());
 	trim(serial);
 	try {
-		std::tie(_certificate, _url) = download_certificate(Manufacturer::GDC, serial);
+		std::tie(_certificate, _url) = download_certificate(Manufacturer::GDC, serial, []() { wxYield(); });
 		_dialog->message()->SetLabel(_("Certificate downloaded"));
 		_dialog->setup_sensitivity ();
 	} catch (std::exception& e) {