=================================================================== RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo.pm,v retrieving revision 1.10 retrieving revision 1.23 diff -u -r1.10 -r1.23 --- todotxt/Text-Todo/lib/Text/Todo.pm 2010/01/09 20:41:45 1.10 +++ todotxt/Text-Todo/lib/Text/Todo.pm 2010/01/22 01:30:45 1.23 @@ -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.22 2010/01/19 18:53:36 andrew Exp $ use warnings; use strict; @@ -10,14 +10,17 @@ use Text::Todo::Entry; use File::Spec; -use version; our $VERSION = qv('0.0.1'); +use version; our $VERSION = qv('0.1.1'); { - my %path_of; - my %list_of; - my %loaded_of; + my @attr_refs = \( + my %path_of, + my %list_of, + my %loaded_of, + ); + sub new { my ( $class, $options ) = @_; @@ -25,10 +28,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 +40,8 @@ $self->_path_to( $opt, $options->{$opt} ); } else { - carp "Invalid option [$opt]"; + + #carp "Invalid option [$opt]"; } } } @@ -160,7 +163,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 +200,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 +263,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 %available_projects; + my $accessor = $tag . 's'; + + 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 +301,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 { @@ -351,6 +385,17 @@ croak "Invalid entry [$entry]!"; } + + sub DESTROY { + my ($self) = @_; + my $ident = ident $self; + + foreach my $attr_ref (@attr_refs) { + delete $attr_ref->{$ident}; + } + + return; + } } 1; # Magic true value required at end of module @@ -366,7 +411,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.23 2010/01/22 01:30:45 andrew Exp $ =head1 SYNOPSIS @@ -439,6 +484,7 @@ then, $todo_file eq 'todo/todo.txt' =head2 load +- Reads a list from a file into the current object. Allows you to load a different file into the object. @@ -447,36 +493,54 @@ This effects the other functions that act on the list. =head2 save +- Writes the list to disk. $todo->save(['new/path/to/todo']); -Writes the list to the file. Either the current working file or something +Either writes the current working file or the passed in argument that can be recognized by file(). If you specify a filename it will save to that file and update the paths. Additional changes to the object work on that file. =head2 list +- get the curently loaded list my @todo_list = $todo->list; +In list context returns a list, it scalar context returns an array reference to the list. + =head2 listpri +- get the list items that are marked priority Like list, but only returns entries that have priority set. my @priority_list = $todo->listpri; -=head2 listproj +Since this is so easy to write as: -Returns projects in the list sorted by name. -If there were projects +GarageSale and +Shopping + my @priority_list = grep { $_->priority } $todo->list; - my @projects = $todo->listproj; +I think it may become depreciated unless there is demand. +=head2 listtag + +Returns tags found in the list sorted by name. + +If there were projects +GarageSale and +Shopping then + + my @projects = $todo->listtag('project'); + is the same as @projects = ( 'GarageSale', 'Shopping' ); +=head2 listcon +- Shortcut to listtag('context') + +=head2 listproj +- Shortcut to listtag('project') + =head2 add Adds a new entry to the list. @@ -566,6 +630,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, or through the web interface at