Commands - import

- Migrated handleImport to CmdImport.

src/commands/CMakeLists.txt

@@ -23,6 +23,7 @@ set (commands_SRCS Command.cpp        Command.h
                    CmdHelp.cpp        CmdHelp.h
                    CmdHistory.cpp     CmdHistory.h
                    CmdIDs.cpp         CmdIDs.h
+                   CmdImport.cpp      CmdImport.h
                    CmdInfo.cpp        CmdInfo.h
                    CmdInstall.cpp     CmdInstall.h
                    CmdLog.cpp         CmdLog.h

src/commands/CmdHelp.cpp

@@ -123,26 +123,6 @@ int CmdHelp::execute (const std::string&, std::string& output)
   view.set (row, 1, "task calendar [due|month year|year]");
   view.set (row, 2, "Shows a calendar, with due tasks marked.");
 
-  row = view.addRow ();
-  view.set (row, 1, "task import");
-  view.set (row, 2, "Imports tasks from a variety of formats.");
-
-  row = view.addRow ();
-  view.set (row, 1, "task export");
-  view.set (row, 2, "Lists all tasks in CSV format.  Alias to export.csv");
-
-  row = view.addRow ();
-  view.set (row, 1, "task export.csv");
-  view.set (row, 2, "Lists all tasks in CSV format.");
-
-  row = view.addRow ();
-  view.set (row, 1, "task export.ical");
-  view.set (row, 2, "Lists all tasks in iCalendar format.");
-
-  row = view.addRow ();
-  view.set (row, 1, "task export.yaml");
-  view.set (row, 2, "Lists all tasks in YAML format.");
-
   row = view.addRow ();
   view.set (row, 1, "task merge URL");
   view.set (row, 2, "Merges the specified undo.data file with the local data files.");

src/commands/CmdImport.h

@@ -0,0 +1,67 @@
+////////////////////////////////////////////////////////////////////////////////
+// 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
+//
+////////////////////////////////////////////////////////////////////////////////
+#ifndef INCLUDED_CMDIMPORT
+#define INCLUDED_CMDIMPORT
+#define L10N                                           // Localization complete.
+
+#include <string>
+#include <Command.h>
+
+class CmdImport : public Command
+{
+public:
+  CmdImport ();
+  int execute (const std::string&, std::string&);
+
+private:
+  enum fileType
+  {
+    type_not_a_clue,
+    type_task_1_4_3,
+    type_task_1_5_0,
+    type_task_1_6_0,
+    type_task_cmd_line,
+    type_todo_sh_2_0,
+    type_csv,
+    type_yaml,
+    type_text
+  };
+
+  fileType determineFileType (const std::vector <std::string>&);
+  void decorateTask (Task&);
+  std::string task_1_4_3 (const std::vector <std::string>&);
+  std::string task_1_5_0 (const std::vector <std::string>&);
+  std::string task_1_6_0 (const std::vector <std::string>&);
+  std::string taskCmdLine (const std::vector <std::string>&);
+  std::string todoSh_2_0 (const std::vector <std::string>&);
+  std::string text (const std::vector <std::string>&);
+  std::string CSV (const std::vector <std::string>&);
+  std::string YAML (const std::vector <std::string>&);
+};
+
+#endif
+////////////////////////////////////////////////////////////////////////////////

src/commands/Command.cpp

@@ -45,6 +45,7 @@
 #include <CmdHelp.h>
 #include <CmdHistory.h>
 #include <CmdIDs.h>
+#include <CmdImport.h>
 #include <CmdInfo.h>
 #include <CmdInstall.h>
 #include <CmdLog.h>
@@ -98,6 +99,7 @@ void Command::factory (std::map <std::string, Command*>& all)
   c = new CmdHistoryMonthly ();     all[c->keyword ()] = c;
   c = new CmdHistoryAnnual ();      all[c->keyword ()] = c;
   c = new CmdIDs ();                all[c->keyword ()] = c;
+  c = new CmdImport ();             all[c->keyword ()] = c;
   c = new CmdInfo ();               all[c->keyword ()] = c;
   c = new CmdInstall ();            all[c->keyword ()] = c;
   c = new CmdLog ();                all[c->keyword ()] = c;