GothenburgBitFactory/taskwarrior
1
0
Fork 0
mirror of https://github.com/GothenburgBitFactory/taskwarrior.git synced 2025-08-19 09:53:08 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Bug - import/export now output JSON as individual objects

Browse source 
* For JSON as array, json.array=1 behaves as before
* Tests and add-on scripts used in import tests were updated
This commit is contained in:
Renato Alves 2014-10-20 20:21:11 +01:00
parent b569504139
commit d49a2614ba
6 changed files with 11 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

2
scripts/add-ons/import-todo.sh.pl
View file

@ -125,7 +125,7 @@ while (my $todo = <>)
push @tasks, $json; push @tasks, $json;
} }
print "[\n", join (",\n", @tasks), "\n]\n"; print "[\n", join ("\n", @tasks), "\n]\n";
exit 0; exit 0;
################################################################################ ################################################################################

2
scripts/add-ons/import-yaml.pl
View file

@ -117,7 +117,7 @@ while (my $yaml = <>)
} }
} }
print "[\n", join (",\n", @tasks), "\n]\n"; print "[\n", join ("\n", @tasks), "\n]\n";
exit 0; exit 0;
################################################################################ ################################################################################

6
src/commands/CmdExport.cpp
View file

@ -71,7 +71,11 @@ int CmdExport::execute (std::string& output)
for (task = filtered.begin (); task != filtered.end (); ++task) for (task = filtered.begin (); task != filtered.end (); ++task)
{ {
if (task != filtered.begin ()) if (task != filtered.begin ())
output += ",\n"; {
if (json_array)
output += ",";
output += "\n";
}
output += task->composeJSON (true); output += task->composeJSON (true);

3
src/commands/CmdImport.cpp
View file

@ -76,8 +76,7 @@ int CmdImport::execute (std::string& output)
{ {
std::string object = trimLeft ( std::string object = trimLeft (
trimRight ( trimRight (
trimRight ( trim (*line),
trim (*line), ","),
"]"), "]"),
"["); "[");
// Skip blanks. May be caused by the trim calls above. // Skip blanks. May be caused by the trim calls above.

4
test/import.t
View file

@ -45,8 +45,8 @@ if (open my $fh, '>', 'import.rc')
if (open my $fh, '>', 'import.txt') if (open my $fh, '>', 'import.txt')
{ {
print $fh <<EOF; print $fh <<EOF;
{"uuid":"00000000-0000-0000-0000-000000000000","description":"zero","project":"A","status":"pending","entry":"1234567889"}, {"uuid":"00000000-0000-0000-0000-000000000000","description":"zero","project":"A","status":"pending","entry":"1234567889"}
{"uuid":"11111111-1111-1111-1111-111111111111","description":"one","project":"B","status":"pending","entry":"1234567889"}, {"uuid":"11111111-1111-1111-1111-111111111111","description":"one","project":"B","status":"pending","entry":"1234567889"}
{"uuid":"22222222-2222-2222-2222-222222222222","description":"two","status":"completed","entry":"1234524689","end":"1234524690"} {"uuid":"22222222-2222-2222-2222-222222222222","description":"two","status":"completed","entry":"1234524689","end":"1234524690"}
EOF EOF
close $fh; close $fh;

2
test/uda_orphan.t
View file

@ -73,7 +73,7 @@ like ($output, qr/"extra":"foo"/, 'UDA orphan exported');
if (open my $fh, '>', 'import.txt') if (open my $fh, '>', 'import.txt')
{ {
print $fh <<EOF; print $fh <<EOF;
{"uuid":"00000000-0000-0000-0000-000000000000","description":"two","status":"pending","entry":"1234567889","extra":"bar"}, {"uuid":"00000000-0000-0000-0000-000000000000","description":"two","status":"pending","entry":"1234567889","extra":"bar"}
EOF EOF
close $fh; close $fh;