/*
- Copyright (C) 2014 Carl Hetherington <cth@carlh.net>
+ Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
- This program is free software; you can redistribute it and/or modify
+ 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.
- This program is distributed in the hope that it will be useful,
+ 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 this program; if not, write to the Free Software
- Foundation, Inc., 675 Mass Ave, Cambridge, MA 02139, USA.
+ along with DCP-o-matic. If not, see <http://www.gnu.org/licenses/>.
*/
-#include <string>
+#include "scoped_temporary.h"
+#include "compose.hpp"
+#include "exceptions.h"
+#include "cross.h"
+#include <curl/curl.h>
+#include <zip.h>
#include <boost/function.hpp>
#include <boost/optional.hpp>
#include <boost/filesystem.hpp>
-#include <curl/curl.h>
-#include <zip.h>
-#include "util.h"
-#include "safe_stringstream.h"
+#include <boost/algorithm/string.hpp>
+#include <string>
#include "i18n.h"
using std::list;
using boost::optional;
using boost::function;
+using boost::algorithm::trim;
static size_t
get_from_zip_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
* @param load Function passed a (temporary) filesystem path of the unpacked file.
*/
optional<string>
-get_from_zip_url (string url, string file, function<void (boost::filesystem::path)> load)
+get_from_zip_url (string url, string file, bool pasv, function<void (boost::filesystem::path)> load)
{
/* Download the ZIP file to temp_zip */
CURL* curl = curl_easy_init ();
curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
-
+
ScopedTemporary temp_zip;
FILE* f = temp_zip.open ("wb");
curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, get_from_zip_url_data);
curl_easy_setopt (curl, CURLOPT_WRITEDATA, f);
curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
+ curl_easy_setopt (curl, CURLOPT_FTP_USE_EPRT, 0);
+ if (!pasv) {
+ curl_easy_setopt (curl, CURLOPT_FTPPORT, "-");
+ }
+
+ /* Maximum time is 20s */
+ curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20);
CURLcode const cr = curl_easy_perform (curl);
temp_zip.close ();
curl_easy_cleanup (curl);
if (cr != CURLE_OK) {
- return String::compose (_("Download failed (%1/%2 error %3)"), url, file, cr);
+ return String::compose (_("Download failed (%1/%2 error %3)"), url, file, (int) cr);
}
/* Open the ZIP file and read `file' out of it */
-
- struct zip* zip = zip_open (temp_zip.c_str(), 0, 0);
+
+#ifdef DCPOMATIC_HAVE_ZIP_SOURCE_T
+ /* This is the way to do it with newer versions of libzip, and is required on Windows.
+ The zip_source_t API is missing in the libzip versions shipped with Ubuntu 14.04,
+ Centos 6, Centos 7, Debian 7 and Debian 8.
+ */
+
+ FILE* zip_file = fopen_boost (temp_zip.file (), "rb");
+ if (!zip_file) {
+ return optional<string> (_("Could not open downloaded ZIP file"));
+ }
+
+ zip_source_t* zip_source = zip_source_filep_create (zip_file, 0, -1, 0);
+ if (!zip_source) {
+ return optional<string> (_("Could not open downloaded ZIP file"));
+ }
+
+ zip_t* zip = zip_open_from_source (zip_source, 0, 0);
if (!zip) {
return optional<string> (_("Could not open downloaded ZIP file"));
}
-
- struct zip_file* zip_file = zip_fopen (zip, file.c_str(), 0);
- if (!zip_file) {
+
+#else
+ struct zip* zip = zip_open (temp_zip.c_str(), 0, 0);
+#endif
+
+ struct zip_file* file_in_zip = zip_fopen (zip, file.c_str(), 0);
+ if (!file_in_zip) {
return optional<string> (_("Unexpected ZIP file contents"));
}
-
+
ScopedTemporary temp_cert;
f = temp_cert.open ("wb");
char buffer[4096];
while (true) {
- int const N = zip_fread (zip_file, buffer, sizeof (buffer));
+ int const N = zip_fread (file_in_zip, buffer, sizeof (buffer));
fwrite (buffer, 1, N, f);
if (N < int (sizeof (buffer))) {
break;
}
}
+ zip_fclose (file_in_zip);
+ zip_close (zip);
temp_cert.close ();
-
+
load (temp_cert.file ());
return optional<string> ();
}
-
-
-static size_t
-ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
-{
- string* s = reinterpret_cast<string *> (data);
- uint8_t* b = reinterpret_cast<uint8_t *> (buffer);
- for (size_t i = 0; i < (size * nmemb); ++i) {
- *s += b[i];
- }
- return nmemb;
-}
-
-list<string>
-ftp_ls (string url)
-{
- CURL* curl = curl_easy_init ();
- if (!curl) {
- return list<string> ();
- }
-
- if (url.substr (url.length() - 1, 1) != "/") {
- url += "/";
- }
- curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
-
- string ls_raw;
- struct curl_slist* commands = 0;
- commands = curl_slist_append (commands, "NLST");
- curl_easy_setopt (curl, CURLOPT_POSTQUOTE, commands);
- curl_easy_setopt (curl, CURLOPT_WRITEDATA, &ls_raw);
- curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ftp_ls_data);
- curl_easy_setopt (curl, CURLOPT_FTP_USE_EPSV, 0);
- CURLcode const r = curl_easy_perform (curl);
- if (r != CURLE_OK) {
- return list<string> ();
- }
-
- SafeStringStream s (ls_raw);
- list<string> ls;
- while (s.good ()) {
- string const line = s.getline ();
- if (line.length() > 55) {
- string const file = line.substr (55);
- if (file != "." && file != "..") {
- ls.push_back (file);
- }
- }
- }
-
- curl_easy_cleanup (curl);
-
- return ls;
-}