X-Git-Url: https://git.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdolby_doremi_certificate_panel.cc;h=66dce8612a80e6d0b9bccc2aa8ad7d9d415432f6;hp=c37b42e43796193d4fe1276094aca11ab77a7b70;hb=d0188ed3e1ea5536e729e93b87d54114368120ac;hpb=6a92ad180163bf84aeedc5f955edc13557e6848c

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index c37b42e43..66dce8612 100644
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2021 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -18,59 +18,77 @@
 
 */
 
+
 #include "dolby_doremi_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 #include "lib/compose.hpp"
-#include "lib/util.h"
-#include "lib/signal_manager.h"
 #include "lib/internet.h"
+#include "lib/signal_manager.h"
+#include "lib/util.h"
 #include <dcp/raw_convert.h>
 #include <curl/curl.h>
 #include <zip.h>
-#include <boost/foreach.hpp>
-#include <iostream>
+#include <boost/algorithm/string.hpp>
 
-using std::string;
-using std::cout;
+
+using std::function;
 using std::list;
-using boost::function;
+using std::string;
+using namespace boost::algorithm;
 using boost::optional;
+#if BOOST_VERSION >= 106100
+using namespace boost::placeholders;
+#endif
 using dcp::raw_convert;
 
+
 DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (DownloadCertificateDialog* dialog)
 	: DownloadCertificatePanel (dialog)
 {
 
 }
 
+
 static void
 try_dcp2000 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	urls.push_back (String::compose ("%1%2xxx/dcp2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose ("dcp2000-%1.cert.sha256.pem", serial));
+	urls.push_back(String::compose("%1%2xxx/Dolby-DCP2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back(String::compose("Dolby-DCP2000-%1.cert.sha256.pem", serial));
+
+	urls.push_back(String::compose("%1%2xxx/Dolby-DCP2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back(String::compose("Dolby-DCP2000-%1.cert.sha256.pem", serial));
+
+	urls.push_back(String::compose("%1%2xxx/Dolby-DCP2000-%3.certs.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back(String::compose("Dolby-DCP2000-%1.cert.sha256.pem", serial));
 
-	urls.push_back (String::compose ("%1%2xxx/dcp2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose ("dcp2000-%1.cert.sha256.pem", serial));
+	urls.push_back (String::compose("%1%2xxx/dcp2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (String::compose("dcp2000-%1.cert.sha256.pem", serial));
 
-	urls.push_back (String::compose ("%1%2xxx/dcp2000-%3.certs.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose ("dcp2000-%1.cert.sha256.pem", serial));
+	urls.push_back (String::compose("%1%2xxx/dcp2000-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (String::compose("dcp2000-%1.cert.sha256.pem", serial));
+
+	urls.push_back (String::compose("%1%2xxx/dcp2000-%3.certs.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (String::compose("dcp2000-%1.cert.sha256.pem", serial));
 }
 
+
 static void
 try_imb (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	urls.push_back (String::compose ("%1%2xxx/imb-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose ("imb-%1.cert.sha256.pem", serial));
+	urls.push_back (String::compose("%1%2xxx/imb-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (String::compose("imb-%1.cert.sha256.pem", serial));
 }
 
+
 static void
 try_ims (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	urls.push_back (String::compose ("%1%2xxx/ims-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
-	files.push_back (String::compose ("ims-%1.cert.sha256.pem", serial));
+	urls.push_back (String::compose("%1%2xxx/ims-%3.dcicerts.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (String::compose("ims-%1.cert.sha256.pem", serial));
 }
 
+
 static void
 try_cat862 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
@@ -86,14 +104,15 @@ try_cat862 (list<string>& urls, list<string>& files, string prefix, string seria
 		cat862 = String::compose ("CAT862_%1-%2", lower, lower + 999);
 	}
 
-	urls.push_back (String::compose ("%1%2/cert_Dolby256-CAT862-%3.zip", prefix, cat862, serial_int));
-	files.push_back (String::compose ("cert_Dolby256-CAT862-%1.pem.crt", serial_int));
+	urls.push_back (String::compose("%1%2/cert_Dolby256-CAT862-%3.zip", prefix, cat862, serial_int));
+	files.push_back (String::compose("cert_Dolby256-CAT862-%1.pem.crt", serial_int));
 }
 
+
 static void
 try_dsp100 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	int const serial_int = raw_convert<int> (serial);
+	int const serial_int = raw_convert<int>(serial);
 
 	string dsp100;
 	if (serial_int <= 999) {
@@ -105,14 +124,15 @@ try_dsp100 (list<string>& urls, list<string>& files, string prefix, string seria
 		dsp100 = String::compose ("DSP100_%1_thru_%2", lower, lower + 999);
 	}
 
-	urls.push_back (String::compose ("%1%2/cert_Dolby256-DSP100-%3.zip", prefix, dsp100, serial_int));
-	files.push_back (String::compose ("cert_Dolby256-DSP100-%1.pem.crt", serial_int));
+	urls.push_back (String::compose("%1%2/cert_Dolby256-DSP100-%3.zip", prefix, dsp100, serial_int));
+	files.push_back (String::compose("cert_Dolby256-DSP100-%1.pem.crt", serial_int));
 }
 
+
 static void
 try_cat745 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-	int const serial_int = raw_convert<int> (serial.substr (1));
+	int const serial_int = raw_convert<int>(serial.substr (1));
 
 	string cat745;
 	if (serial_int <= 999) {
@@ -121,13 +141,14 @@ try_cat745 (list<string>& urls, list<string>& files, string prefix, string seria
 		cat745 = "CAT745_6000_and_higher";
 	} else {
 		int const lower = serial_int - (serial_int % 1000);
-		cat745 = String::compose ("CAT745_%1_thru_%2", lower, lower + 999);
+		cat745 = String::compose("CAT745_%1_thru_%2", lower, lower + 999);
 	}
 
-	urls.push_back (String::compose ("%1%2/cert_Dolby-CAT745-%3.zip", prefix, cat745, serial_int));
-	files.push_back (String::compose ("cert_Dolby-CAT745-%1.pem.crt", serial_int));
+	urls.push_back (String::compose("%1%2/cert_Dolby-CAT745-%3.zip", prefix, cat745, serial_int));
+	files.push_back (String::compose("cert_Dolby-CAT745-%1.pem.crt", serial_int));
 }
 
+
 static void
 try_cp850 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
@@ -138,14 +159,24 @@ try_cp850 (list<string>& urls, list<string>& files, string prefix, string serial
 	files.push_back (String::compose ("cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%1.pem.crt", serial_int));
 }
 
+
+static void
+try_ims3000 (list<string>& urls, list<string>& files, string prefix, string serial)
+{
+	urls.push_back (String::compose ("%1%2xxx/cert_Dolby-IMS3000-%3-SMPTE.zip", prefix, serial.substr(0, 3), serial));
+	files.push_back (String::compose("cert_Dolby-IMS3000-%1-SMPTE.pem", serial));
+}
+
+
 void
 DolbyDoremiCertificatePanel::do_download ()
 {
-	string const serial = wx_to_std (_serial->GetValue());
+	string serial = wx_to_std(_serial->GetValue());
+	trim(serial);
 
 	/* Try dcp2000, imb and ims prefixes (see mantis #375) */
 
-	string const prefix = "ftp://anonymous@ftp.cinema.dolby.com/Certificates/";
+	string const prefix = "ftp://ftp.cinema.dolby.com/Certificates/";
 	list<string> urls;
 	list<string> files;
 
@@ -160,24 +191,28 @@ DolbyDoremiCertificatePanel::do_download ()
 		}
 	}
 
+	list<string> errors;
+
 	if (starts_with_digit) {
 		try_dcp2000 (urls, files, prefix, serial);
 		try_imb (urls, files, prefix, serial);
 		try_ims (urls, files, prefix, serial);
 		try_cat862 (urls, files, prefix, serial);
 		try_dsp100 (urls, files, prefix, serial);
+		try_ims3000 (urls, files, prefix, serial);
 	} else if (starting_char == 'H') {
 		try_cat745 (urls, files, prefix, serial);
 	} else if (starting_char == 'F') {
 		try_cp850 (urls, files, prefix, serial);
+	} else {
+		errors.push_back(wx_to_std(_("Unrecognised serial number format (does not start with a number, H or F)")));
 	}
 
-	list<string> errors;
 	bool ok = false;
-	list<string>::const_iterator i = urls.begin ();
-	list<string>::const_iterator j = files.begin ();
+	auto i = urls.begin ();
+	auto j = files.begin ();
 	while (!ok && i != urls.end ()) {
-		optional<string> error = get_from_zip_url (*i++, *j++, true, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+		auto error = get_from_zip_url (*i++, *j++, true, true, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1, _2));
 		if (error) {
 			errors.push_back (error.get ());
 		} else {
@@ -192,7 +227,7 @@ DolbyDoremiCertificatePanel::do_download ()
 		_dialog->message()->SetLabel (wxT (""));
 
 		string s;
-		BOOST_FOREACH (string e, errors) {
+		for (auto e: errors) {
 			s += e + "\n";
 		}
 
@@ -200,6 +235,7 @@ DolbyDoremiCertificatePanel::do_download ()
 	}
 }
 
+
 wxString
 DolbyDoremiCertificatePanel::name () const
 {