X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=src%2Flib%2Finternet.cc;h=b993117bb5e93cc3b58e77264c7dcd3ce0b14f79;hb=fea83d9ef5d02149f857a11de79ed266773fd5a1;hp=c1bb5e88fbd3d7aab609b202cdd2e960e4ebe304;hpb=f508191f9d794e7762270d19a4211739470cfe0d;p=dcpomatic.git

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index c1bb5e88f..b993117bb 100644
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -1,5 +1,5 @@
 /*
-    Copyright (C) 2014-2015 Carl Hetherington <cth@carlh.net>
+    Copyright (C) 2014-2019 Carl Hetherington <cth@carlh.net>
 
     This file is part of DCP-o-matic.
 
@@ -22,6 +22,7 @@
 #include "compose.hpp"
 #include "exceptions.h"
 #include "cross.h"
+#include "util.h"
 #include <curl/curl.h>
 #include <zip.h>
 #include <boost/function.hpp>
@@ -39,29 +40,67 @@ 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)
+ls_url_data (void* buffer, size_t size, size_t nmemb, void* output)
+{
+	string* s = reinterpret_cast<string*>(output);
+	char* c = reinterpret_cast<char*>(buffer);
+	for (size_t i = 0; i < (size * nmemb); ++i) {
+		*s += c[i];
+	}
+	return nmemb;
+}
+
+list<string>
+ls_url (string url)
+{
+	CURL* curl = curl_easy_init ();
+	curl_easy_setopt (curl, CURLOPT_URL, url.c_str());
+	curl_easy_setopt (curl, CURLOPT_DIRLISTONLY, 1);
+
+	string ls;
+	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, ls_url_data);
+	curl_easy_setopt (curl, CURLOPT_WRITEDATA, &ls);
+	CURLcode const cr = curl_easy_perform (curl);
+
+	if (cr != CURLE_OK) {
+		return list<string>();
+	}
+
+	list<string> result;
+	result.push_back("");
+	for (size_t i = 0; i < ls.size(); ++i) {
+		if (ls[i] == '\n') {
+			result.push_back("");
+		} else {
+			result.back() += ls[i];
+		}
+	}
+
+	result.pop_back ();
+	return result;
+}
+
+static size_t
+get_from_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
 {
 	FILE* f = reinterpret_cast<FILE*> (stream);
 	return fwrite (buffer, size, nmemb, f);
 }
 
-/** @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, function<void (boost::filesystem::path)> load)
+get_from_url (string url, bool pasv, bool skip_pasv_ip, ScopedTemporary& temp)
 {
-	/* Download the ZIP file to temp_zip */
 	CURL* curl = curl_easy_init ();
-	curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
+	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);
+	FILE* f = temp.open ("wb");
+	curl_easy_setopt (curl, CURLOPT_WRITEFUNCTION, get_from_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 (skip_pasv_ip) {
+		curl_easy_setopt (curl, CURLOPT_FTP_SKIP_PASV_IP, 1);
+	}
 	if (!pasv) {
 		curl_easy_setopt (curl, CURLOPT_FTPPORT, "-");
 	}
@@ -71,10 +110,39 @@ get_from_zip_url (string url, string file, bool pasv, function<void (boost::file
 
 	CURLcode const cr = curl_easy_perform (curl);
 
-	temp_zip.close ();
+	temp.close ();
 	curl_easy_cleanup (curl);
 	if (cr != CURLE_OK) {
-		return String::compose (_("Download failed (%1/%2 error %3)"), url, file, (int) cr);
+		return String::compose (_("Download failed (%1 error %2)"), url, (int) cr);
+	}
+
+	return optional<string>();
+}
+
+optional<string>
+get_from_url (string url, bool pasv, bool skip_pasv_ip, function<void (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>();
+}
+
+/** @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)
+{
+	/* Download the ZIP file to temp_zip */
+	ScopedTemporary temp_zip;
+	optional<string> e = get_from_url (url, pasv, skip_pasv_ip, temp_zip);
+	if (e) {
+		return e;
 	}
 
 	/* Open the ZIP file and read `file' out of it */
@@ -95,9 +163,11 @@ get_from_zip_url (string url, string file, bool pasv, function<void (boost::file
 		return optional<string> (_("Could not open downloaded ZIP file"));
 	}
 
-	zip_t* zip = zip_open_from_source (zip_source, 0, 0);
+	zip_error_t error;
+	zip_error_init (&error);
+	zip_t* zip = zip_open_from_source (zip_source, ZIP_RDONLY, &error);
 	if (!zip) {
-		return optional<string> (_("Could not open downloaded ZIP file"));
+		return String::compose (_("Could not open downloaded ZIP file (%1:%2: %3)"), error.zip_err, error.sys_err, error.str ? error.str : "");
 	}
 
 #else
@@ -110,11 +180,11 @@ get_from_zip_url (string url, string file, bool pasv, function<void (boost::file
 	}
 
 	ScopedTemporary temp_cert;
-	f = temp_cert.open ("wb");
+	FILE* f = temp_cert.open ("wb");
 	char buffer[4096];
 	while (true) {
 		int const N = zip_fread (file_in_zip, buffer, sizeof (buffer));
-		fwrite (buffer, 1, N, f);
+		checked_fwrite (buffer, N, f, temp_cert.file());
 		if (N < int (sizeof (buffer))) {
 			break;
 		}