Specify no EPRT on FTP downloads. Fix request to CURL when not

using PASV.  Fix incorrect return value from ftp_ls_data.
Tidy Dolby fetching code a bit.  Fix sensitivity of Dolby
download button (#769).

3 files changed, 20 insertions, 10 deletions

diff --git a/src/wx/dolby_certificate_panel.cc b/src/wx/dolby_certificate_panel.cc
index 7e6404cfb..45d52eca2 100644
--- a/src/wx/dolby_certificate_panel.cc
+++ b/src/wx/dolby_certificate_panel.cc
@@ -64,11 +64,16 @@ DolbyCertificatePanel::DolbyCertificatePanel (wxWindow* parent, DownloadCertific
 	_cinema->Clear ();
 }
 
+string
+DolbyCertificatePanel::url (string path) const
+{
+	return String::compose ("ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1", path);
+}
+
 list<string>
 DolbyCertificatePanel::get_dir (string dir) const
 {
-	string url = String::compose ("ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1", dir);
-	return ftp_ls (url, false);
+	return ftp_ls (url (dir), false);
 }
 
 void
@@ -180,11 +185,12 @@ DolbyCertificatePanel::finish_download (wxStaticText* message)
 {
 	string const zip = string_client_data (_serial->GetClientObject (_serial->GetSelection ()));
 
-	string const file = String::compose (
-		"ftp://dolbyrootcertificates:houro61l@ftp.dolby.co.uk/SHA256/%1/%2/%3",
-		wx_to_std (_country->GetStringSelection()),
-		wx_to_std (_cinema->GetStringSelection()),
-		zip
+	string const file = url (
+		String::compose ("%1/%2/%3",
+				 wx_to_std (_country->GetStringSelection()),
+				 wx_to_std (_cinema->GetStringSelection()),
+				 zip
+			)
 		);
 
 	/* Work out the certificate file name inside the zip */
@@ -196,7 +202,7 @@ DolbyCertificatePanel::finish_download (wxStaticText* message)
 	}
 	string const cert = b[0] + "_" + b[1] + ".pem.crt";
 
-	optional<string> error = get_from_zip_url (file, cert, boost::bind (&DownloadCertificatePanel::load, this, _1));
+	optional<string> error = get_from_zip_url (file, cert, false, boost::bind (&DownloadCertificatePanel::load, this, _1));
 	if (error) {
 		message->SetLabel (std_to_wx (error.get ()));
 	} else {
@@ -208,8 +214,7 @@ DolbyCertificatePanel::finish_download (wxStaticText* message)
 bool
 DolbyCertificatePanel::ready_to_download () const
 {
-	/* XXX */
-	return false;
+	return _country->GetSelection() != -1 && _cinema->GetSelection() != -1 && _serial->GetSelection() != -1;
 }
 
 void
diff --git a/src/wx/dolby_certificate_panel.h b/src/wx/dolby_certificate_panel.h
index 1ac47ae76..c004a7717 100644
--- a/src/wx/dolby_certificate_panel.h
+++ b/src/wx/dolby_certificate_panel.h
@@ -38,6 +38,7 @@ private:
 	void finish_country_selected ();
 	void cinema_selected ();
 	void finish_cinema_selected ();
+	std::string url (std::string path) const;
 	std::list<std::string> get_dir (std::string) const;
 
 	wxChoice* _country;
diff --git a/src/wx/doremi_certificate_panel.cc b/src/wx/doremi_certificate_panel.cc
index 4d98b09ea..bdc0b0377 100644
--- a/src/wx/doremi_certificate_panel.cc
+++ b/src/wx/doremi_certificate_panel.cc
@@ -71,6 +71,7 @@ DoremiCertificatePanel::finish_download (string serial, wxStaticText* message)
 			serial.substr(0, 3), serial
 			),
 		String::compose ("dcp2000-%1.cert.sha256.pem", serial),
+		true,
 		boost::bind (&DownloadCertificatePanel::load, this, _1)
 		);
 
@@ -82,6 +83,7 @@ DoremiCertificatePanel::finish_download (string serial, wxStaticText* message)
 			serial.substr(0, 3), serial
 			),
 		String::compose ("dcp2000-%1.cert.sha256.pem", serial),
+		true,
 		boost::bind (&DownloadCertificatePanel::load, this, _1)
 		);
 	}
@@ -94,6 +96,7 @@ DoremiCertificatePanel::finish_download (string serial, wxStaticText* message)
 			serial.substr(0, 3), serial
 			),
 		String::compose ("imb-%1.cert.sha256.pem", serial),
+		true,
 		boost::bind (&DownloadCertificatePanel::load, this, _1)
 		);
 	}
@@ -106,6 +109,7 @@ DoremiCertificatePanel::finish_download (string serial, wxStaticText* message)
 			serial.substr(0, 3), serial
 			),
 		String::compose ("ims-%1.cert.sha256.pem", serial),
+		true,
 		boost::bind (&DownloadCertificatePanel::load, this, _1)
 		);
 	}