Use get_pixel_size rather than get_size which is slightly nicer as we then don't...

[dcpomatic.git] / src / lib / internet.cc

diff --git a/src/lib/internet.cc b/src/lib/internet.cc
index 7bc818717a44737f2719960a8bc8832aff4eec82..1aaeccd36d1c9d64119f7871cd23134ea2c71d7b 100644 (file)
--- a/src/lib/internet.cc
+++ b/src/lib/internet.cc
@@ -17,16 +17,17 @@
 
 */
 
-#include <string>
+#include "scoped_temporary.h"
+#include "compose.hpp"
+#include "safe_stringstream.h"
+#include "exceptions.h"
+#include <curl/curl.h>
+#include <zip.h>
 #include <boost/function.hpp>
 #include <boost/optional.hpp>
 #include <boost/filesystem.hpp>
 #include <boost/algorithm/string.hpp>
-#include <curl/curl.h>
-#include <zip.h>
-#include "scoped_temporary.h"
-#include "compose.hpp"
-#include "safe_stringstream.h"
+#include <string>
 
 #include "i18n.h"
 
@@ -48,7 +49,7 @@ 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 ();
@@ -59,6 +60,11 @@ get_from_zip_url (string url, string file, function<void (boost::filesystem::pat
        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);
 
@@ -98,7 +104,6 @@ get_from_zip_url (string url, string file, function<void (boost::filesystem::pat
        return optional<string> ();
 }
 
-
 static size_t
 ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
 {
@@ -107,15 +112,15 @@ ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
        for (size_t i = 0; i < (size * nmemb); ++i) {
                *s += b[i];
        }
-       return nmemb;
+       return size * nmemb;
 }
 
 list<string>
-ftp_ls (string url)
+ftp_ls (string url, bool pasv)
 {
        CURL* curl = curl_easy_init ();
        if (!curl) {
-               return list<string> ();
+               throw NetworkError ("could not set up curl");
        }
 
        if (url.substr (url.length() - 1, 1) != "/") {
@@ -132,9 +137,15 @@ ftp_ls (string url)
        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);
+       curl_easy_setopt (curl, CURLOPT_FTP_USE_EPRT, 0);
+       curl_easy_setopt (curl, CURLOPT_VERBOSE, 1);
+       if (!pasv) {
+               curl_easy_setopt (curl, CURLOPT_FTPPORT, "-");
+       }
        CURLcode const r = curl_easy_perform (curl);
        if (r != CURLE_OK) {
-               return list<string> ();
+               curl_easy_cleanup (curl);
+               throw NetworkError (curl_easy_strerror (r));
        }
 
        SafeStringStream s (ls_raw);