=================================================================== RCS file: /cvs/todotxt/Text-Todo/lib/Text/Todo.pm,v retrieving revision 1.18 retrieving revision 1.27 diff -u -r1.18 -r1.27 --- todotxt/Text-Todo/lib/Text/Todo.pm 2010/01/18 00:19:55 1.18 +++ todotxt/Text-Todo/lib/Text/Todo.pm 2010/02/16 01:13:12 1.27 @@ -1,35 +1,55 @@ package Text::Todo; -# $AFresh1: Todo.pm,v 1.17 2010/01/12 20:09:02 andrew Exp $ +# $AFresh1: Todo.pm,v 1.26 2010/02/14 06:08:07 andrew Exp $ use warnings; use strict; use Carp; -use Class::Std; +use Class::Std::Utils; use Text::Todo::Entry; use File::Spec; -use version; our $VERSION = qv('0.0.1'); +use version; our $VERSION = qv('0.2.0'); { - my ( %path_of, %list_of, %loaded_of, ) : ATTR; - sub BUILD { - my ( $self, $ident, $options ) = @_; + my @attr_refs = \( + my %path_of, + my %list_of, + my %loaded_of, + my %known_tags_of, + ); + + sub new { + my ( $class, $options ) = @_; + + my $self = bless anon_scalar(), $class; + my $ident = ident($self); + $path_of{$ident} = { todo_dir => undef, todo_file => 'todo.txt', done_file => undef, }; + my %tags = ( + context => q{@}, + project => q{+}, + ); + if ($options) { if ( ref $options eq 'HASH' ) { foreach my $opt ( keys %{$options} ) { if ( exists $path_of{$ident}{$opt} ) { $self->_path_to( $opt, $options->{$opt} ); } + elsif ( $opt eq 'tags' + && ref $options->{$opt} eq 'HASH' ) + { + %tags = ( %tags, %{ $options->{$opt} } ); + } else { #carp "Invalid option [$opt]"; @@ -49,6 +69,8 @@ } } + $known_tags_of{$ident} = \%tags; + my $file = $self->_path_to('todo_file'); if ( defined $file && -e $file ) { $self->load(); @@ -128,6 +150,7 @@ $file = $self->file($file); if ( $list_of{$ident} = $self->listfile($file) ) { + $self->known_tags; $loaded_of{$ident} = $file; return 1; } @@ -154,7 +177,7 @@ open my $fh, '<', $file or croak "Couldn't open [$file]: $!"; while (<$fh>) { s/\r?\n$//xms; - push @list, Text::Todo::Entry->new({ text => $_ }); + push @list, Text::Todo::Entry->new($_); } close $fh or croak "Couldn't close [$file]: $!"; @@ -214,7 +237,11 @@ my $ident = ident($self); if ( !ref $entry ) { - $entry = Text::Todo::Entry->new({ text => $entry }); + $entry = Text::Todo::Entry->new( + { text => $entry, + tags => $known_tags_of{$ident}, + } + ); } elsif ( ref $entry ne 'Text::Todo::Entry' ) { croak( @@ -223,6 +250,8 @@ push @{ $list_of{$ident} }, $entry; + $self->known_tags; + return $entry; } @@ -281,6 +310,45 @@ return wantarray ? @tags : \@tags; } + sub learn_tag { + my ( $self, $tag, $sigal ) = @_; + + $known_tags_of{ ident $self}{$tag} = $sigal; + $self->known_tags; + + return 1; + } + + sub known_tags { + my ($self) = @_; + my $ident = ident($self); + + my @list = $self->list; + my %tags = %{ $known_tags_of{$ident} }; + + foreach my $e (@list) { + my $kt = $e->known_tags; + foreach my $t ( keys %{$kt} ) { + if ( !exists $tags{$t} ) { + $tags{$t} = $kt->{$t}; + } + } + } + + foreach my $e (@list) { + my $kt = $e->known_tags; + foreach my $t ( keys %tags ) { + if ( !exists $kt->{$t} || $tags{$t} ne $kt->{$t} ) { + $e->learn_tag( $t, $tags{$t} ); + } + } + } + + $known_tags_of{$ident} = \%tags; + + return $known_tags_of{$ident}; + } + sub archive { my ($self) = @_; my $ident = ident($self); @@ -376,6 +444,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 @@ -383,7 +462,7 @@ =head1 NAME -Text::Todo - Perl interface to todo_txt files +Text::Todo - Perl interface to todotxt files =head1 VERSION @@ -391,7 +470,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.18 2010/01/18 00:19:55 andrew Exp $ + $Id: Todo.pm,v 1.27 2010/02/16 01:13:12 andrew Exp $ =head1 SYNOPSIS @@ -422,7 +501,7 @@ =head1 INTERFACE -=head2 BUILD +=head2 new new({ [ todo_dir => 'directory', ] @@ -433,10 +512,15 @@ Allows you to set each item individually. todo_file defaults to todo.txt. - new({ todo_file => 'path/to/todo.txt'); + new('path/to/todo.txt'); Automatically sets todo_dir to 'path/to', todo_file to 'todo.txt' + new('path/to') + +If you pass an existing directory to new, it will set todo_dir. + + If you what you set matches (.*)todo(.*).txt it will automatically set done_file to $1done$2.txt and @@ -498,8 +582,18 @@ I think it may become depreciated unless there is demand. -=head2 listtag +=head2 known_tags +Returns a reference to a hash of the tags known to the list. + +=head2 learn_tag($tag, $sigal) + +Let the entire list learn a new tag. +If you are working with a list you should use this instead of +$entry->learn_tag because it will update all entries. + +=head2 listtag($tag) + Returns tags found in the list sorted by name. If there were projects +GarageSale and +Shopping then @@ -592,7 +686,7 @@ =head1 DEPENDENCIES -Class::Std +Class::Std::Utils File::Spec version