===================================================================
RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo.pm,v
retrieving revision 1.10
retrieving revision 1.15
diff -u -r1.10 -r1.15
--- todotxt/Text-Todo/lib/Text/Todo.pm	2010/01/09 20:41:45	1.10
+++ todotxt/Text-Todo/lib/Text/Todo.pm	2010/01/11 19:52:06	1.15
@@ -1,6 +1,6 @@
 package Text::Todo;
 
-# $RedRiver: Todo.pm,v 1.9 2010/01/09 06:54:15 andrew Exp $
+# $AFresh1: Todo.pm,v 1.14 2010/01/10 22:39:26 andrew Exp $
 
 use warnings;
 use strict;
@@ -25,10 +25,9 @@
         my $ident = ident($self);
 
         $path_of{$ident} = {
-            todo_dir    => undef,
-            todo_file   => 'todo.txt',
-            done_file   => undef,
-            report_file => undef,
+            todo_dir  => undef,
+            todo_file => 'todo.txt',
+            done_file => undef,
         };
 
         if ($options) {
@@ -38,7 +37,8 @@
                         $self->_path_to( $opt, $options->{$opt} );
                     }
                     else {
-                        carp "Invalid option [$opt]";
+
+                        #carp "Invalid option [$opt]";
                     }
                 }
             }
@@ -160,7 +160,6 @@
         open my $fh, '<', $file or croak "Couldn't open [$file]: $!";
         while (<$fh>) {
             s/\r?\n$//xms;
-            next if !length $_;
             push @list, Text::Todo::Entry->new($_);
         }
         close $fh or croak "Couldn't close [$file]: $!";
@@ -198,9 +197,20 @@
     }
 
     sub listpri {
-        my ($self) = @_;
+        my ( $self, $pri ) = @_;
 
-        my @list = grep { $_->priority } $self->list;
+        my @list;
+        if ($pri) {
+            $pri = uc $pri;
+            if ( $pri !~ /^[A-Z]$/xms ) {
+                croak "PRIORITY must a single letter from A to Z.";
+            }
+            @list = grep { defined $_->priority && $_->priority eq $pri }
+                $self->list;
+        }
+        else {
+            @list = grep { $_->priority } $self->list;
+        }
 
         return wantarray ? @list : \@list;
     }
@@ -250,19 +260,31 @@
     }
 
     sub listproj {
-        my ( $self, $entry, $dst ) = @_;
+        my ( $self ) = @_;
+        return $self->listtag('project');
+    }
+
+    sub listcon {
+        my ( $self ) = @_;
+        return $self->listtag('context');
+    }
+
+    sub listtag {
+        my ( $self, $tag ) = @_;
         my $ident = ident($self);
+        
+        my $accessor = $tag . 's';
 
-        my %available_projects;
+        my %available;
         foreach my $e ( $self->list ) {
-            foreach my $p ( $e->projects ) {
-                $available_projects{$p} = 1;
+            foreach my $p ( $e->$accessor ) {
+                $available{$p} = 1;
             }
         }
 
-        my @projects = sort keys %available_projects;
+        my @tags = sort keys %available;
 
-        return wantarray ? @projects : \@projects;
+        return wantarray ? @tags: \@tags;
     }
 
     sub archive {
@@ -276,24 +298,33 @@
             return;
         }
 
-        my $archived = 0;
+        my $changed = 0;
     ENTRY: foreach my $e ( $self->list ) {
             if ( $e->done ) {
                 if ( $self->addto( 'done_file', $e ) && $self->del($e) ) {
-                    $archived++;
+                    $changed++;
                 }
                 else {
                     carp q{Couldn't archive entry [} . $e->text . ']';
                     last ENTRY;
                 }
             }
+            elsif ( $e->text eq q{} ) {
+                if ( $self->del($e) ) {
+                    $changed++;
+                }
+                else {
+                    carp q{Couldn't delete blank entry};
+                    last ENTRY;
+                }
+            }
         }
 
-        if ($archived) {
+        if ($changed) {
             $self->save;
         }
 
-        return $archived;
+        return $changed;
     }
 
     sub addto {
@@ -366,7 +397,7 @@
 Since the $VERSION can't be automatically included, 
 here is the RCS Id instead, you'll have to look up $VERSION.
 
-    $Id: Todo.pm,v 1.10 2010/01/09 20:41:45 andrew Exp $
+    $Id: Todo.pm,v 1.15 2010/01/11 19:52:06 andrew Exp $
 
 =head1 SYNOPSIS
 
@@ -566,6 +597,10 @@
 =head1 BUGS AND LIMITATIONS
 
 No bugs have been reported.
+
+Limitations:
+
+Currently there isn't an easy way to print out line numbers with the entry. 
 
 Please report any bugs or feature requests to
 C<bug-text-todo@rt.cpan.org>, or through the web interface at