projects
/
dcpomatic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
89abe02
)
Christie fixes.
author
Carl Hetherington
<cth@carlh.net>
Wed, 15 Aug 2018 09:10:19 +0000
(10:10 +0100)
committer
Carl Hetherington
<cth@carlh.net>
Wed, 15 Aug 2018 09:57:07 +0000
(10:57 +0100)
src/wx/christie_certificate_panel.cc
patch
|
blob
|
history
diff --git
a/src/wx/christie_certificate_panel.cc
b/src/wx/christie_certificate_panel.cc
index 53d815bf7a3a0663158294c933fa8ac29d865eb2..fa91cc2b594ae2f79deb7ded0687634686bfca10 100644
(file)
--- a/
src/wx/christie_certificate_panel.cc
+++ b/
src/wx/christie_certificate_panel.cc
@@
-44,26
+44,24
@@
ChristieCertificatePanel::do_download ()
return;
}
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",
+ string const prefix = String::compose(
+ "ftp://%1:%2@certificates.christiedigital.com/Certificates/",
Config::instance()->christie_username().get(),
Config::instance()->christie_username().get(),
- Config::instance()->christie_password().get(),
- serial
+ Config::instance()->christie_password().get()
);
);
+ string serial = wx_to_std (_serial->GetValue());
+ serial.insert (0, 12 - serial.length(), '0');
+
+ string const url = String::compose ("%1F-IMB/F-IMB_%2_sha256.pem", prefix, serial);
+
optional<string> all_errors;
optional<string> error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
if (error) {
all_errors = *error;
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
- );
+ string const url = String::compose ("%1IMB-S2/IMB-S2_%2_sha256.pem", prefix, serial);
error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
if (error) {
error = get_from_url (url, true, boost::bind (&DownloadCertificatePanel::load, this, _1));
if (error) {