=================================================================== RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo/Entry.pm,v retrieving revision 1.6 retrieving revision 1.8 diff -u -r1.6 -r1.8 --- todotxt/Text-Todo/lib/Text/Todo/Entry.pm 2009/07/13 18:50:37 1.6 +++ todotxt/Text-Todo/lib/Text/Todo/Entry.pm 2010/01/08 04:50:41 1.8 @@ -1,6 +1,6 @@ package Text::Todo::Entry; -# $RedRiver: Entry.pm,v 1.5 2009/07/11 16:02:18 andrew Exp $ +# $RedRiver: Entry.pm,v 1.7 2009/07/13 18:05:50 andrew Exp $ use warnings; use strict; @@ -16,12 +16,20 @@ my %tags_of; my %priority_of; + my %completion_status_of; my %tags = ( context => q{@}, project => q{+}, ); + # XXX Should the completion (x) be case sensitive? + my $priority_completion_regex = qr/ + ^ \s* + (?i: (x) \s+)? + (?i:\( ([A-Z]) \) \s+)? + /xms; + for my $tag ( keys %tags ) { ## no critic strict no strict 'refs'; # Violates use strict, but allows code generation @@ -38,6 +46,18 @@ }; } + # Aliases + sub app { append(@_) } + sub change { _update_entry(@_) } + sub depri { _set_priority( @_, '' ) } + sub do { complete(@_) } + sub done { completed(@_) } + sub dp { depri(@_) } + sub p { priority(@_) } + sub prep { prepend(@_) } + sub pri { priority(@_) } + sub replace { _update_entry(@_) } + sub new { my ( $class, $text ) = @_; @@ -62,7 +82,8 @@ $tags_of{$ident}{$tag} = { map { $_ => q{} } $text =~ / (?:^|\s) $symbol (\S+)/gxms }; } - ( $priority_of{$ident} ) = $text =~ /^ \s* \( ([A-Z]) \)/ixms; + ( $completion_status_of{$ident}, $priority_of{$ident} ) + = $text =~ / $priority_completion_regex /xms; return 1; } @@ -87,40 +108,79 @@ return $text_of{$ident}; } + sub _set_priority { + my ( $self, $new_pri ) = @_; + my $ident = ident($self); + + if ( $new_pri !~ /^[a-zA-Z]?$/xms ) { + croak "Invalid priority [$new_pri]"; + } + + $priority_of{$ident} = $new_pri; + + return $self->prepend(); + } + sub priority { - my ($self) = @_; + my ( $self, $new_pri ) = @_; my $ident = ident($self); + if ($new_pri) { + return $self->_set_priority($new_pri); + } + return $priority_of{$ident}; } - sub change { - my ( $self, $text ) = @_; - return $self->_update_entry($text); + sub completed { + my ($self) = @_; + my $ident = ident($self); + + return $completion_status_of{$ident}; } sub prepend { my ( $self, $addition ) = @_; my $new = $self->text; + my @new; - if ( my $priority = $self->priority ) { - $new =~ s/^( \s* \( $priority \))/$1 $addition/xms; + $new =~ s/$priority_completion_regex//xms; + + if ( $self->completed ) { + push @new, $self->completed; } - else { - $new = join q{ }, $addition, $new; + + if ( $self->priority ) { + push @new, '(' . $self->priority . ')'; } - return $self->change($new); + if ( defined $addition && length $addition ) { + push @new, $addition; + } + + return $self->_update_entry( join q{ }, @new, $new ); } sub append { my ( $self, $addition ) = @_; - return $self->change( join q{ }, $self->text, $addition ); + return $self->_update_entry( join q{ }, $self->text, $addition ); } -} + sub complete { + my ($self) = @_; + my $ident = ident($self); + if ( $self->completed ) { + return 1; + } + + $completion_status_of{$ident} = 'x'; + + return $self->prepend(); + } + +} 1; # Magic true value required at end of module __END__ @@ -178,6 +238,10 @@ =head2 prepend =head2 append + +=head2 complete + +=head2 completed =head1 DIAGNOSTICS