use warnings;
use ID3FS::Path::Node;
-our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
- $STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
- $STATE_FILE, $STATE_ALL)=(0..8);
+our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_BOOLEAN,
+ $STATE_ALBUMS, $STATE_TRACKLIST, $STATE_FILE, $STATE_ALL)=(0..7);
+# operator precedence
our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
our $PATH_ALLTRACKS= "TRACKS";
our $PATH_NOARTIST = "NOARTIST";
our $PATH_NOALBUM = "NOALBUM";
-our $ENABLE_FILTER = 1;
+our $ENABLE_FILTER = 0;
sub new
{
{
@dents=($self->filter($PATH_ALLTRACKS, $PATH_NOARTIST), $self->artists());
}
- elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+ elsif($state==$STATE_TAG)
{
my $tail=$self->tail();
- if($state==$STATE_TAG && $self->is($TYPE_TAG, $tail) &&
- $self->{db}->tag_has_values($tail->id()))
+ if($self->is($TYPE_TAG, $tail) && $self->{db}->tag_has_values($tail->id()))
{
@dents=$self->tags();
}
elsif($state==$STATE_BOOLEAN)
{
my $parent=$self->tail();
- unless($self->is($TYPE_BOOL, $parent) &&
- $parent->{name} eq "NOT")
+ unless($self->is($TYPE_BOOL, $parent) && $parent->{name} eq "NOT")
{
@dents=("NOT");
}
}
else
{
- print "DIRENTS: UNHANDLED STATE: $state\n";
+ print "id3fsd: INTERNAL ERROR: DIRENTS: UNHANDLED STATE: $state\n";
}
return(\@dents, \@fents);
}
sub parse
{
my($self)=@_;
+ $self->state($STATE_ROOT);
+ return if($self->{path} eq "/");
@{$self->{components}}=split(/\//, $self->{path});
shift @{$self->{components}}; # drop empty field before leading /
# print "PATH: $self->{path}\n";
- $self->state($STATE_ROOT);
- return if($self->{path} eq "/");
my @parts=@{$self->{components}};
my($tag, $tagval);
$self->{elements}=[];
}
}
}
- elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+ elsif($state==$STATE_TAG)
{
my $tag=$self->tail();
# print "SM: TAG/TAGVAL($state): $name\n";
- if($state==$STATE_TAG && $self->is($TYPE_TAG, $tag) &&
- $self->{db}->tag_has_values($tag->id()))
+ if($self->is($TYPE_TAG, $tag) && $self->{db}->tag_has_values($tag->id()))
{
# print "Parsing: parent: $tag->id()\n";
my $tagval=ID3FS::Path::Node->new($self->{db}, $TYPE_TAG, $name, $tag->id());
if(defined($tagval))
{
- $self->state($STATE_TAGVAL);
# stay in tag state
push(@{$self->{elements}}, $tagval);
}
}
}
- # remove trailing boolean
my @elements=@{$self->{elements}};
+ # remove trailing boolean
while(@elements && $self->is($TYPE_BOOL, $elements[$#elements]))
{
pop @elements;
}
+# print "\nELEMENTS: ", join(' ', map { $_->name(); } @elements), "\n";
+ my @joins=$self->number_joins(@elements);
+ @joins=qw(INNER) unless(@joins);
+ $self->{joins}=\@joins;
+# print "AFTER: ", join(' ', map { $_->name() . "(" . $_->{table} . ")"; } @elements), "\n";
+# print "JOINS: ", join(', ', @joins), "\n";
# sort elements by precedence
@elements=$self->sort_elements(@elements);
$self->{tagtree}=$self->elements_to_tree(\@elements);
- if($self->{tagtree})
- {
-# use Data::Dumper;
-# print "TREE\n";
-# print Dumper $self->{tagtree};
-# my ($conditions, @joins)=$self->{tagtree}->to_sql();
-# print "CONDITIONS(", scalar(@joins), "): ", $conditions, "\n";
+}
+
+sub number_joins
+{
+ my($self, @elements)=@_;
+ my @joins=("INNER");
+ my $table=1;
+ my $nextjoin=undef;
+ my $lastop=undef;
+ return (@joins) unless(@elements);
+ while(my $thing=shift @elements)
+ {
+ if($thing->type() == $TYPE_BOOL)
+ {
+ my $op=$thing->name();
+ if($op eq "AND")
+ {
+ $nextjoin="INNER";
+ }
+ elsif($op eq "NOT")
+ {
+ $nextjoin="LEFT";
+ }
+ elsif($op eq "OR")
+ {
+ # NOT/foo/OR needs an extra join
+ $nextjoin="INNER" if($lastop && $lastop eq "NOT");
+ }
+ $lastop=$op;
+ }
+ else
+ {
+ if(@elements)
+ {
+ # if tag has a value, eat the tag, shifting to the value
+ $thing=shift(@elements) if($elements[0]->type() == $TYPE_TAG);
+ }
+ elsif($self->{db}->tag_has_values($thing->id()))
+ {
+ # if the expression ends in a tag that has a value
+ # (ie we have the tag and want the value)
+ # use an INNER join even if we were in a NOT
+ $nextjoin="INNER" if($nextjoin);
+ }
+ if($nextjoin)
+ {
+ $table++;
+ push(@joins, $nextjoin);
+ $nextjoin=undef;
+ }
+ $thing->table($table);
+ }
}
+ return @joins;
}
sub state
return $self->{state};
}
+# link up precedence-sorted list into a binary tree
sub elements_to_tree
{
my($self, $elements)=@_;
my ($self, @input)=@_;
my @opstack=();
my @output=();
-# print "INPUT: ", join(', ', map { $_->{name}; } @input), "\n";
while(my $thing = shift @input)
{
if($self->is($TYPE_TAG, $thing))
}
elsif($self->is($TYPE_BOOL, $thing))
{
- # bool
while(@opstack &&
($priorities{$thing->{name}} <= $priorities{$opstack[$#opstack]->{name}}))
{
{
push(@output, pop(@opstack));
}
-# print "STACK: ", join(', ', map { $_->{name}; } @output), "\n";
return @output;
}
return($self->{db}->cmd_firstcol($sql));
}
my $hasvals=$self->expecting_values();
- my $parent=$self->trailing_tag_parent();
-# print "THASVALS: $hasvals\n";
-# print "TPARENT: ", (defined($parent)? $parent : "NO"), "\n";
- my @ids=();
my $sql="SELECT tags.name FROM ";
- if($self->in_or())
+ if($self->want_all_tags())
{
$sql .= "files_x_tags\n";
}
my $id=$self->trailing_tag_id();
my $parentclause= "tags.parents_id='";
- if($hasvals)
- {
- $parentclause .= $id;
- }
- elsif($parent)
- {
- $parentclause .= $parent;
- }
+ $parentclause .= $id if($hasvals);
$parentclause .= "'";
push(@andclauses, $parentclause);
my $sql="SELECT DISTINCT name FROM artists WHERE name!='';";
return($self->{db}->cmd_firstcol($sql));
}
- my @ids=();
my $sql=$self->sql_start("artists.name");
$sql .= ("INNER JOIN artists ON files.artists_id=artists.id\n" .
"WHERE artists.name != ''\n" .
sub albums
{
my($self)=@_;
- my @ids=();
my $tail=$self->tail();
if($self->is($TYPE_ARTIST, $tail))
{
"GROUP BY paths.name, files.name");
print "FILENAME SQL: $sql\n" if($self->{verbose});
my ($path, $name)=$self->{db}->cmd_onerow($sql, $id);
- my $id3fs_path=join('/', map { $_->{name}; } @{$self->{elements}});
return($self->{db}->relativise($path, $name, $mountpoint, $self->{path}));
}
# should never happen
my($self)=@_;
my $hasvals=$self->expecting_values();
my $tree=$self->{tagtree};
- my $parent=$self->trailing_tag_parent();
-
- my $tag=undef;
- if($hasvals)
- {
- $tag=$self->trailing_tag_id();
-# print "Trailing id: $tag\n";
- }
- my ($sqlclause, @joins)=(undef, ());
- ($sqlclause, @joins) = $tree->to_sql($hasvals) if($tree);
-# print "SQL(" . scalar(@joins) ."): $sqlclause\n";
+# use Data::Dumper;
+# print Dumper $tree;
+ my ($sqlclause, @joins)=$tree->to_sql($hasvals) if($tree);
my $sql="\tSELECT fxt1.files_id FROM tags t1";
my @crosses=();
my @inners=();
-# $joinsneeded++ if($tag);
+ @joins=@{$self->{joins}};
for(my $i=0; $i <= $#joins; $i++)
{
my $cnt=$i+1;
$sql .= ("\n\t" . join(" ", @crosses)) if(@crosses);
$sql .= ("\n" . join("\n", @inners)) if(@inners);
$sql .= "\n\tWHERE $sqlclause" if($sqlclause);
-# if($tag)
-# {
-# $sql .= " AND t${joinsneeded}.parents_id='$tag'";
-# }
$sql .= "\n\tGROUP BY fxt1.files_id\n";
return $sql;
}
my @outdirs=();
for my $dir (@dirs)
{
-# print "\nFILTER (",$self->state(), "): $base / $dir\n";
- if($self->empty("$base/$dir"))
- {
-# print "empty: $base / $dir\n";
- }
- else
- {
-# print "non-empty, accepting: $base / $dir\n";
- push(@outdirs, $dir);
- }
+ push(@outdirs, $dir) unless($self->empty("$base/$dir"));
}
return(@outdirs);
}
return 1;
}
-# if path is .../OR/ or .../OR/NOT
-sub in_or
+# if path is .../OR/ or .../OR/NOT or .../AND/NOT
+sub want_all_tags
{
my($self)=@_;
my $tail=$self->tail();
return 0 unless($tail);
- return 0 unless($tail->type() == $TYPE_BOOL);
- return 1 if($tail->name() eq "OR");
- return 0 unless($tail->name() eq "NOT");
my $parent=$self->tail_parent();
- return 0 unless($parent);
- return 0 unless($parent->type() == $TYPE_BOOL);
- return 1 if($parent->name() eq "OR");
+ my $parent_valid = ($parent && $parent->type() == $TYPE_BOOL);
+ if($tail->type() == $TYPE_BOOL)
+ {
+ return 1 if($tail->name() eq "OR");
+ return 0 unless($tail->name() eq "NOT");
+ return 0 unless($parent_valid);
+ return 1 if($parent->name() eq "OR");
+ return 1 if($parent->name() eq "AND");
+ }
+ elsif($tail->type() == $TYPE_TAG)
+ {
+ return 0 unless($parent_valid);
+ return 1 if($parent->name() eq "NOT");
+ }
return 0;
}
projects / id3fs.git / blobdiff