more schema change/tagval fixes

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

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index ae8d7d7..0be7c45 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?
 }
@@ -67,6 +67,7 @@ sub dirents
     my @dents=();
     my $state=$self->state();
 #    print "DIRENTS: STATE: $state\n";
+#    print "DIRENTS: FILE: $self->{path}\n";
     if($state==$STATE_TAG || $state==$STATE_TAGVAL)
     {
        my $tag=$self->{elements}->[$#{$self->{elements}}];
@@ -79,13 +80,20 @@ sub dirents
        }
        else
        {
-           @dents=(qw(AND OR ALLTRACKS),
+           @dents=(qw(AND OR TRACKS NOARTIST),
                    $self->{db}->artists(@{$self->{elements}}));
        }
     }
     elsif($state==$STATE_BOOLEAN)
     {
-       @dents=("NOT", $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)
     {
@@ -93,7 +101,7 @@ sub dirents
     }
     elsif($state==$STATE_ALBUMS)
     {
-       @dents=("TRACKS", $self->{db}->albums(@{$self->{elements}}));
+       @dents=(qw(TRACKS NOALBUM),$self->{db}->albums(@{$self->{elements}}));
     }
     elsif($state==$STATE_TRACKLIST)
     {
@@ -135,6 +143,7 @@ sub parse
            }
            elsif($name eq "NOT")
            {
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
                $self->state($STATE_BOOLEAN);
            }
            else
@@ -160,7 +169,7 @@ sub parse
               ref($tag) eq "ID3FS::PathElement::Tag" &&
               $self->{db}->tag_has_values($tag->{id}))
            {
-               my $tagval=ID3FS::PathElement::Tagval->new($name);
+               my $tagval=ID3FS::PathElement::Tag->new($self->{db}, $name, $tag->{id});
                if(defined($tagval))
                {
                    $self->state($STATE_TAGVAL);
@@ -172,19 +181,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($self->{db}, $name));
            }
            elsif($name eq "OR")
            {
                $self->state($STATE_BOOLEAN);
-#              push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
            }
            else
            {
@@ -203,9 +216,18 @@ sub parse
        elsif($state==$STATE_BOOLEAN)
        {
 #          print "SM: BOOLEAN: $name\n";
-           if($name eq "NOT")
+           my $parent=$self->{elements}->[$#{$self->{elements}}];
+           my $allownot=1;
+           if(defined($parent) &&
+              ref($parent) eq "ID3FS::PathElement::Boolean" &&
+              $parent->{name} eq "NOT")
+           {
+               $allownot=0;
+           }
+           if($allownot && $name eq "NOT")
            {
                $self->state($STATE_BOOLEAN);
+               push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
            }
            else
            {
@@ -228,6 +250,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);
@@ -246,7 +272,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);