Import

- Added unit tests for the 'import' command, which uses JSON as the
  native format.  This is the new default import/export format.  All
  other import/export formats are (to be) implemented as transforms
  to JSON.

src/commands/CmdImport.cpp

@@ -52,6 +52,7 @@ CmdImport::CmdImport ()
 int CmdImport::execute (std::string& output)
 {
   int rc = 0;
+  int count = 0;
 
 	// Use the description as a file name.
   std::vector <std::string> words = context.a3.extract_words ();
@@ -164,14 +165,13 @@ int CmdImport::execute (std::string& output)
 
         task.validate ();
 
-        // TODO Verify uuid is unique, to prevent double-import.
-
         std::cout << "  "
                   << task.get ("uuid")
                   << " "
                   << task.get ("description")
                   << "\n";
         context.tdb2.add (task);
+        ++count;
       }
       else
         throw std::string ("Not a JSON object: ") + *line;
@@ -181,6 +181,8 @@ int CmdImport::execute (std::string& output)
   }
 
   context.tdb2.commit ();
+
+  context.footnote (format (STRING_CMD_IMPORT_SUMMARY, count));
   return rc;
 }
 

src/en-US.h

@@ -309,6 +309,7 @@
 #define STRING_CMD_DENO_FOUND        "Found annotation '{1}' and deleted it."
 #define STRING_CMD_DENO_NOMATCH      "Did not find any matching annotation to be deleted for '{1}'."
 #define STRING_CMD_IMPORT_USAGE      "Imports JSON files."
+#define STRING_CMD_IMPORT_SUMMARY    "Imported {1} tasks."
 
 // Config
 #define STRING_CONFIG_OVERNEST       "Configuration file nested to more than 10 levels deep - this has to be a mistake."

test/import.t

@@ -0,0 +1,112 @@
+#! /usr/bin/perl
+################################################################################
+## taskwarrior - a command line task list manager.
+##
+## Copyright 2006 - 2011, Paul Beckingham, Federico Hernandez.
+## All rights reserved.
+##
+## This program 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.
+##
+## This program 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 along with
+## this program; if not, write to the
+##
+##     Free Software Foundation, Inc.,
+##     51 Franklin Street, Fifth Floor,
+##     Boston, MA
+##     02110-1301
+##     USA
+##
+################################################################################
+
+use strict;
+use warnings;
+use Test::More tests => 13;
+
+# Create the rc file.
+if (open my $fh, '>', 'import.rc')
+{
+  print $fh "data.location=.\n";
+  close $fh;
+  ok (-r 'import.rc', 'Created import.rc');
+}
+
+# Create import file.
+if (open my $fh, '>', 'import.txt')
+{
+  print $fh <<EOF;
+{"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":"22222222-2222-2222-2222-222222222222","description":"two","status":"completed","entry":"1234524689","end":"1234524690"}
+EOF
+
+  close $fh;
+  ok (-r 'import.txt', 'Created sample import data');
+}
+
+my $output = qx{../src/task rc:import.rc import import.txt};
+like ($output, qr/Imported 3 tasks\./, 'no errors');
+# Imported 3 tasks successfully.
+
+$output = qx{../src/task rc:import.rc list};
+# ID Project Pri Due Active Age     Description
+# -- ------- --- --- ------ ------- -----------
+#  1 A                      1.5 yrs zero
+#  2 B                      1.5 yrs one
+# 
+# 2 tasks
+
+like   ($output, qr/1.+A.+zero/, 't1 present');
+like   ($output, qr/2.+B.+one/,  't2 present');
+unlike ($output, qr/3.+two/,     't3 missing');
+
+$output = qx{../src/task rc:import.rc completed};
+# Complete  Project Pri Age     Description
+# --------- ------- --- ------- -----------
+# 2/13/2009             1.5 yrs two
+# 
+# 1 task
+
+unlike ($output, qr/1.+A.+zero/,       't1 missing');
+unlike ($output, qr/2.+B.+one/,        't2 missing');
+like   ($output, qr/2\/13\/2009.+two/, 't3 present');
+
+# Make sure that a duplicate task cannot be imported.
+$output = qx{../src/task rc:import.rc import import.txt};
+like ($output, qr/Cannot add task because the uuid .+ is not unique\./, 'error on duplicate uuid');
+
+# Create import file.
+if (open my $fh, '>', 'import2.txt')
+{
+  print $fh <<EOF;
+{"uuid":"44444444-4444-4444-4444-444444444444","description":"three","status":"pending","entry":"1234567889"}
+EOF
+
+  close $fh;
+  ok (-r 'import2.txt', 'Created second sample import data');
+}
+
+$output = qx{../src/task rc:import.rc import import2.txt};
+like ($output, qr/Imported 1 tasks\./, 'no errors');
+# Imported 1 tasks successfully.
+
+# Cleanup.
+unlink qw(import.txt import2.txt pending.data completed.data undo.data backlog.data synch.key import.rc);
+ok (! -r 'import.txt'     &&
+    ! -r 'import2.txt'    &&
+    ! -r 'pending.data'   &&
+    ! -r 'completed.data' &&
+    ! -r 'undo.data'      &&
+    ! -r 'backlog.data'   &&
+    ! -r 'synch_key.data' &&
+    ! -r 'import.rc', 'Cleanup');
+
+exit 0;
+