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 b0840a83fa23f9831f7f47734957b3ce95dddcdc..4b5d58b375536c475a26c6612e03bd0ae4c26351 100644 (file)
--- a/src/wx/doremi_certificate_dialog.cc
+++ b/src/wx/doremi_certificate_dialog.cc
@@ -21,11 +21,13 @@
 #include <zip.h>
 #include "lib/compose.hpp"
 #include "lib/util.h"
+#include "lib/ui_signaller.h"
 #include "lib/internet.h"
 #include "doremi_certificate_dialog.h"
 #include "wx_util.h"
 
 using std::string;
+using std::cout;
 using boost::function;
 using boost::optional;
 
@@ -50,7 +52,19 @@ DoremiCertificateDialog::download ()
        }
 
        _message->SetLabel (_("Downloading certificate"));
-       run_gui_loop ();
+
+#ifdef DCPOMATIC_OSX   
+       /* This is necessary on OS X, otherwise the SetLabel() above has no visible effect */
+       wxMilliSleep (200);
+#endif 
+
+       ui_signaller->when_idle (boost::bind (&DoremiCertificateDialog::finish_download, this, serial));
+}
+
+void
+DoremiCertificateDialog::finish_download (string serial)
+{
+       /* Try dcp2000, imb and ims prefixes (see mantis #375) */
 
        optional<string> error = get_from_zip_url (
                String::compose (
@@ -61,6 +75,28 @@ 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 {