GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-07-07 20:06:36 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Sync

Browse source 
- Changed the wording on most error messages and diagnostics so that
  the user is not alarmed, and is somewhat guided toward a solution.
This commit is contained in:
Paul Beckingham 2010-10-06 23:29:45 -04:00
parent 4028a2fce4
commit 74dcdd897a
11 changed files with 118 additions and 123 deletions
Download patch file Download diff file Expand all files Collapse all files

52
src/TransportCurl.cpp
View file

@ -38,33 +38,32 @@ TransportCurl::TransportCurl(const Uri& uri) : Transport(uri)
////////////////////////////////////////////////////////////////////////////////
void TransportCurl::send(const std::string& source)
{
if (uri.host == "") {
throw std::string ("Hostname is empty");
}
if (uri.host == "")
throw std::string ("when using the 'curl' protocol, the uri must contain a hostname.");
if (is_filelist(source))
{
std::string::size_type pos;
pos = source.find("{");
if (pos == std::string::npos)
throw std::string ("Curl does not support wildcards!");
throw std::string ("When using the 'curl' protocol, wildcards are not supported.");
if (!uri.is_directory())
throw std::string ("'" + uri.path + "' is not a directory!");
throw std::string ("The uri '"); + uri.path + "' does not appear to be a directory.";
std::string toSplit;
std::string suffix;
std::string prefix;
std::vector<std::string> splitted;
prefix = source.substr (0, pos);
toSplit = source.substr (pos+1);
toSplit = source.substr (pos+1);
pos = toSplit.find ("}");
suffix = toSplit.substr (pos+1);
split (splitted, toSplit.substr(0, pos), ',');
foreach (file, splitted)
{
arguments.push_back ("-T");
@ -88,27 +87,26 @@ void TransportCurl::send(const std::string& source)
}
if (execute())
throw std::string ("Failed to run curl!");
throw std::string ("Could not run curl. Is it installed, and available in $PATH?");
}
////////////////////////////////////////////////////////////////////////////////
void TransportCurl::recv(std::string target)
{
if (uri.host == "") {
throw std::string ("Hostname is empty");
}
if (uri.host == "")
throw std::string ("when using the 'curl' protocol, the uri must contain a hostname.");
if (is_filelist(uri.path))
{
std::string::size_type pos;
pos = uri.path.find("{");
if (pos == std::string::npos)
throw std::string ("Curl does not support wildcards!");
throw std::string ("When using the 'curl' protocol, wildcards are not supported.");
if (!is_directory(target))
throw std::string ("'" + target + "' is not a directory!");
throw std::string ("The uri '"); + target + "' does not appear to be a directory.";
std::string toSplit;
std::string suffix;
std::string prefix = target;
@ -117,7 +115,7 @@ void TransportCurl::recv(std::string target)
pos = toSplit.find ("}");
suffix = toSplit.substr (pos+1);
split (splitted, toSplit.substr(0, pos), ',');
target = "";
foreach (file, splitted)
{
@ -128,7 +126,7 @@ void TransportCurl::recv(std::string target)
{
target = "-o " + target;
}
// cmd line is: curl protocol://host:port/path/to/source/file -o path/to/target/file
if (uri.port != "")
{
@ -138,11 +136,11 @@ void TransportCurl::recv(std::string target)
{
arguments.push_back (uri.protocol + "://" + uri.host + "/" + uri.path);
}
arguments.push_back (target);
if (execute())
throw std::string ("Failed to run curl!");
throw std::string ("Could not run curl. Is it installed, and available in $PATH?");
}
////////////////////////////////////////////////////////////////////////////////