added regex to sh/files

[spider.git] / cmd / directory.pl

diff --git a/cmd/directory.pl b/cmd/directory.pl
index d1b91ffa4c23c956756ba2853dd0fefb59f2363d..1581041cb4ce5d6d6149fdcc9457c2462731b396 100644 (file)
--- a/cmd/directory.pl
+++ b/cmd/directory.pl
@@ -8,15 +8,74 @@
 
 my ($self, $line) = @_;
 my @f = split /\s+/, $line;
-my @ref = DXMsg::get_all();
+my @ref;
 my $ref;
 my @out;
+my $f;
+my $n = 10;
 
-foreach $ref (@ref) {
-  next if $self->priv < 5 && $ref->private && $ref->to ne $self->call;
-  push @out, sprintf "%6d %s%s%5d %8.8s %8.8s %-6.6s %5.5s %-30.30s", 
-    $ref->msgno, $ref->private ? 'p' : ' ', $ref->read ? '-' : ' ', $ref->size,
-       $ref->to, $ref->from, cldate($ref->t), ztime($ref->t), $ref->subject;
+if (!@f) {
+       my @all = (DXMsg::get_all());
+       my ($i, $count);
+       for ($i = $#all; $i > 0; $i--) {
+               $ref = $all[$i];
+               next if $self->priv < 5 && $ref->private && $ref->to ne $self->call && $ref->from ne $self->call;
+               unshift @ref, $ref;
+               last if ++$count >= $n;
+       }
 }
 
+while (@f) {
+       $f = uc shift @f;
+       if ($f eq 'ALL') {
+               foreach $ref (DXMsg::get_all()) { 
+                       next if $self->priv < 5 && $ref->private && $ref->to ne $self->call && $ref->from ne $self->call;
+                       push @ref, $ref;
+               }
+               last;
+       } elsif ($f =~ /^O/o) {         # dir/own
+               foreach $ref (DXMsg::get_all()) { 
+                       push @ref, $ref if $ref->private && ($ref->to eq $self->call || $ref->from eq $self->call);
+               }
+       } elsif ($f =~ /^N/o) {         # dir/new
+               foreach $ref (DXMsg::get_all()) { 
+                       push @ref, $ref if $ref->private && !$ref->read && $ref->to eq $self->call;
+               }
+       } elsif ($f eq '>' || $f eq 'TO'){
+               $f = uc shift @f;
+               if ($f) {
+                       $f = shellregex($f);
+                       foreach $ref (DXMsg::get_all()) { 
+                               next if $self->priv < 5 && $ref->private && $ref->to ne $self->call && $ref->from ne $self->call;
+                               next unless $ref->to =~ m{$f};
+                               push @ref, $ref;
+                       }
+               }
+       } elsif ($f eq '<' || $f eq 'FROM'){
+               $f = uc shift @f;
+               if ($f) {
+                       $f = shellregex($f);
+                       foreach $ref (DXMsg::get_all()) { 
+                               next if $self->priv < 5 && $ref->private && $ref->to ne $self->call && $ref->from ne $self->call;
+                               next unless $ref->from =~ m{$f};
+                               push @ref, $ref;
+                       }
+               }
+       } elsif ($f =~ /^\d+$/ && $f > 0) {             # a number of items
+               $n = $f;
+       }
+}
+
+if (@ref) {
+       my $i = @ref - $n;
+       $i = 0 unless $i > 0;
+       my $count;
+       while ($i < @ref) {
+               $ref = $ref[$i++];
+               push @out, $ref->dir;
+               last if ++$count >= $n;
+       }
+} else {
+       push @out, $self->msg('e3', 'directory', $line); 
+}
 return (1, @out);