Merge master.

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

diff --git a/src/wx/doremi_certificate_dialog.cc b/src/wx/doremi_certificate_dialog.cc
index 8509c97d150d502bff9c43be50dc18894be9ec2c..b4cd14eaf200af95b740816e4a0c1db182a8b4e8 100644 (file)
--- a/src/wx/doremi_certificate_dialog.cc
+++ b/src/wx/doremi_certificate_dialog.cc
@@ -26,6 +26,7 @@
 #include "wx_util.h"
 
 using std::string;
+using std::cout;
 using boost::function;
 using boost::optional;
 
@@ -33,7 +34,9 @@ DoremiCertificateDialog::DoremiCertificateDialog (wxWindow* parent, function<voi
        : DownloadCertificateDialog (parent, load)
 {
        add (_("Server serial number"), true);
-       _serial = add (new wxTextCtrl (this, wxID_ANY));
+       _serial = add (new wxTextCtrl (this, wxID_ANY, wxT (""), wxDefaultPosition, wxSize (300, -1)));
+
+       _serial->Bind (wxEVT_COMMAND_TEXT_UPDATED, boost::bind (&DoremiCertificateDialog::set_sensitivity, this));
 
        add_common_widgets ();
 }
@@ -48,6 +51,9 @@ DoremiCertificateDialog::download ()
        }
 
        _message->SetLabel (_("Downloading certificate"));
+       run_gui_loop ();
+
+       /* Try dcp2000, imb and ims prefixes (see mantis #375) */
 
        optional<string> error = get_from_zip_url (
                String::compose (
@@ -58,9 +64,38 @@ DoremiCertificateDialog::download ()
                _load
                );
 
+       if (error) {
+               error = get_from_zip_url (
+               String::compose (
+                       "ftp://service:t3chn1c1an@ftp.doremilabs.com/Certificates/%1xxx/imb-%2.dcicerts.zip",
+                       serial.substr(0, 3), serial
+                       ),
+               String::compose ("imb-%1.cert.sha256.pem", serial),
+               _load
+               );
+       }
+
+       if (error) {
+               error = get_from_zip_url (
+               String::compose (
+                       "ftp://service:t3chn1c1an@ftp.doremilabs.com/Certificates/%1xxx/ims-%2.dcicerts.zip",
+                       serial.substr(0, 3), serial
+                       ),
+               String::compose ("ims-%1.cert.sha256.pem", serial),
+               _load
+               );
+       }
+
        if (error) {
                error_dialog (this, std_to_wx (error.get ()));
        } else {
-               _message->SetLabel (wxT (""));
+               _message->SetLabel (_("Certificate downloaded"));
        }
 }
+
+void
+DoremiCertificateDialog::set_sensitivity ()
+{
+       _download->Enable (!_serial->IsEmpty ());
+}
+