Christie support.

diff --git a/src/lib/config.cc b/src/lib/config.cc
index 792ce5619571f06304478494e329157bd67456b4..28af9b30334b8ee6caf4c599df20666738d1ec65 100644 (file)
--- a/src/lib/config.cc
+++ b/src/lib/config.cc
@@ -158,6 +158,8 @@ Config::set_defaults ()
        }
        _barco_username = optional<string>();
        _barco_password = optional<string>();
+       _christie_username = optional<string>();
+       _christie_password = optional<string>();
 
        _allowed_dcp_frame_rates.clear ();
        _allowed_dcp_frame_rates.push_back (24);
@@ -467,6 +469,8 @@ try
 
        _barco_username = f.optional_string_child("BarcoUsername");
        _barco_password = f.optional_string_child("BarcoPassword");
+       _christie_username = f.optional_string_child("ChristieUsername");
+       _christie_password = f.optional_string_child("ChristiePassword");
 
        /* Replace any cinemas from config.xml with those from the configured file */
        if (boost::filesystem::exists (_cinemas_file)) {
@@ -818,6 +822,13 @@ Config::write_config () const
                root->add_child("BarcoPassword")->add_child_text(*_barco_password);
        }
 
+       if (_christie_username) {
+               root->add_child("ChristieUsername")->add_child_text(*_christie_username);
+       }
+       if (_christie_password) {
+               root->add_child("ChristiePassword")->add_child_text(*_christie_password);
+       }
+
        try {
                doc.write_to_file_formatted(config_file().string());
        } catch (xmlpp::exception& e) {

diff --git a/src/lib/config.h b/src/lib/config.h
index 8bf766c021a151d36e6b995a231a509e595efb1e..b710f537dd15a962451d9bb0772da5d7dc6f70a0 100644 (file)
--- a/src/lib/config.h
+++ b/src/lib/config.h
@@ -431,6 +431,14 @@ public:
                return _barco_password;
        }
 
+       boost::optional<std::string> christie_username () const {
+               return _christie_username;
+       }
+
+       boost::optional<std::string> christie_password () const {
+               return _christie_password;
+       }
+
        /* SET (mostly) */
 
        void set_master_encoding_threads (int n) {
@@ -793,6 +801,22 @@ public:
                maybe_set (_barco_password, boost::optional<std::string>());
        }
 
+       void set_christie_username (std::string u) {
+               maybe_set (_christie_username, u);
+       }
+
+       void unset_christie_username () {
+               maybe_set (_christie_username, boost::optional<std::string>());
+       }
+
+       void set_christie_password (std::string p) {
+               maybe_set (_christie_password, p);
+       }
+
+       void unset_christie_password () {
+               maybe_set (_christie_password, boost::optional<std::string>());
+       }
+
        void changed (Property p = OTHER);
        boost::signals2::signal<void (Property)> Changed;
        /** Emitted if read() failed on an existing Config file.  There is nothing
@@ -970,6 +994,8 @@ private:
        bool _notification[NOTIFICATION_COUNT];
        boost::optional<std::string> _barco_username;
        boost::optional<std::string> _barco_password;
+       boost::optional<std::string> _christie_username;
+       boost::optional<std::string> _christie_password;
 
        static int const _current_version;
 

diff --git a/src/wx/christie_certificate_panel.cc b/src/wx/christie_certificate_panel.cc
new file mode 100644 (file)
index 0000000..53d815b
--- /dev/null
+++ b/src/wx/christie_certificate_panel.cc
@@ -0,0 +1,87 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "christie_certificate_panel.h"
+#include "download_certificate_dialog.h"
+#include "wx_util.h"
+#include "lib/internet.h"
+#include "lib/compose.hpp"
+#include "lib/config.h"
+
+using std::string;
+using boost::optional;
+
+ChristieCertificatePanel::ChristieCertificatePanel (DownloadCertificateDialog* dialog)
+       : DownloadCertificatePanel (dialog)
+{
+
+}
+
+void
+ChristieCertificatePanel::do_download ()
+{
+       Config* config = Config::instance ();
+       if (!config->christie_username() || !config->christie_password()) {
+               _dialog->message()->SetLabel(wxT(""));
+               error_dialog (this, _("No Christie username/password configured.  Add your account details to the Accounts page in Preferences."));
+               return;
+       }
+
+       string const serial = wx_to_std (_serial->GetValue());
+       string const url = String::compose (
+               "ftp://%1:%2@certificates.christiedigital.com/Certificates/F-IMB/F-IMB_000000%3_sha256.pem",
+               Config::instance()->christie_username().get(),
+               Config::instance()->christie_password().get(),
+               serial
+               );
+
+       optional<string> all_errors;
+
+       optional<string> error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+       if (error) {
+               all_errors = *error;
+
+               string const url = String::compose (
+                       "ftp://%1:%2@certificates.christiedigital.com/Certificates/F-IMB/F-IMB_000000%3_sha256.pem",
+                       Config::instance()->christie_username().get(),
+                       Config::instance()->christie_password().get(),
+                       serial
+                       );
+
+               error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
+               if (error) {
+                       *all_errors += "\n" + *error;
+               }
+       }
+
+       if (all_errors) {
+               _dialog->message()->SetLabel(wxT(""));
+               error_dialog (this, std_to_wx(*all_errors));
+       } else {
+               _dialog->message()->SetLabel (_("Certificate downloaded"));
+               _dialog->setup_sensitivity ();
+       }
+}
+
+wxString
+ChristieCertificatePanel::name () const
+{
+       return _("Christie");
+}

diff --git a/src/wx/christie_certificate_panel.h b/src/wx/christie_certificate_panel.h
new file mode 100644 (file)
index 0000000..0c9a64d
--- /dev/null
+++ b/src/wx/christie_certificate_panel.h
@@ -0,0 +1,30 @@
+/*
+    Copyright (C) 2018 Carl Hetherington <cth@carlh.net>
+
+    This file is part of DCP-o-matic.
+
+    DCP-o-matic is free software; you can redistribute it and/or modify
+    it under the terms of the GNU General Public License as published by
+    the Free Software Foundation; either version 2 of the License, or
+    (at your option) any later version.
+
+    DCP-o-matic is distributed in the hope that it will be useful,
+    but WITHOUT ANY WARRANTY; without even the implied warranty of
+    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+    GNU General Public License for more details.
+
+    You should have received a copy of the GNU General Public License
+    along with DCP-o-matic.  If not, see <http://www.gnu.org/licenses/>.
+
+*/
+
+#include "download_certificate_panel.h"
+
+class ChristieCertificatePanel : public DownloadCertificatePanel
+{
+public:
+       ChristieCertificatePanel (DownloadCertificateDialog* dialog);
+
+       void do_download ();
+       wxString name () const;
+};

diff --git a/src/wx/download_certificate_dialog.cc b/src/wx/download_certificate_dialog.cc
index 6ca605f563374a439125b648caad51429e0c2bcd..dfafee36c48a9455b271ea00ca7566cbd007a3ea 100644 (file)
--- a/src/wx/download_certificate_dialog.cc
+++ b/src/wx/download_certificate_dialog.cc
@@ -20,6 +20,7 @@
 
 #include "dolby_doremi_certificate_panel.h"
 #include "barco_alchemy_certificate_panel.h"
+#include "christie_certificate_panel.h"
 #include "download_certificate_dialog.h"
 #include "wx_util.h"
 
@@ -45,6 +46,7 @@ DownloadCertificateDialog::DownloadCertificateDialog (wxWindow* parent)
 
        _pages.push_back (new DolbyDoremiCertificatePanel (this));
        _pages.push_back (new BarcoAlchemyCertificatePanel (this));
+       _pages.push_back (new ChristieCertificatePanel (this));
 
        BOOST_FOREACH (DownloadCertificatePanel* i, _pages) {
                _notebook->AddPage (i, i->name(), true);

diff --git a/src/wx/full_config_dialog.cc b/src/wx/full_config_dialog.cc
index bf26519e1fb2206cb1519cc9e00e65d6d03cf9f0..d21c8a2c11e8d01384fa59f8ce84ede1f2c75127 100644 (file)
--- a/src/wx/full_config_dialog.cc
+++ b/src/wx/full_config_dialog.cc
@@ -943,8 +943,18 @@ public:
                _barco_password = new wxTextCtrl (_panel, wxID_ANY);
                table->Add (_barco_password, 1, wxEXPAND | wxALL);
 
+               add_label_to_sizer (table, _panel, _("certificates.christiedigital.com username"), true);
+               _christie_username = new wxTextCtrl (_panel, wxID_ANY);
+               table->Add (_christie_username, 1, wxEXPAND | wxALL);
+
+               add_label_to_sizer (table, _panel, _("certificates.christiedigital.com password"), true);
+               _christie_password = new wxTextCtrl (_panel, wxID_ANY);
+               table->Add (_christie_password, 1, wxEXPAND | wxALL);
+
                _barco_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_username_changed, this));
                _barco_password->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::barco_password_changed, this));
+               _christie_username->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_username_changed, this));
+               _christie_password->Bind (wxEVT_TEXT, boost::bind(&AccountsPage::christie_password_changed, this));
        }
 
        void config_changed ()
@@ -953,6 +963,8 @@ public:
 
                checked_set (_barco_username, config->barco_username().get_value_or(""));
                checked_set (_barco_password, config->barco_password().get_value_or(""));
+               checked_set (_christie_username, config->christie_username().get_value_or(""));
+               checked_set (_christie_password, config->christie_password().get_value_or(""));
        }
 
        void barco_username_changed ()
@@ -975,9 +987,31 @@ public:
                }
        }
 
+       void christie_username_changed ()
+       {
+               wxString const s = _christie_username->GetValue();
+               if (!s.IsEmpty()) {
+                       Config::instance()->set_christie_username (wx_to_std(s));
+               } else {
+                       Config::instance()->unset_christie_username ();
+               }
+       }
+
+       void christie_password_changed ()
+       {
+               wxString const s = _christie_password->GetValue();
+               if (!s.IsEmpty()) {
+                       Config::instance()->set_christie_password (wx_to_std(s));
+               } else {
+                       Config::instance()->unset_christie_password ();
+               }
+       }
+
 private:
        wxTextCtrl* _barco_username;
        wxTextCtrl* _barco_password;
+       wxTextCtrl* _christie_username;
+       wxTextCtrl* _christie_password;
 };
 
 

diff --git a/src/wx/wscript b/src/wx/wscript
index 39617b840425d01ff98d7750cdac9f2bb1d9ed82..560bfc1abe271d582f1a6e7fb62da029cf6fa074 100644 (file)
--- a/src/wx/wscript
+++ b/src/wx/wscript
@@ -36,6 +36,7 @@ sources = """
           subtitle_appearance_dialog.cc
           text_panel.cc
           text_view.cc
+          christie_certificate_panel.cc
           cinema_dialog.cc
           colour_conversion_editor.cc
           config_dialog.cc