mirror of
https://github.com/GothenburgBitFactory/taskwarrior.git
synced 2025-06-26 10:54:26 +02:00
Import
- Modified man page to acknowledge import from file or URL. - Changed FEATURE_URL from #if to #ifdef, for consistency. - Modified import.url.t to accomodate a new URL for the test.
This commit is contained in:
parent
77f26994a6
commit
10a69c4d3d
3 changed files with 9 additions and 11 deletions
|
@ -133,7 +133,7 @@ Shows task database statistics.
|
|||
|
||||
.TP
|
||||
.B import \fIfile
|
||||
Imports tasks from a variety of formats.
|
||||
Imports tasks in a variety of formats, from file or URL.
|
||||
|
||||
.TP
|
||||
.B export
|
||||
|
|
|
@ -1272,7 +1272,7 @@ int handleImport (std::string& outs)
|
|||
// Use the description as a file name.
|
||||
std::string file = trim (context.task.get ("description"));
|
||||
|
||||
#if FEATURE_URL > 0
|
||||
#ifdef FEATURE_URL
|
||||
std::string tmpfile = "";
|
||||
Uri uri (file);
|
||||
uri.parse ();
|
||||
|
@ -1344,11 +1344,9 @@ int handleImport (std::string& outs)
|
|||
case not_a_clue: /* to stop the compiler from complaining. */ break;
|
||||
}
|
||||
|
||||
#if FEATURE_URL > 0
|
||||
#ifdef FEATURE_URL
|
||||
if (tmpfile != "")
|
||||
{
|
||||
remove (tmpfile.c_str ());
|
||||
}
|
||||
#endif
|
||||
}
|
||||
else
|
||||
|
|
|
@ -38,7 +38,7 @@ if (open my $fh, '>', 'import.rc')
|
|||
ok (-r 'import.rc', 'Created import.rc');
|
||||
}
|
||||
|
||||
my $output = qx{../src/task rc:import.rc import http://taskwarrior.org/attachments/download/216/import.txt};
|
||||
my $output = qx{../src/task rc:import.rc import http://tasktools.org/import.txt};
|
||||
like ($output, qr/Imported 2 tasks successfully, with 0 errors./, 'no errors');
|
||||
|
||||
$output = qx{../src/task rc:import.rc list};
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue