projects
/
dcpomatic.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
No-op; fix GPL address and use the explicit-program-name version.
[dcpomatic.git]
/
src
/
lib
/
internet.cc
diff --git
a/src/lib/internet.cc
b/src/lib/internet.cc
index 16fd67244f4d0753ffe5e12f115ab4afa41a9cc1..5a909e470088470e558a4c0461ce5889dcf96f9e 100644
(file)
--- a/
src/lib/internet.cc
+++ b/
src/lib/internet.cc
@@
-1,37
+1,42
@@
/*
/*
- 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.
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
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 "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/function.hpp>
#include <boost/optional.hpp>
#include <boost/filesystem.hpp>
-#include <curl/curl.h>
-#include <zip.h>
-#include "util.h"
+#include <boost/algorithm/string.hpp>
+#include <string>
#include "i18n.h"
using std::string;
#include "i18n.h"
using std::string;
-using std::stringstream;
using std::list;
using boost::optional;
using boost::function;
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)
static size_t
get_from_zip_url_data (void* buffer, size_t size, size_t nmemb, void* stream)
@@
-45,16
+50,24
@@
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>
* @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 ());
{
/* 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);
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);
CURLcode const cr = curl_easy_perform (curl);
@@
-65,21
+78,21
@@
get_from_zip_url (string url, string file, function<void (boost::filesystem::pat
}
/* Open the ZIP file and read `file' out of it */
}
/* Open the ZIP file and read `file' out of it */
-
+
struct zip* zip = zip_open (temp_zip.c_str(), 0, 0);
if (!zip) {
return optional<string> (_("Could not open downloaded ZIP file"));
}
struct zip* zip = zip_open (temp_zip.c_str(), 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) {
return optional<string> (_("Unexpected ZIP file contents"));
}
struct zip_file* zip_file = zip_fopen (zip, file.c_str(), 0);
if (!zip_file) {
return optional<string> (_("Unexpected ZIP file contents"));
}
-
+
ScopedTemporary temp_cert;
f = temp_cert.open ("wb");
char buffer[4096];
ScopedTemporary temp_cert;
f = temp_cert.open ("wb");
char buffer[4096];
- while (
1
) {
+ while (
true
) {
int const N = zip_fread (zip_file, buffer, sizeof (buffer));
fwrite (buffer, 1, N, f);
if (N < int (sizeof (buffer))) {
int const N = zip_fread (zip_file, buffer, sizeof (buffer));
fwrite (buffer, 1, N, f);
if (N < int (sizeof (buffer))) {
@@
-87,12
+100,11
@@
get_from_zip_url (string url, string file, function<void (boost::filesystem::pat
}
}
temp_cert.close ();
}
}
temp_cert.close ();
-
+
load (temp_cert.file ());
return optional<string> ();
}
load (temp_cert.file ());
return optional<string> ();
}
-
static size_t
ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
{
static size_t
ftp_ls_data (void* buffer, size_t size, size_t nmemb, void* data)
{
@@
-101,21
+113,23
@@
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];
}
for (size_t i = 0; i < (size * nmemb); ++i) {
*s += b[i];
}
- return nmemb;
+ return
size *
nmemb;
}
list<string>
}
list<string>
-ftp_ls (string url)
+ftp_ls (string url
, bool pasv
)
{
CURL* curl = curl_easy_init ();
if (!curl) {
{
CURL* curl = curl_easy_init ();
if (!curl) {
-
return list<string> (
);
+
throw NetworkError ("could not set up curl"
);
}
if (url.substr (url.length() - 1, 1) != "/") {
url += "/";
}
curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
}
if (url.substr (url.length() - 1, 1) != "/") {
url += "/";
}
curl_easy_setopt (curl, CURLOPT_URL, url.c_str ());
+ /* 20s timeout */
+ curl_easy_setopt (curl, CURLOPT_TIMEOUT, 20);
string ls_raw;
struct curl_slist* commands = 0;
string ls_raw;
struct curl_slist* commands = 0;
@@
-124,16
+138,22
@@
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_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) {
CURLcode const r = curl_easy_perform (curl);
if (r != CURLE_OK) {
- return list<string> ();
+ curl_easy_cleanup (curl);
+ throw NetworkError (curl_easy_strerror (r));
}
}
- stringstream s (ls_raw);
- string line;
+ SafeStringStream s (ls_raw);
list<string> ls;
while (s.good ()) {
list<string> ls;
while (s.good ()) {
- getline (s, line);
+ string line = s.getline ();
+ trim (line);
if (line.length() > 55) {
string const file = line.substr (55);
if (file != "." && file != "..") {
if (line.length() > 55) {
string const file = line.substr (55);
if (file != "." && file != "..") {