gergely/taskwarrior-2.x
1
0
Fork 0
Code Issues Actions Packages Projects Releases 1 Wiki Activity

Uri support

Browse Source 
- TransportCurl now supports non-anonymous ftp
This commit is contained in:
Johannes Schlatow
2010-10-15 00:12:42 +02:00
parent 36800e0a35
commit d39d5af03b
1 changed files with 40 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

67
src/TransportCurl.cpp
View File

@@ -38,10 +38,16 @@ TransportCurl::TransportCurl(const Uri& uri) : Transport(uri)
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void TransportCurl::send(const std::string& source) void TransportCurl::send(const std::string& source)
{ {
if (uri.host == "") if (uri.host == "")
throw std::string ("when using the 'curl' protocol, the uri must contain a hostname."); throw std::string ("when using the 'curl' protocol, the uri must contain a hostname.");
if (is_filelist(source)) if (uri.user != "")
{
arguments.push_back("--user");
arguments.push_back(uri.user);
}
if (is_filelist(source))
{ {
std::string::size_type pos; std::string::size_type pos;
pos = source.find("{"); pos = source.find("{");
@@ -76,25 +82,32 @@ void TransportCurl::send(const std::string& source)
arguments.push_back (source); arguments.push_back (source);
} }
// cmd line is: curl -T source protocol://host:port/path // cmd line is: curl -T source protocol://host:port/path
if (uri.port != "") if (uri.port != "")
{ {
arguments.push_back (uri.protocol + "://" + uri.host + ":" + uri.port + "/" + uri.path); arguments.push_back (uri.protocol + "://" + uri.host + ":" + uri.port + "/" + uri.path);
} }
else else
{ {
arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path); arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path);
} }
if (execute()) if (execute())
throw std::string ("Could not run curl. Is it installed, and available in $PATH?"); throw std::string ("Could not run curl. Is it installed, and available in $PATH?");
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////
void TransportCurl::recv(std::string target) void TransportCurl::recv(std::string target)
{ {
if (uri.host == "") if (uri.host == "")
throw std::string ("when using the 'curl' protocol, the uri must contain a hostname."); throw std::string ("when using the 'curl' protocol, the uri must contain a hostname.");
if (uri.user != "")
{
arguments.push_back("--user");
arguments.push_back(uri.user);
}
if (is_filelist(uri.path)) if (is_filelist(uri.path))
{ {
@@ -127,20 +140,20 @@ void TransportCurl::recv(std::string target)
target = "-o " + target; target = "-o " + target;
} }
// cmd line is: curl protocol://host:port/path/to/source/file -o path/to/target/file // cmd line is: curl protocol://host:port/path/to/source/file -o path/to/target/file
if (uri.port != "") if (uri.port != "")
{ {
arguments.push_back (uri.protocol + "://" + uri.host + ":" + uri.port + "/" + uri.path); arguments.push_back (uri.protocol + "://" + uri.host + ":" + uri.port + "/" + uri.path);
} }
else else
{ {
arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path); arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path);
} }
arguments.push_back (target); arguments.push_back (target);
if (execute()) if (execute())
throw std::string ("Could not run curl. Is it installed, and available in $PATH?"); throw std::string ("Could not run curl. Is it installed, and available in $PATH?");
} }
//////////////////////////////////////////////////////////////////////////////// ////////////////////////////////////////////////////////////////////////////////