Don't say 'certificate downloaded' if it failed during the read part.

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index b993117bb5e93cc3b58e77264c7dcd3ce0b14f79..943363d1a67da48109f246ed3b900c5e23312135 100644 (file)
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -119,24 +119,25 @@ get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp)
        return optional<string>();
 }
 
+
 optional<string>
-get_from_url (string url, bool pasv, bool skip_pasv_ip, function<void (boost::filesystem::path)> load)
+get_from_url (string url, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load)
 {
        ScopedTemporary temp;
        optional<string> e = get_from_url (url, pasv, skip_pasv_ip, temp);
        if (e) {
                return e;
        }
-       load (temp.file());
-       return optional<string>();
+       return load (temp.file());
 }
 
+
 /** @param url URL of ZIP file.
  *  @param file Filename within ZIP file.
  *  @param load Function passed a (temporary) filesystem path of the unpacked file.
  */
 optional<string>
-get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<void (boost::filesystem::path)> load)
+get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, function<optional<string> (boost::filesystem::path)> load)
 {
        /* Download the ZIP file to temp_zip */
        ScopedTemporary temp_zip;
@@ -193,6 +194,5 @@ get_from_zip_url (string url, string file, bool pasv, bool skip_pasv_ip, functio
        zip_close (zip);
        temp_cert.close ();
 
-       load (temp_cert.file ());
-       return optional<string> ();
+       return load (temp_cert.file());
 }

diff --git a/src/lib/internet.h b/src/lib/internet.h
index 5f9a25e3b2ab166adf7c81e8f0e330cb25bc7fda..8aa7264c61372d07c75f46a40cf5f59cf4ab3f55 100644 (file)
--- a/src/lib/internet.h
+++ b/src/lib/internet.h
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -25,6 +25,6 @@
 class ScopedTemporary;
 
 boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp);
-boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, boost::function<void (boost::filesystem::path)> load);
-boost::optional<std::string> get_from_zip_url (std::string url, std::string file, bool pasv, bool skip_pasv_ip, boost::function<void (boost::filesystem::path)> load);
+boost::optional<std::string> get_from_url (std::string url, bool pasv, bool skip_pasv_ip, boost::function<boost::optional<std::string> (boost::filesystem::path)> load);
+boost::optional<std::string> get_from_zip_url (std::string url, std::string file, bool pasv, bool skip_pasv_ip, boost::function<boost::optional<std::string> (boost::filesystem::path)> load);
 std::list<std::string> ls_url (std::string url);

diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
index 7db3fef2500303e226d1202e44cc30ad7f340369..0795b09e9855c89300516f62fb29cf0713565477 100644 (file)
--- a/src/wx/christie_certificate_panel.cc
+++ b/src/wx/christie_certificate_panel.cc
@@ -76,7 +76,7 @@ ChristieCertificatePanel::do_download ()
                _dialog->message()->SetLabel(wxT(""));
                error_dialog (this, std_to_wx(*all_errors));
        } else {
-               _dialog->message()->SetLabel (_("Certificate downloaded"));
+               _dialog->message()->SetLabel (_("Certificate dowloaded"));
                _dialog->setup_sensitivity ();
        }
 }

diff --git a/src/wx/download_certificate_panel.cc b/src/wx/download_certificate_panel.cc
index 2f3b435efaba5a4f66cc2a72f432ae1a20ad8ea3..461c68966cba83b94d3afc27838f073e55fb78ba 100644 (file)
--- a/src/wx/download_certificate_panel.cc
+++ b/src/wx/download_certificate_panel.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2018 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2020 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,10 +22,12 @@
 #include "download_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "lib/signal_manager.h"
+#include "lib/compose.hpp"
 #include <dcp/util.h>
 #include <dcp/exceptions.h>
 #include <boost/bind.hpp>
 
+using std::string;
 using boost::function;
 using boost::optional;
 
@@ -51,14 +53,15 @@ DownloadCertificatePanel::DownloadCertificatePanel (DownloadCertificateDialog* d
        _overall_sizer->SetSizeHints (this);
 }
 
-void
+optional<string>
 DownloadCertificatePanel::load (boost::filesystem::path file)
 {
        try {
                _certificate = dcp::Certificate (dcp::file_to_string (file));
        } catch (dcp::MiscError& e) {
-               error_dialog (this, _("Could not read certificate file."), std_to_wx(e.what()));
+               return String::compose(wx_to_std(_("Could not read certificate file (%1)")), e.what());
        }
+       return optional<string>();
 }
 
 optional<dcp::Certificate>

diff --git a/src/wx/download_certificate_panel.h b/src/wx/download_certificate_panel.h
index d1f0bf4defbbaac96ec55a772d1ddf757f0920cc..f51bcde133c3ec49f88cfc64306b9e72ddfff32d 100644 (file)
--- a/src/wx/download_certificate_panel.h
+++ b/src/wx/download_certificate_panel.h
@@ -37,7 +37,7 @@ public:
        virtual bool ready_to_download () const;
 
        void download ();
-       void load (boost::filesystem::path);
+       boost::optional<std::string> load (boost::filesystem::path);
        boost::optional<dcp::Certificate> certificate () const;
 
 protected: