abstract out tags_subselect

[id3fs.git] / lib / ID3FS / Path.pm

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 7107ac7..25e4092 100644 (file)
--- a/lib/ID3FS/Path.pm
+++ b/lib/ID3FS/Path.pm
@@ -53,10 +53,10 @@ sub isvalid
 
 sub dest
 {
-    my($self)=@_;
+    my($self, $mountpoint)=@_;
     if($self->state() == $STATE_FILE)
     {
-       return $self->{db}->filename(@{$self->{elements}});
+       return $self->{db}->filename($mountpoint, @{$self->{elements}});
     }
     return "ERROR"; #should never happen?
 }
@@ -79,21 +79,28 @@ sub dirents
        }
        else
        {
-           @dents=(qw(AND ALLTRACKS), # FIXME: NOT and OR
+           @dents=(qw(AND OR TRACKS NOARTIST),
                    $self->{db}->artists(@{$self->{elements}}));
        }
     }
     elsif($state==$STATE_BOOLEAN)
     {
-       @dents=$self->{db}->tags(@{$self->{elements}});
+       my $parent=$self->{elements}->[$#{$self->{elements}}];
+       unless(defined($parent) &&
+              ref($parent) eq "ID3FS::PathElement::Boolean" &&
+              $parent->{name} eq "NOT")
+       {
+           push(@dents, "NOT");
+       }
+       push(@dents, $self->{db}->tags(@{$self->{elements}}));
     }
     elsif($state==$STATE_ROOT)
     {
-       @dents=("ALL", $self->{db}->tags(@{$self->{elements}}));
+       @dents=(qw(ALL NOT), $self->{db}->tags(@{$self->{elements}}));
     }
     elsif($state==$STATE_ALBUMS)
     {
-       @dents=("TRACKS", $self->{db}->albums(@{$self->{elements}}));
+       @dents=(qw(TRACKS NOALBUM),$self->{db}->albums(@{$self->{elements}}));
     }
     elsif($state==$STATE_TRACKLIST)
     {
@@ -133,6 +140,11 @@ sub parse
            {
                $self->state($STATE_TAG);
            }
+           elsif($name eq "NOT")
+           {
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+               $self->state($STATE_BOOLEAN);
+           }
            else
            {
                $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
@@ -168,24 +180,23 @@ sub parse
                    $self->state($STATE_INVALID);
                }
            }
-           elsif($name eq "ALLTRACKS")
+           elsif($name eq "TRACKS")
+           {
+               $self->state($STATE_TRACKLIST);
+           }
+           elsif($name eq "NOARTIST")
            {
                $self->state($STATE_TRACKLIST);
            }
            elsif($name eq "AND")
            {
                $self->state($STATE_BOOLEAN);
-#              push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
            }
            elsif($name eq "OR")
            {
                $self->state($STATE_BOOLEAN);
-#              push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
-           }
-           elsif($name eq "NOT")
-           {
-               $self->state($STATE_TAG);
-#              push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
            }
            else
            {
@@ -204,15 +215,31 @@ sub parse
        elsif($state==$STATE_BOOLEAN)
        {
 #          print "SM: BOOLEAN: $name\n";
-           my $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
-           if($tag)
+           my $parent=$self->{elements}->[$#{$self->{elements}}];
+           my $allownot=1;
+           if(defined($parent) &&
+              ref($parent) eq "ID3FS::PathElement::Boolean" &&
+              $parent->{name} eq "NOT")
            {
-               push(@{$self->{elements}}, $tag);
-               $self->state($STATE_TAG);
-               }
+               $allownot=0;
+           }
+           if($allownot && $name eq "NOT")
+           {
+               $self->state($STATE_BOOLEAN);
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+           }
            else
            {
-               $self->state($STATE_INVALID);
+               my $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
+               if($tag)
+               {
+                   push(@{$self->{elements}}, $tag);
+                   $self->state($STATE_TAG);
+               }
+               else
+               {
+                   $self->state($STATE_INVALID);
+               }
            }
        }
        elsif($state==$STATE_ALBUMS)
@@ -222,6 +249,10 @@ sub parse
            {
                $self->state($STATE_TRACKLIST);
            }
+           elsif($name eq "NOALBUM")
+           {
+               $self->state($STATE_TRACKLIST);
+           }
            else
            {
                my $album=ID3FS::PathElement::Album->new($self->{db}, $name);
@@ -240,7 +271,6 @@ sub parse
        {
 #          print "SM: TRACKLIST: $name\n";
            my $track=ID3FS::PathElement::File->new($self->{db}, $name);
-           push(@{$self->{elements}}, $track);
            if($track)
            {
                push(@{$self->{elements}}, $track);