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)
{
- if($state==$STATE_TAG && $self->at("tag") &&
- $self->{db}->tag_has_values($self->tail()->id()))
+ my $tail=$self->tail();
+ 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("boolean", $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);
}
+# State Machine Of Doom
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($name eq "NOT")
{
$root_not=1;
- push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, $TYPE_BOOL, $name));
$self->state($STATE_BOOLEAN);
}
else
{
- $tag=ID3FS::Path::Node->new($self->{db},"tag", $name);
+ $tag=ID3FS::Path::Node->new($self->{db}, $TYPE_TAG, $name);
if($tag)
{
push(@{$self->{elements}}, $tag);
}
}
}
- 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("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}, "tag", $name, $tag->id());
+ 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);
}
elsif($name eq "AND")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, $TYPE_BOOL, $name));
}
elsif($name eq "OR")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, $TYPE_BOOL, $name));
}
else
{
- my $artist=ID3FS::Path::Node->new($self->{db}, "artist", $name);
+ my $artist=ID3FS::Path::Node->new($self->{db}, $TYPE_ARTIST, $name);
if($artist)
{
push(@{$self->{elements}}, $artist);
# print "SM: BOOLEAN: $name\n";
my $parent=$self->tail();
my $allownot=1;
- if($self->is("boolean", $parent) &&
+ if($self->is($TYPE_BOOL, $parent) &&
$parent->{name} eq "NOT")
{
$allownot=0;
if($allownot && $name eq "NOT")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, $TYPE_BOOL, $name));
}
else
{
- my $tag=ID3FS::Path::Node->new($self->{db}, "tag", $name);
+ my $tag=ID3FS::Path::Node->new($self->{db}, $TYPE_TAG, $name);
if($tag)
{
push(@{$self->{elements}}, $tag);
}
else
{
- my $album=ID3FS::Path::Node->new($self->{db}, "album", $name);
+ my $album=ID3FS::Path::Node->new($self->{db}, $TYPE_ALBUM, $name);
if($album)
{
push(@{$self->{elements}}, $album);
elsif($state==$STATE_TRACKLIST)
{
# print "SM: TRACKLIST: $name\n";
- my $track=ID3FS::Path::Node->new($self->{db}, "file", $name);
+ my $track=ID3FS::Path::Node->new($self->{db}, $TYPE_FILE, $name);
if($track)
{
push(@{$self->{elements}}, $track);
}
else
{
- my $artist=ID3FS::Path::Node->new($self->{db}, "artist", $name);
+ my $artist=ID3FS::Path::Node->new($self->{db}, $TYPE_ARTIST, $name);
if($artist)
{
push(@{$self->{elements}}, $artist);
}
}
- # remove trailing boolean
my @elements=@{$self->{elements}};
- while(@elements && $self->is("boolean", $elements[$#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})
+}
+
+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)
{
-# use Data::Dumper;
-# print Dumper $self->{tagtree};
-# my ($conditions, @joins)=$self->{tagtree}->to_sql();
-# print "CONDITIONS(", scalar(@joins), "): ", $conditions, "\n";
+ 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)=@_;
return undef unless(@$elements);
my ($left, $right, $op)=(undef, undef, undef);
my $thing=pop @$elements;
- if($self->is("boolean", $thing))
+ if($self->is($TYPE_BOOL, $thing))
{
$right=$self->elements_to_tree($elements);
if($thing->{name} ne "NOT")
my ($self, @input)=@_;
my @opstack=();
my @output=();
-# print "INPUT: ", join(', ', map { $_->{name}; } @input), "\n";
while(my $thing = shift @input)
{
- if($self->is("tag", $thing))
+ if($self->is($TYPE_TAG, $thing))
{
# Handle tag values by dropping parent
- if(@input && $self->is("tag", $input[0]))
+ if(@input && $self->is($TYPE_TAG, $input[0]))
{
$thing=shift @input;
}
push(@output, $thing);
}
- elsif($self->is("boolean", $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;
}
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is("tag", $tail))
+ if($self->is($TYPE_TAG, $tail))
{
return($self->{db}->tag_has_values($tail->id()));
}
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is("tag", $tail))
+ if($self->is($TYPE_TAG, $tail))
{
return($tail->id());
}
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is("tag", $tail))
+ if($self->is($TYPE_TAG, $tail))
{
return($tail->{parents_id});
}
return($self->{elements}->[$#{$self->{elements}}]);
}
-sub at
-{
- my($self, $type)=@_;
- return($self->is($type, $self->tail()));
-}
-
sub is
{
my($self, $type, $thing)=@_;
return 0 unless($thing);
return 0 unless($thing->type());
- return 1 if($type eq $thing->type());
+ return 1 if($type == $thing->type());
return 0;
}
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("artist", $tail))
+ if($self->is($TYPE_ARTIST, $tail))
{
return $self->artist_albums($tail->id());
}
{
my($self)=@_;
my $tail=$self->tail();
- if($self->is("artist", $tail))
+ if($self->is($TYPE_ARTIST, $tail))
{
return $self->artist_tracks($tail->id());
}
- elsif($self->is("album", $tail))
+ elsif($self->is($TYPE_ALBUM, $tail))
{
my $artist_id=0;
my $artist=$self->tail_parent();
- if($self->is("artist", $artist))
+ if($self->is($TYPE_ARTIST, $artist))
{
# should always happen
$artist_id=$artist->id();
{
my($self, $mountpoint)=@_;
my $tail=$self->tail();
- if($self->is("file", $tail))
+ if($self->is($TYPE_FILE, $tail))
{
my $id=$tail->id();
my $sql=("SELECT paths.name, files.name FROM files\n" .
"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();
- if($self->{in_all})
- {
- # FIXME: is this used?
- die "IN_ALL CALLED!!\n";
- return "\tSELECT id FROM files AS files_id\n";
- }
my $tree=$self->{tagtree};
- # FIXME
- print "UNDEF!!\n" unless($self->{tagtree});
- my $parent=$self->trailing_tag_parent();
-
-# print "ELEMENTS: ", join('/', map { $_->{name}; } @{$self->{elements}}), "\n";
-# print "TREE: ", $tree->print(), "\n";
- 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;
}
return $sql;
}
-# FIXME: remove
-sub constraints_tag_list
-{
- my($self, @constraints)=@_;
- my $lasttag=undef;
- my @tags=();
- my @tags_vals=();
- for my $constraint (@constraints)
- {
-# print ref($constraint), ": ", $constraint->{name}, "\n";
- if($self->is("tag", $constraint))
- {
- if(defined($lasttag))
- {
-# print "TAGVAL\n";
- push(@tags_vals, [$lasttag, $constraint->id()]) if defined($constraint->id());
- $lasttag=undef;
- }
- elsif($self->tag_has_values($constraint->id()))
- {
-# print "HASVALUES\n";
- $lasttag=$constraint->id() if defined($constraint->id());
- }
- else
- {
-# print "NOVALUES\n";
- push(@tags, $constraint->id()) if(defined($constraint->id()));
- }
- }
- }
- @tags=map{ "\"$_\""; } @tags;
- @tags_vals=map( { [ map({ "\"$_\""; } @$_ ) ] } @tags_vals);
- $lasttag="\"$lasttag\"" if defined($lasttag);
- return(\@tags, \@tags_vals, $lasttag);
-}
-
# we just filter $ALLTRACKS, $NOARTIST and $NOALBUM
# filtering tags properly requires up to four levels of recursion
# (tag/tagval/AND/NOT) and is too slow
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() eq "boolean");
- 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() eq "boolean");
- 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