=================================================================== RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo.pm,v retrieving revision 1.12 retrieving revision 1.14 diff -u -r1.12 -r1.14 --- todotxt/Text-Todo/lib/Text/Todo.pm 2010/01/10 04:08:59 1.12 +++ todotxt/Text-Todo/lib/Text/Todo.pm 2010/01/10 22:39:26 1.14 @@ -1,6 +1,6 @@ package Text::Todo; -# $RedRiver: Todo.pm,v 1.11 2010/01/10 01:01:45 andrew Exp $ +# $RedRiver: Todo.pm,v 1.13 2010/01/10 07:07:46 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]"; } } } @@ -197,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; } @@ -249,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 { @@ -286,8 +309,8 @@ last ENTRY; } } - elsif ($e->text eq q{}) { - if ($self->del($e)) { + elsif ( $e->text eq q{} ) { + if ( $self->del($e) ) { $changed++; } else { @@ -374,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.12 2010/01/10 04:08:59 andrew Exp $ + $Id: Todo.pm,v 1.14 2010/01/10 22:39:26 andrew Exp $ =head1 SYNOPSIS