X-Git-Url: https://main.carlh.net/gitweb/?p=dcpomatic.git;a=blobdiff_plain;f=src%2Fwx%2Fdolby_doremi_certificate_panel.cc;h=817867cc108055bfb2d37d3747c6484047dbad24;hp=fcff93a068a2d0c3b9a38f15fb2f0e67e2eb2301;hb=8963f0007af1a312017b9627c18b82ec2a577591;hpb=422be0eece2bf6ee80db1d3c21553cd82efff789 diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc index fcff93a06..817867cc1 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 + Copyright (C) 2014-2021 Carl Hetherington This file is part of DCP-o-matic. @@ -18,79 +18,72 @@ */ + #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 #include #include -#include #include -using std::string; + using std::cout; +using std::function; using std::list; -using boost::function; +using std::string; using boost::optional; +#if BOOST_VERSION >= 106100 +using namespace boost::placeholders; +#endif +using dcp::raw_convert; -DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog) - : DownloadCertificatePanel (parent, dialog) -{ - add_label_to_sizer (_table, this, _("Serial number"), true); - _serial = new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1)); - _table->Add (_serial, 1, wxEXPAND); - - _serial->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DownloadCertificateDialog::setup_sensitivity, _dialog)); - - layout (); -} -void -DolbyDoremiCertificatePanel::download (wxStaticText* message) +DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (DownloadCertificateDialog* dialog) + : DownloadCertificatePanel (dialog) { - message->SetLabel (_("Downloading certificate")); - - /* Hack: without this the SetLabel() above has no visible effect */ - wxMilliSleep (200); - signal_manager->when_idle (boost::bind (&DolbyDoremiCertificatePanel::finish_download, this, wx_to_std (_serial->GetValue ()), message)); } + static void try_dcp2000 (list& urls, list& 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/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.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.certs.zip", prefix, serial.substr(0, 3), serial)); + files.push_back (String::compose("dcp2000-%1.cert.sha256.pem", serial)); } + static void try_imb (list& urls, list& 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& urls, list& 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& urls, list& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert (serial); + int const serial_int = raw_convert (serial); string cat862; if (serial_int <= 510999) { @@ -102,14 +95,15 @@ try_cat862 (list& urls, list& 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& urls, list& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert (serial); + int const serial_int = raw_convert(serial); string dsp100; if (serial_int <= 999) { @@ -121,14 +115,15 @@ try_dsp100 (list& urls, list& 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& urls, list& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert (serial.substr (1)); + int const serial_int = raw_convert(serial.substr (1)); string cat745; if (serial_int <= 999) { @@ -137,29 +132,41 @@ try_cat745 (list& urls, list& 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& urls, list& files, string prefix, string serial) { - int const serial_int = dcp::raw_convert (serial.substr (1)); + int const serial_int = raw_convert (serial.substr (1)); int const lower = serial_int - (serial_int % 1000); urls.push_back (String::compose ("%1CP850_CAT1600_F%2-F%3/cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%4.zip", prefix, lower, lower + 999, serial_int)); files.push_back (String::compose ("cert_RMB_SPB_MDE_FMA.Dolby-CP850-F%1.pem.crt", serial_int)); } + +static void +try_ims3000 (list& urls, list& 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::finish_download (string serial, wxStaticText* message) +DolbyDoremiCertificatePanel::do_download () { + string const serial = wx_to_std (_serial->GetValue()); + /* 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 urls; list files; @@ -180,6 +187,7 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa 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') { @@ -188,10 +196,10 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa list errors; bool ok = false; - list::const_iterator i = urls.begin (); - list::const_iterator j = files.begin (); + auto i = urls.begin (); + auto j = files.begin (); while (!ok && i != urls.end ()) { - optional error = get_from_zip_url (*i++, *j++, true, boost::bind (&DownloadCertificatePanel::load, this, _1)); + auto error = get_from_zip_url (*i++, *j++, true, true, boost::bind(&DownloadCertificatePanel::load_certificate, this, _1)); if (error) { errors.push_back (error.get ()); } else { @@ -200,22 +208,23 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa } if (ok) { - message->SetLabel (_("Certificate downloaded")); + _dialog->message()->SetLabel (_("Certificate downloaded")); _dialog->setup_sensitivity (); } else { - message->SetLabel (wxT ("")); + _dialog->message()->SetLabel (wxT ("")); - locked_stringstream s; - BOOST_FOREACH (string e, errors) { - s << e << "\n"; + string s; + for (auto e: errors) { + s += e + "\n"; } - error_dialog (this, std_to_wx (s.str ())); + error_dialog (this, std_to_wx (s)); } } -bool -DolbyDoremiCertificatePanel::ready_to_download () const + +wxString +DolbyDoremiCertificatePanel::name () const { - return !_serial->IsEmpty (); + return _("Dolby / Doremi"); }