relativise symbolic links

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

diff --git a/lib/ID3FS/Path.pm b/lib/ID3FS/Path.pm
index 09ab418..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?
 }
@@ -85,7 +85,14 @@ sub dirents
     }
     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)
     {
@@ -208,9 +215,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($name));
            }
            else
            {
@@ -255,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);