use ID3FS::PathElement::File;
use ID3FS::PathElement::Tag;
use ID3FS::PathElement::Tagval;
+use ID3FS::Path::Node;
our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
$STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
$STATE_FILE)=(0..7);
+our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
+
sub new
{
my $proto=shift;
my $self={};
bless($self,$class);
+ $self->{elements}=[];
$self->{db}=shift;
$self->{path}=shift;
$self->parse();
- print "STATE: ", $self->state(), "\n";
+# print "STATE: ", $self->state(), "\n";
return $self;
}
sub dest
{
- my($self)=@_;
+ my($self, $mountpoint)=@_;
if($self->state() == $STATE_FILE)
{
- return $self->{db}->filename(@{$self->{elements}});
+ return $self->{db}->filename($mountpoint, $self);
}
return "ERROR"; #should never happen?
}
my($self)=@_;
my @dents=();
my $state=$self->state();
- print "DIRENTS: STATE: $state\n";
+# print "DIRENTS: STATE: $state\n";
+# print "DIRENTS: FILE: $self->{path}\n";
if($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
my $tag=$self->{elements}->[$#{$self->{elements}}];
ref($tag) eq "ID3FS::PathElement::Tag" &&
$self->{db}->tag_has_values($tag->{id}))
{
- print "DIRENTS: TAG: TAGVALUES\n";
- @dents=$self->{db}->tag_values($tag->{id});
+ @dents=$self->{db}->tags($self);
}
else
{
- print "DIRENTS: TAG/TAGVAL($state): ARTISTS\n";
- @dents=(qw(AND ALLTRACKS), # FIXME: NOT and OR
- $self->{db}->artists(@{$self->{elements}}));
+ @dents=(qw(AND OR TRACKS NOARTIST),
+ $self->{db}->artists($self));
}
}
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));
}
elsif($state==$STATE_ROOT)
{
- @dents=("ALL", $self->{db}->tags(@{$self->{elements}}));
+ @dents=(qw(ALL NOT), $self->{db}->tags($self));
}
elsif($state==$STATE_ALBUMS)
{
- @dents=("TRACKS", $self->{db}->albums(@{$self->{elements}}));
+ @dents=(qw(TRACKS NOALBUM),$self->{db}->albums($self));
}
elsif($state==$STATE_TRACKLIST)
{
- @dents=$self->{db}->tracks(@{$self->{elements}});
+ @dents=$self->{db}->tracks($self);
}
else
{
my($self)=@_;
@{$self->{components}}=split(/\//, $self->{path});
shift @{$self->{components}}; # drop empty field before leading /
- print "PATH: $self->{path}\n";
-# print "COMPONENTS: ", join(' | ', @{$self->{components}}), "\n";
+# print "PATH: $self->{path}\n";
$self->state($STATE_ROOT);
return if($self->{path} eq "/");
my @parts=@{$self->{components}};
$self->{elements}=[];
while(my $name=shift @parts)
{
- print "NAME: $name\n";
+# print "NAME: $name\n";
my $state=$self->state();
if($state==$STATE_INVALID)
{
- print "SM: INVALID: $name\n";
+# print "SM: INVALID: $name\n";
return;
}
elsif($state==$STATE_ROOT)
{
- print "SM: ROOT: $name\n";
+# print "SM: ROOT: $name\n";
if($name eq "ALL")
{
$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);
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
- print "SM: TAG/TAGVAL($state): $name\n";
+# print "SM: TAG/TAGVAL($state): $name\n";
my $tag=$self->{elements}->[$#{$self->{elements}}];
if($state==$STATE_TAG &&
defined($tag) &&
ref($tag) eq "ID3FS::PathElement::Tag" &&
$self->{db}->tag_has_values($tag->{id}))
{
- my $tagval=ID3FS::PathElement::Tagval->new($name);
+# print "Parsing: parent: $tag->{id}\n";
+ 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)
+# print "SM: BOOLEAN: $name\n";
+ 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)
{
- print "SM: ALBUM: $name\n";
+# print "SM: ALBUM: $name\n";
if($name eq "TRACKS")
{
$self->state($STATE_TRACKLIST);
}
+ elsif($name eq "NOALBUM")
+ {
+ $self->state($STATE_TRACKLIST);
+ }
else
{
my $album=ID3FS::PathElement::Album->new($self->{db}, $name);
}
elsif($state==$STATE_TRACKLIST)
{
- print "SM: TRACKLIST: $name\n";
+# print "SM: TRACKLIST: $name\n";
my $track=ID3FS::PathElement::File->new($self->{db}, $name);
- push(@{$self->{elements}}, $track);
if($track)
{
push(@{$self->{elements}}, $track);
}
elsif($state==$STATE_FILE)
{
- print "SM: FILE: $name\n";
+# print "SM: FILE: $name\n";
# Can't have anything after a filename
$self->state($STATE_INVALID);
}
$self->state($STATE_INVALID);
}
}
+ # remove trailing boolean
+ if(@{$self->{elements}} &&
+ ref($self->{elements}->[$#{$self->{elements}}]) eq "ID3FS::PathElement::Boolean")
+ {
+ $self->{lastop}=pop @{$self->{elements}};
+ }
+ # sort elements by precedence
+ @{$self->{elements}}=$self->sort_elements(@{$self->{elements}});
+ $self->{tagtree}=$self->elements_to_tree([ @{$self->{elements}} ]);
+ if($self->{tagtree})
+ {
+ ($self->{sqlconditions},
+ $self->{andsneeded}) = $self->{tagtree}->to_sql();
+# print("SQL CONDITION(", $self->{andsneeded}, "): ",
+# $self->{sqlconditions}, "\n");
+# use Data::Dumper;
+# print Dumper $self->{tagtree};
+ }
}
sub state
return $self->{state};
}
+sub elements_to_tree
+{
+ my($self, $elements)=@_;
+ return undef unless(@$elements);
+ my ($left, $right, $op)=(undef, undef, undef);
+ my $thing=pop @$elements;
+ if(ref($thing) eq "ID3FS::PathElement::Boolean")
+ {
+ my $op=$thing;
+ $right=$self->elements_to_tree($elements);
+ if($op->{name} ne "NOT")
+ {
+ $left=$self->elements_to_tree($elements);
+ }
+ return ID3FS::Path::Node->new($left, $op, $right);
+ }
+ else
+ {
+ return ID3FS::Path::Node->new($thing);
+ }
+}
+
+# Dijkstra's shunting-yard algorithm
+sub sort_elements
+{
+ my ($self, @input)=@_;
+ my @opstack=();
+ my @output=();
+# print "INPUT: ", join(', ', map { $_->{name}; } @input), "\n";
+ while(my $thing = shift @input)
+ {
+ if(ref($thing) eq "ID3FS::PathElement::Tag")
+ {
+# print "Pushing $thing->{name} to output\n";
+ push(@output, $thing);
+# print "OPSTACK: ", join(', ', map { $_->{name}; } @opstack), "\n";
+# print "OUTPUT: ", join(', ', map { $_->{name}; } @output), "\n";
+ }
+ elsif(ref($thing) eq "ID3FS::PathElement::Boolean")
+ {
+# print "BOOL: $thing->{name}\n";
+ # bool
+# print "thing: $thing->{name}: $priorities{$thing->{name}} ";
+ if(@opstack)
+ {
+# print("topop: ", $opstack[$#opstack]->{name},
+# ": ", $priorities{$opstack[$#opstack]->{name}}, "\n");
+ }
+ while(@opstack &&
+ ($priorities{$thing->{name}} <= $priorities{$opstack[$#opstack]->{name}}))
+ {
+# print "Pushing ", $opstack[$#opstack]->{name}, " from opstack to output\n";
+ push(@output, pop(@opstack));
+# print "OPSTACK: ", join(', ', map { $_->{name}; } @opstack), "\n";
+# print "OUTPUT: ", join(', ', map { $_->{name}; } @output), "\n";
+ }
+# print "Pushing $thing->{name} to opstack\n";
+ push(@opstack, $thing);
+# print "OPSTACK: ", join(', ', map { $_->{name}; } @opstack), "\n";
+# print "OUTPUT: ", join(', ', map { $_->{name}; } @output), "\n";
+ }
+ }
+ while(@opstack)
+ {
+ push(@output, pop(@opstack));
+ }
+# print "STACK: ", join(', ', map { $_->{name}; } @output), "\n";
+ return @output;
+}
+
+sub used_tags
+{
+ my($self)=@_;
+ print "TAGTREE UNDEF\n" unless(defined($self->{tagtree}));
+ return undef unless(defined($self->{tagtree}));
+ return($self->{tagtree}->used_tags());
+}
+
+sub tag_has_values
+{
+ my($self)=@_;
+ my $tail=$self->{elements}->[$#{$self->{elements}}];
+ if($tail && ref($tail) eq "ID3FS::PathElement::Tag")
+ {
+ return($self->{db}->tag_has_values($tail->{id}));
+ }
+}
+
+sub trailing_tag_id
+{
+ my($self)=@_;
+ my $tail=$self->{elements}->[$#{$self->{elements}}];
+ if($tail && ref($tail) eq "ID3FS::PathElement::Tag")
+ {
+ return($tail->{id});
+ }
+ return undef;
+}
+
1;
projects / id3fs.git / blobdiff