Add-ons: Exports

- Modified the export scripts to use the right command, which is now
  'export', not '_query', although '_query' is now an alias for backward
  compatibility.

scripts/add-ons/export-csv.pl

@@ -37,12 +37,11 @@ if ($@)
   exit 1;
 }
 
-
+# Use the taskwarrior 2.0+ export command to filter and return JSON
-# Use the taskwarrior 1.9.4+ _query command to issue a query and return JSON
+my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
-my $command = '/usr/local/bin/task _query ' . join (' ', @ARGV);
 if ($command =~ /No matches/)
 {
-  print stderr $command;
+  printf STDERR $command;
   exit 1;
 }
 

scripts/add-ons/export-html.pl

@@ -37,12 +37,11 @@ if ($@)
   exit 1;
 }
 
-
+# Use the taskwarrior 2.0+ export command to filter and return JSON
-# Use the taskwarrior 1.9.4+ _query command to issue a query and return JSON
+my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
-my $command = '/usr/local/bin/task _query ' . join (' ', @ARGV);
 if ($command =~ /No matches/)
 {
-  print stderr $command;
+  printf STDERR $command;
   exit 1;
 }
 

scripts/add-ons/export-ical.pl

@@ -37,12 +37,11 @@ if ($@)
   exit 1;
 }
 
-
+# Use the taskwarrior 2.0+ export command to filter and return JSON
-# Use the taskwarrior 1.9.4+ _query command to issue a query and return JSON
+my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
-my $command = '/usr/local/bin/task _query ' . join (' ', @ARGV);
 if ($command =~ /No matches/)
 {
-  print stderr $command;
+  printf STDERR $command;
   exit 1;
 }
 

scripts/add-ons/export-xml.pl

@@ -37,12 +37,11 @@ if ($@)
   exit 1;
 }
 
-
+# Use the taskwarrior 2.0+ export command to filter and return JSON
-# Use the taskwarrior 1.9.4+ _query command to issue a query and return JSON
+my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
-my $command = '/usr/local/bin/task _query ' . join (' ', @ARGV);
 if ($command =~ /No matches/)
 {
-  print stderr $command;
+  printf STDERR $command;
   exit 1;
 }
 

scripts/add-ons/export-xml.py

@@ -30,32 +30,32 @@ import sys
 import commands
 import json
 
-# Use the taskwarrior 1.9.4+ _query command to issue a query and return JSON
+# Use the taskwarrior 2.0+ export command to filter and return JSON
-command = "/usr/local/bin/task _query " + " ".join (sys.argv[1:])
+command = "/usr/local/bin/task export " + " ".join (sys.argv[1:])
 
 # Generate output.
 print "<tasks>"
 for task in commands.getoutput (command).split (",\n"):
     data = json.loads (task)
-    print ("  <task>")
+    print "  <task>"
     for name,value in data.items ():
         if name == "annotations":
-            print ("    <annotations>")
+            print "    <annotations>"
             for anno in value:
-                print ("      <annotation>")
+                print "      <annotation>"
                 for name,value in anno.items ():
-                    print ("        <{0}>{1}</{0}>".format (name, value))
+                    print "        <{0}>{1}</{0}>".format (name, value)
-                    print ("      </annotation>")
+                    print "      </annotation>"
-                    print ("    </annotations>")
+                    print "    </annotations>"
         elif name == "tags":
-            print ("    <tags>")
+            print "    <tags>"
             for tag in value:
-                print ("      <tag>{0}</tag>".format (tag))
+                print "      <tag>{0}</tag>".format (tag)
-                print ("    </tags>")
+                print "    </tags>"
         else:
-            print ("    <{0}>{1}</{0}>".format (name, value))
+            print "    <{0}>{1}</{0}>".format (name, value)
-    print ("  </task>")
+    print "  </task>"
-print ("</tasks>")
+print "</tasks>"
 sys.exit (0)
 
 ################################################################################

scripts/add-ons/export-xml.rb

@@ -29,8 +29,8 @@
 require 'rubygems'
 require 'json'
 
-# Use the taskwarrior 1.9.4+ _query command to issue a query and return JSON
+# Use the taskwarrior 2.0+ export command to filter and return JSON
-lines = IO.popen("/usr/local/bin/task _query " + ARGV.join(" ")).readlines
+lines = IO.popen("/usr/local/bin/task export " + ARGV.join(" ")).readlines
 
 # Generate output.
 print "<tasks>\n"

scripts/add-ons/export-yad.pl

@@ -0,0 +1,82 @@
+#! /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;
+
+# Give a nice error if the (non-standard) JSON module is not installed.
+eval "use JSON";
+if ($@)
+{
+  print "Error: You need to install the JSON Perl module.\n";
+  exit 1;
+}
+
+# Use the taskwarrior 2.0+ export command to filter and return JSON
+my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
+if ($command =~ /No matches/)
+{
+  printf STDERR $command;
+  exit 1;
+}
+
+# Generate output.
+print "'uuid','status','tags','entry','start','due','recur','end','project',",
+      "'priority','fg','bg','description'\n";
+
+for my $task (split /,$/ms, qx{$command})
+{
+  my $data = from_json ($task);
+
+  print "'$data->{'uuid'}',",
+        "'$data->{'status'}',",
+        "'", (exists $data->{'tags'} ? join (' ', @{$data->{'tags'}}) : ''), "',",
+        "'$data->{'entry'}',",
+        "'", ($data->{'start'}    || ''), "',",
+        "'", ($data->{'due'}      || ''), "',",
+        "'", ($data->{'recur'}    || ''), "',",
+        "'", ($data->{'end'}      || ''), "',",
+        "'", ($data->{'project'}  || ''), "',",
+        "'", ($data->{'priority'} || ''), "',",
+        "'", ($data->{'fg'}       || ''), "',",
+        "'", ($data->{'bg'}       || ''), "',",
+        "'$data->{'description'}'",
+        "\n";
+
+  # Note that this format ignores:
+  #   wait
+  #   until
+  #   annotations
+  #   mask
+  #   imask
+}
+
+exit 0;
+
+################################################################################
+

scripts/add-ons/export-yaml.pl

@@ -37,12 +37,11 @@ if ($@)
   exit 1;
 }
 
-
+# Use the taskwarrior 2.0+ export command to filter and return JSON
-# Use the taskwarrior 1.9.4+ _query command to issue a query and return JSON
+my $command = join (' ', ("env PATH=$ENV{PATH} task export", @ARGV));
-my $command = '/usr/local/bin/task _query ' . join (' ', @ARGV);
 if ($command =~ /No matches/)
 {
-  print stderr $command;
+  printf STDERR $command;
   exit 1;
 }
 
@@ -55,7 +54,7 @@ for my $task (split /,$/ms, qx{$command})
   my $data = from_json ($task);
 
   print "  task:\n";
-  for my $key (keys %$data)
+  for my $key (sort keys %$data)
   {
     if ($key eq 'annotations')
     {
@@ -63,17 +62,16 @@ for my $task (split /,$/ms, qx{$command})
       for my $anno (@{$data->{$key}})
       {
         print "      annotation:\n";
-        print "        $_:$anno->{$_}\n" for keys %$anno;
+        print "        $_: $anno->{$_}\n" for keys %$anno;
       }
     }
     elsif ($key eq 'tags')
     {
-      print "    tags:\n";
+      print "    tags: ", join (',', @{$data->{'tags'}}), "\n";
-      print "      tag:$_\n" for @{$data->{'tags'}};
     }
     else
     {
-      print "    $key:$data->{$key}\n";
+      print "    $key: $data->{$key}\n";
     }
   }
 }