use strict;
use warnings;
-use ID3FS::PathElement::Artist;
-use ID3FS::PathElement::Album;
-use ID3FS::PathElement::Boolean;
-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,
our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
-our $PATH_ALLTRACKS="TRACKS";
-our $PATH_NOARTIST="NOARTIST";
-our $PATH_NOALBUM="NOALBUM";
+our $PATH_ALLTRACKS= "TRACKS";
+our $PATH_NOARTIST = "NOARTIST";
+our $PATH_NOALBUM = "NOALBUM";
sub new
{
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
if($state==$STATE_TAG && $self->at("tag") &&
- $self->{db}->tag_has_values($self->tail()->{id}))
+ $self->{db}->tag_has_values($self->tail()->id()))
{
@dents=$self->tags();
}
my @parts=@{$self->{components}};
my($tag, $tagval);
$self->{elements}=[];
- $self->{bare_not}=0;
$self->{in_all}=0;
my $root_not=0;
my $tags_seen=0;
elsif($name eq "NOT")
{
$root_not=1;
- push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
$self->state($STATE_BOOLEAN);
}
else
{
- $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
+ $tag=ID3FS::Path::Node->new($self->{db},"tag", $name);
if($tag)
{
push(@{$self->{elements}}, $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}))
+ $self->{db}->tag_has_values($tag->id()))
{
-# print "Parsing: parent: $tag->{id}\n";
- my $tagval=ID3FS::PathElement::Tag->new($self->{db}, $name, $tag->{id});
+# print "Parsing: parent: $tag->id()\n";
+ my $tagval=ID3FS::Path::Node->new($self->{db}, "tag", $name, $tag->id());
if(defined($tagval))
{
$self->state($STATE_TAGVAL);
elsif($name eq "AND")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
}
elsif($name eq "OR")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
}
else
{
- my $artist=ID3FS::PathElement::Artist->new($self->{db}, $name);
+ my $artist=ID3FS::Path::Node->new($self->{db}, "artist", $name);
if($artist)
{
push(@{$self->{elements}}, $artist);
if($allownot && $name eq "NOT")
{
$self->state($STATE_BOOLEAN);
- push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
+ push(@{$self->{elements}}, ID3FS::Path::Node->new($self->{db}, "boolean", $name));
}
else
{
- my $tag=ID3FS::PathElement::Tag->new($self->{db}, $name);
+ my $tag=ID3FS::Path::Node->new($self->{db}, "tag", $name);
if($tag)
{
push(@{$self->{elements}}, $tag);
}
else
{
- my $album=ID3FS::PathElement::Album->new($self->{db}, $name);
+ my $album=ID3FS::Path::Node->new($self->{db}, "album", $name);
if($album)
{
push(@{$self->{elements}}, $album);
elsif($state==$STATE_TRACKLIST)
{
# print "SM: TRACKLIST: $name\n";
- my $track=ID3FS::PathElement::File->new($self->{db}, $name);
+ my $track=ID3FS::Path::Node->new($self->{db}, "file", $name);
if($track)
{
push(@{$self->{elements}}, $track);
}
else
{
- my $artist=ID3FS::PathElement::Artist->new($self->{db}, $name);
+ my $artist=ID3FS::Path::Node->new($self->{db}, "artist", $name);
if($artist)
{
push(@{$self->{elements}}, $artist);
}
}
- if($root_not && ($tags_seen < 2))
- {
- $self->{bare_not}=1;
- }
-
# remove trailing boolean
my @elements=@{$self->{elements}};
while(@elements && $self->is("boolean", $elements[$#elements]))
$self->{tagtree}=$self->elements_to_tree(\@elements);
if($self->{tagtree})
{
- ($self->{sqlconditions},
- $self->{joins}) = $self->{tagtree}->to_sql();
-# print "TREE: ", $self->{tagtree}->print(), "\n";
-# print("SQL CONDITION(", scalar(@{$self->{joins}}), "): ",
-# $self->{sqlconditions}, "\n");
-# use Data::Dumper;
-# print Dumper $self->{tagtree};
+# my ($conditions, @joins)=$self->{tagtree}->to_sql();
+# print "CONDITIONS(", scalar(@joins), "): ", $conditions, "\n";
}
}
my $thing=pop @$elements;
if($self->is("boolean", $thing))
{
- my $op=$thing;
$right=$self->elements_to_tree($elements);
- if($op->{name} ne "NOT")
+ if($thing->{name} ne "NOT")
{
$left=$self->elements_to_tree($elements);
}
- return ID3FS::Path::Node->new($left, $op, $right);
- }
- else
- {
- return ID3FS::Path::Node->new($thing);
+ $thing->left($left);
+ $thing->right($right);
}
+ return $thing;
}
# Dijkstra's shunting-yard algorithm
if($self->is("tag", $thing))
{
# Handle tag values by dropping parent
- if(@input && $self->is("tag", $input[0])
+ if(@input && $self->is("tag", $input[0]))
{
$thing=shift @input;
}
my $tail=$self->tail();
if($self->is("tag", $tail))
{
- return($self->{db}->tag_has_values($tail->{id}));
+ return($self->{db}->tag_has_values($tail->id()));
}
}
my $tail=$self->tail();
if($self->is("tag", $tail))
{
- return($tail->{id});
+ return($tail->id());
}
return undef;
}
{
my($self, $type, $thing)=@_;
return 0 unless($thing);
- my $ref=ref($thing);
- my $typestr="ID3FS::PathElement::" . ucfirst($type);
- return 1 if($ref eq $typestr);
+ return 0 unless($thing->type());
+ return 1 if($type eq $thing->type());
return 0;
}
") AS subselect\n" .
"INNER JOIN files_x_tags ON subselect.files_id=files_x_tags.files_id\n" .
"INNER JOIN tags ON files_x_tags.tags_id=tags.id\n");
- my @allused=$self->used_tags();
- my @used=grep { ref($_) ne "ARRAY"; } @allused;
- my @used_with_vals=grep { ref($_) eq "ARRAY"; } @allused;
-# print "tags(): USED: ", join(", ", @used), "\n";
-# print "tags(): USED_WITH_VALS: ", join(", ", map { "[".$_->[0]. ", ".$_->[1]."]";} @used_with_vals), "\n";
- my @orclauses=();
my @andclauses=();
my $id=$self->trailing_tag_id();
- if($hasvals)
- {
-# print "HAS_VALUES\n";
- my @values=map { "'".$_->[1]."'"; } grep { $_->[0] == $id; } @used_with_vals;
- my $clause="(tags.parents_id='$id'";
- if(@values)
- {
- $clause .= " AND tags.id NOT IN (" . join(', ', @values) . ")";
- }
- $clause .= ")";
- push(@andclauses, $clause);
- }
- else
- {
-# print "HASNT VALUES\n";;
- if(@used)
- {
- push(@andclauses, "(NOT (tags.parents_id='' AND tags.id IN (" . join(', ', @used) . ")))");
- }
- for my $pair (@used_with_vals)
- {
- push(@andclauses, "(NOT (tags.parents_id='" . $pair->[0] . "' AND tags.id='" . $pair->[1] . "'))");
- }
- }
- my $parentclause= "(tags.parents_id='";
+ my $parentclause= "tags.parents_id='";
if($hasvals)
{
$parentclause .= $id;
{
$parentclause .= $parent;
}
- $parentclause .= "')";
+ $parentclause .= "'";
push(@andclauses, $parentclause);
- if(@orclauses)
+ my @used=$self->used_tags();
+ if(@used)
{
- push(@andclauses, '( ' . join(' OR ', @orclauses) . ' )');
+ push(@andclauses, "tags.id NOT IN (" . join(', ', @used) . ")");
}
if(@andclauses)
{
$sql .= "WHERE " . join(' AND ', @andclauses) . "\n";
}
+
$sql .= "GROUP BY tags.name;";
print "SQL(TAGS): $sql\n" if($self->{verbose});
my @tagnames=$self->{db}->cmd_firstcol($sql);
my($self)=@_;
my @ids=();
my $tail=$self->tail();
- # FIXME: rework PathElements
if($self->is("artist", $tail))
{
- return $self->artist_albums($tail->{id});
+ return $self->artist_albums($tail->id());
}
my $sql=$self->sql_start("albums.name");
$sql .= ("INNER JOIN albums ON files.albums_id=albums.id\n" .
sub tracks
{
my($self)=@_;
- # FIXME: rework PathElements
my $tail=$self->tail();
if($self->is("artist", $tail))
{
- return $self->artist_tracks($tail->{id});
+ return $self->artist_tracks($tail->id());
}
elsif($self->is("album", $tail))
{
if($self->is("artist", $artist))
{
# should always happen
- $artist_id=$artist->{id};
+ $artist_id=$artist->id();
}
- return $self->album_tracks($artist_id, $tail->{id});
+ return $self->album_tracks($artist_id, $tail->id());
}
my $sql=$self->sql_start("files.name");
$sql .= "INNER JOIN artists ON files.artists_id=artists.id\n";
my $tail=$self->tail();
if($self->is("file", $tail))
{
- my $id=$tail->{id};
+ my $id=$tail->id();
my $sql=("SELECT paths.name, files.name FROM files\n" .
"INNER JOIN paths ON files.paths_id=paths.id\n" .
"WHERE files.id=?\n" .
{
my($self)=@_;
my $hasvals=$self->expecting_values();
- # we need to specially handle a bare /NOT/tag with no other clauses,
- # using a simple WHERE id !='tagid' instead of a LEFT JOIN
- if($self->{bare_not})
- {
- return $self->bare_not_subselect();
- }
if($self->{in_all})
{
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";
}
my ($sqlclause, @joins)=(undef, ());
($sqlclause, @joins) = $tree->to_sql($hasvals) if($tree);
-# print "SQL(" . scalar(@joins) .": $sqlclause\n";
+# print "SQL(" . scalar(@joins) ."): $sqlclause\n";
my $sql="\tSELECT fxt1.files_id FROM tags t1";
my @crosses=();
my @inners=();
return $sql;
}
-sub bare_not_subselect
-{
- my($self)=@_;
- my @tags=grep { $self->is("tag", $_); } @{$self->{elements}};
- my $sql=("\tSELECT f1.id AS files_id FROM files f1 WHERE f1.id NOT IN (\n" .
- "\t\tSELECT fxt1.files_id FROM tags t1\n" .
- "\t\tINNER JOIN files_x_tags fxt1 ON t1.id=fxt1.tags_id\n" .
- "\t\tWHERE ");
- if(scalar(@tags) > 1)
- {
- $sql .= ("(t1.parents_id='" . $tags[0]->{id} . "' AND t1.id='" .
- $tags[1]->{id} . "')");
- }
- else
- {
- $sql .= ("(t1.parents_id='' AND t1.id='" . $tags[0]->{id} . "')");
- }
- $sql .= "\n\t\tGROUP BY fxt1.files_id\n\t)\n";
- return($sql);
-}
-
sub sql_start
{
my($self, $tables)=@_;
if(defined($lasttag))
{
# print "TAGVAL\n";
- push(@tags_vals, [$lasttag, $constraint->{id}]) if defined($constraint->{id});
+ push(@tags_vals, [$lasttag, $constraint->id()]) if defined($constraint->id());
$lasttag=undef;
}
- elsif($self->tag_has_values($constraint->{id}))
+ elsif($self->tag_has_values($constraint->id()))
{
# print "HASVALUES\n";
- $lasttag=$constraint->{id} if defined($constraint->{id});
+ $lasttag=$constraint->id() if defined($constraint->id());
}
else
{
# print "NOVALUES\n";
- push(@tags, $constraint->{id}) if(defined($constraint->{id}));
+ push(@tags, $constraint->id()) if(defined($constraint->id()));
}
}
}
my @outdirs=();
for my $dir (@dirs)
{
- print "\nFILTER (",$self->state(), "): $base / $dir\n";
+# print "\nFILTER (",$self->state(), "): $base / $dir\n";
if($self->empty("$base/$dir"))
{
- print "empty: $base / $dir\n";
+# print "empty: $base / $dir\n";
}
else
{
- print "non-empty, accepting: $base / $dir\n";
+# print "non-empty, accepting: $base / $dir\n";
push(@outdirs, $dir);
}
}
projects / id3fs.git / blobdiff