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?
}
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}}];
}
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)
{
{
$self->state($STATE_TAG);
}
+ elsif($name eq "NOT")
+ {
+ push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
+ $self->state($STATE_BOOLEAN);
+ }
else
{
$tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
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);
$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));
- }
- elsif($name eq "NOT")
- {
- $self->state($STATE_TAG);
-# push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($name));
+ push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
}
else
{
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($self->{db}, $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)
{
$self->state($STATE_TRACKLIST);
}
+ elsif($name eq "NOALBUM")
+ {
+ $self->state($STATE_TRACKLIST);
+ }
else
{
my $album=ID3FS::PathElement::Album->new($self->{db}, $name);
{
# print "SM: TRACKLIST: $name\n";
my $track=ID3FS::PathElement::File->new($self->{db}, $name);
- push(@{$self->{elements}}, $track);
if($track)
{
push(@{$self->{elements}}, $track);