Fix login denied (67) errors when trying to download certificates

[dcpomatic.git] / src / wx / dolby_doremi_certificate_panel.cc

diff --git a/src/wx/dolby_doremi_certificate_panel.cc b/src/wx/dolby_doremi_certificate_panel.cc
index fcff93a068a2d0c3b9a38f15fb2f0e67e2eb2301..0ad3058c287babf1ba645732f7e63328ece6b415 100644 (file)
--- a/src/wx/dolby_doremi_certificate_panel.cc
+++ b/src/wx/dolby_doremi_certificate_panel.cc
@@ -36,28 +36,12 @@ using std::cout;
 using std::list;
 using boost::function;
 using boost::optional;
+using dcp::raw_convert;
 
-DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (wxWindow* parent, DownloadCertificateDialog* dialog)
-       : DownloadCertificatePanel (parent, dialog)
+DolbyDoremiCertificatePanel::DolbyDoremiCertificatePanel (DownloadCertificateDialog* dialog)
+       : DownloadCertificatePanel (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)
-{
-       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
@@ -90,7 +74,7 @@ try_ims (list<string>& urls, list<string>& files, string prefix, string serial)
 static void
 try_cat862 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-       int const serial_int = dcp::raw_convert<int> (serial);
+       int const serial_int = raw_convert<int> (serial);
 
        string cat862;
        if (serial_int <= 510999) {
@@ -109,7 +93,7 @@ try_cat862 (list<string>& urls, list<string>& files, string prefix, string seria
 static void
 try_dsp100 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-       int const serial_int = dcp::raw_convert<int> (serial);
+       int const serial_int = raw_convert<int> (serial);
 
        string dsp100;
        if (serial_int <= 999) {
@@ -128,7 +112,7 @@ try_dsp100 (list<string>& urls, list<string>& files, string prefix, string seria
 static void
 try_cat745 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-       int const serial_int = dcp::raw_convert<int> (serial.substr (1));
+       int const serial_int = raw_convert<int> (serial.substr (1));
 
        string cat745;
        if (serial_int <= 999) {
@@ -147,7 +131,7 @@ try_cat745 (list<string>& urls, list<string>& files, string prefix, string seria
 static void
 try_cp850 (list<string>& urls, list<string>& files, string prefix, string serial)
 {
-       int const serial_int = dcp::raw_convert<int> (serial.substr (1));
+       int const serial_int = raw_convert<int> (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));
@@ -155,11 +139,13 @@ try_cp850 (list<string>& urls, list<string>& files, string prefix, string 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<string> urls;
        list<string> files;
 
@@ -191,7 +177,7 @@ DolbyDoremiCertificatePanel::finish_download (string serial, wxStaticText* messa
        list<string>::const_iterator i = urls.begin ();
        list<string>::const_iterator j = files.begin ();
        while (!ok && i != urls.end ()) {
-               optional<string> error = get_from_zip_url (*i++, *j++, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+               optional<string> 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 +186,22 @@ 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;
+               string s;
                BOOST_FOREACH (string e, errors) {
-                       s << e << "\n";
+                       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");
 }