our ($STATE_INVALID, $STATE_ROOT, $STATE_TAG, $STATE_TAGVAL,
$STATE_BOOLEAN, $STATE_ALBUMS, $STATE_TRACKLIST,
- $STATE_FILE)=(0..7);
+ $STATE_FILE, $STATE_ALL)=(0..8);
our %priorities=( "OR" => 0, "AND" => 1, "NOT" => 2 );
+our $PATH_ALLTRACKS="TRACKS";
+our $PATH_NOARTIST="NOARTIST";
+our $PATH_NOALBUM="NOALBUM";
+
sub new
{
my $proto=shift;
$self->{elements}=[];
$self->{db}=shift;
$self->{path}=shift;
+ $self->{verbose}=shift;
+ $self->{maxtagdepth}=shift;
+ $self->{curtagdepth}=0;
+ $self->{path} =~ s/\/\//\//g; # drop doubled slashes
+
$self->parse();
# print "STATE: ", $self->state(), "\n";
return $self;
sub isfile
{
my($self)=@_;
- return 1 if($self->state() == $STATE_FILE);
- return 0;
+ return($self->state() == $STATE_FILE);
}
sub isvalid
my($self, $mountpoint)=@_;
if($self->state() == $STATE_FILE)
{
- return $self->filename($mountpoint, $self);
+ return $self->filename($mountpoint);
}
return "ERROR"; #should never happen?
}
{
my($self)=@_;
my @dents=();
+ my @fents=();
my $state=$self->state();
# print "DIRENTS: STATE: $state\n";
# print "DIRENTS: FILE: $self->{path}\n";
- if($state==$STATE_TAG || $state==$STATE_TAGVAL)
+ if($state==$STATE_ALL)
{
- my $tag=$self->tail();
- if($state==$STATE_TAG &&
- defined($tag) &&
- ref($tag) eq "ID3FS::PathElement::Tag" &&
- $self->{db}->tag_has_values($tag->{id}))
+ @dents=($PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
+ }
+ elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
+ {
+ if($state==$STATE_TAG && $self->at("tag") &&
+ $self->{db}->tag_has_values($self->tail()->id()))
{
@dents=$self->tags();
}
else
{
- @dents=(qw(AND OR TRACKS NOARTIST),
- $self->artists());
+ if($self->{maxtagdepth} && ($self->{curtagdepth} < $self->{maxtagdepth}))
+ {
+ @dents=qw(AND OR);
+ }
+ push(@dents, $self->filter($PATH_ALLTRACKS, $PATH_NOARTIST));
+ push(@dents, $self->artists());
}
}
elsif($state==$STATE_BOOLEAN)
{
my $parent=$self->tail();
- unless(defined($parent) &&
- ref($parent) eq "ID3FS::PathElement::Boolean" &&
+ unless($self->is("boolean", $parent) &&
$parent->{name} eq "NOT")
{
- push(@dents, "NOT");
+ @dents=("NOT");
}
- push(@dents, $self->tags());
+ push(@dents,$self->tags());
}
elsif($state==$STATE_ROOT)
{
}
elsif($state==$STATE_ALBUMS)
{
- @dents=(qw(TRACKS NOALBUM),$self->albums());
+ @dents=($self->filter($PATH_ALLTRACKS, $PATH_NOALBUM), $self->albums());
}
elsif($state==$STATE_TRACKLIST)
{
- @dents=$self->tracks();
+ @fents=$self->tracks();
}
else
{
print "DIRENTS: UNHANDLED STATE: $state\n";
}
- return(@dents);
+ return(\@dents, \@fents);
}
sub parse
my @parts=@{$self->{components}};
my($tag, $tagval);
$self->{elements}=[];
- while(my $name=shift @parts)
+ $self->{bare_not}=0;
+ $self->{in_all}=0;
+ my $root_not=0;
+ my $tags_seen=0;
+ while(defined(my $name=shift @parts))
{
# print "NAME: $name\n";
my $state=$self->state();
# print "SM: ROOT: $name\n";
if($name eq "ALL")
{
- $self->state($STATE_TAG);
+ $self->{in_all}=1;
+ $self->state($STATE_ALL);
}
elsif($name eq "NOT")
{
+ $root_not=1;
push(@{$self->{elements}}, ID3FS::PathElement::Boolean->new($self->{db}, $name));
$self->state($STATE_BOOLEAN);
}
if($tag)
{
push(@{$self->{elements}}, $tag);
+ $tags_seen++;
$self->state($STATE_TAG);
}
else
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
-# print "SM: TAG/TAGVAL($state): $name\n";
my $tag=$self->tail();
- if($state==$STATE_TAG &&
- defined($tag) &&
- ref($tag) eq "ID3FS::PathElement::Tag" &&
- $self->{db}->tag_has_values($tag->{id}))
+# print "SM: TAG/TAGVAL($state): $name\n";
+ if($state==$STATE_TAG && $self->is("tag", $tag) &&
+ $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::PathElement::Tag->new($self->{db}, $name, $tag->id());
if(defined($tagval))
{
$self->state($STATE_TAGVAL);
$self->state($STATE_INVALID);
}
}
- elsif($name eq "TRACKS")
+ elsif($name eq $PATH_ALLTRACKS)
{
$self->state($STATE_TRACKLIST);
}
- elsif($name eq "NOARTIST")
+ elsif($name eq $PATH_NOARTIST)
{
$self->state($STATE_TRACKLIST);
}
# print "SM: BOOLEAN: $name\n";
my $parent=$self->tail();
my $allownot=1;
- if(defined($parent) &&
- ref($parent) eq "ID3FS::PathElement::Boolean" &&
+ if($self->is("boolean", $parent) &&
$parent->{name} eq "NOT")
{
$allownot=0;
if($tag)
{
push(@{$self->{elements}}, $tag);
+ $tags_seen++;
$self->state($STATE_TAG);
}
else
elsif($state==$STATE_ALBUMS)
{
# print "SM: ALBUM: $name\n";
- if($name eq "TRACKS")
+ if($name eq $PATH_ALLTRACKS)
{
$self->state($STATE_TRACKLIST);
}
- elsif($name eq "NOALBUM")
+ elsif($name eq $PATH_NOALBUM)
{
$self->state($STATE_TRACKLIST);
}
# Can't have anything after a filename
$self->state($STATE_INVALID);
}
+ elsif($state==$STATE_ALL)
+ {
+ if($name eq $PATH_ALLTRACKS)
+ {
+ $self->state($STATE_TRACKLIST);
+ }
+ elsif($name eq $PATH_NOARTIST)
+ {
+ $self->state($STATE_TRACKLIST);
+ }
+ else
+ {
+ my $artist=ID3FS::PathElement::Artist->new($self->{db}, $name);
+ if($artist)
+ {
+ push(@{$self->{elements}}, $artist);
+ $self->state($STATE_ALBUMS);
+ }
+ else
+ {
+ $self->state($STATE_INVALID);
+ }
+ }
+ }
else
{
print "SM: ERROR: UNKNOWN STATE: $self->{state}\n";
$self->state($STATE_INVALID);
}
}
+
+ if($root_not && ($tags_seen < 2))
+ {
+ $self->{bare_not}=1;
+ }
+
# remove trailing boolean
my @elements=@{$self->{elements}};
- while(@elements && ref($elements[$#elements]) eq "ID3FS::PathElement::Boolean")
+ while(@elements && $self->is("boolean", $elements[$#elements]))
{
pop @elements;
}
if($self->{tagtree})
{
($self->{sqlconditions},
- $self->{andsneeded}) = $self->{tagtree}->to_sql();
-# print("SQL CONDITION(", $self->{andsneeded}, "): ",
+ $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};
sub state
{
my($self, $newstate)=@_;
- $self->{state}=$newstate if(defined($newstate));
+ if(defined($newstate))
+ {
+ $self->{state}=$newstate;
+ $self->{curtagdepth}++ if($newstate == $STATE_TAG);
+ }
return $self->{state};
}
return undef unless(@$elements);
my ($left, $right, $op)=(undef, undef, undef);
my $thing=pop @$elements;
- if(ref($thing) eq "ID3FS::PathElement::Boolean")
+ if($self->is("boolean", $thing))
{
my $op=$thing;
$right=$self->elements_to_tree($elements);
# print "INPUT: ", join(', ', map { $_->{name}; } @input), "\n";
while(my $thing = shift @input)
{
- if(ref($thing) eq "ID3FS::PathElement::Tag")
+ if($self->is("tag", $thing))
{
+ # Handle tag values by dropping parent
+ if(@input && $self->is("tag", $input[0]))
+ {
+ $thing=shift @input;
+ }
push(@output, $thing);
}
- elsif(ref($thing) eq "ID3FS::PathElement::Boolean")
+ elsif($self->is("boolean", $thing))
{
# bool
while(@opstack &&
sub used_tags
{
my($self)=@_;
- print "TAGTREE UNDEF\n" unless(defined($self->{tagtree}));
- return undef unless(defined($self->{tagtree}));
+ return() unless(defined($self->{tagtree}));
return($self->{tagtree}->used_tags());
}
-sub tag_has_values
+sub expecting_values
{
my($self)=@_;
my $tail=$self->tail();
- if($tail && ref($tail) eq "ID3FS::PathElement::Tag")
+ if($self->is("tag", $tail))
{
- return($self->{db}->tag_has_values($tail->{id}));
+ return($self->{db}->tag_has_values($tail->id()));
}
}
{
my($self)=@_;
my $tail=$self->tail();
- if($tail && ref($tail) eq "ID3FS::PathElement::Tag")
+ if($self->is("tag", $tail))
{
- return($tail->{id});
+ return($tail->id());
}
return undef;
}
{
my($self)=@_;
my $tail=$self->tail();
- if($tail && ref($tail) eq "ID3FS::PathElement::Tag")
+ if($self->is("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);
+ my $ref=ref($thing);
+ my $typestr="ID3FS::PathElement::" . ucfirst($type);
+ return 1 if($ref eq $typestr);
+ return 0;
+}
+
# the one before last
sub tail_parent
{
sub tags
{
my($self)=@_;
- if(!@{$self->{elements}}) # /
+ if(!$self->{tagtree}) # / or /NOT
{
my $sql="SELECT DISTINCT name FROM tags WHERE parents_id='';";
return($self->{db}->cmd_firstcol($sql));
}
- my $hasvals=$self->tag_has_values();
+ my $hasvals=$self->expecting_values();
my $parent=$self->trailing_tag_parent();
- print "THASVALS: $hasvals\n";
- print "TPARENT: ", (defined($parent)? $parent : "NO"), "\n";
+# print "THASVALS: $hasvals\n";
+# print "TPARENT: ", (defined($parent)? $parent : "NO"), "\n";
my @ids=();
my $sql=("SELECT tags.name FROM (\n" .
$self->tags_subselect() .
") 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 @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";
+# 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";
+# 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(@orclauses, $clause);
+ push(@andclauses, $clause);
}
else
{
- print "HASNT VALUES\n";;
+# print "HASNT VALUES\n";;
if(@used)
{
- push(@orclauses, "(NOT (tags.parents_id='' AND tags.id IN (" . join(', ', @used) . ")))");
+ push(@andclauses, "(NOT (tags.parents_id='' AND tags.id IN (" . join(', ', @used) . ")))");
}
for my $pair (@used_with_vals)
{
- push(@orclauses, "(NOT (tags.parents_id='" . $pair->[0] . "' AND tags.id='" . $pair->[1] . "'))");
+ push(@andclauses, "(NOT (tags.parents_id='" . $pair->[0] . "' AND tags.id='" . $pair->[1] . "'))");
}
}
$sql .= "WHERE " . join(' AND ', @andclauses) . "\n";
}
$sql .= "GROUP BY tags.name;";
- print "SQL: $sql\n";
+ print "SQL(TAGS): $sql\n" if($self->{verbose});
my @tagnames=$self->{db}->cmd_firstcol($sql);
- print "SUBNAMES: ", join(', ', @tagnames), "\n";
+ print("SUBNAMES: ", join(', ', @tagnames), "\n") if($self->{verbose});
return(@tagnames);
}
-sub tag_values
-{
- my($self, $tagid)=@_;
- my $sql=("SELECT DISTINCT name FROM tags\n" .
- "WHERE parents_id=?");
- my @tags=$self->{db}->cmd_firstcol($sql, $tagid);
- @tags=map { length($_) ? $_ : "NOVALUE"; } @tags;
- return @tags;
-}
-
sub artists
{
my($self)=@_;
if(!@{$self->{elements}}) # /ALL
{
- my $sql="SELECT DISTINCT name FROM artists;";
+ my $sql="SELECT DISTINCT name FROM artists WHERE name!='';";
return($self->{db}->cmd_firstcol($sql));
}
my @ids=();
- my $sql=("SELECT artists.name FROM (\n" .
- $self->tags_subselect() .
- ") AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n" .
- "INNER JOIN artists ON files.artists_id=artists.id\n" .
+ my $sql=$self->sql_start("artists.name");
+ $sql .= ("INNER JOIN artists ON files.artists_id=artists.id\n" .
+ "WHERE artists.name != ''\n" .
"GROUP BY artists.name;");
- print "SQL: $sql\n";
+ print "SQL(ARTISTS): $sql\n" if($self->{verbose});
my @tagnames=$self->{db}->cmd_firstcol($sql);
- print "ARTISTS: ", join(', ', @tagnames), "\n";
+ print("ARTISTS: ", join(', ', @tagnames), "\n") if($self->{verbose});
return(@tagnames);
}
my @ids=();
my $tail=$self->tail();
# FIXME: rework PathElements
- if(ref($tail) eq "ID3FS::PathElement::Artist")
+ if($self->is("artist", $tail))
{
- return $self->artist_albums($tail->{id});
+ return $self->artist_albums($tail->id());
}
- my $sql=("SELECT albums.name\n" .
- "\tFROM (\n" .
- $self->tags_subselect() .
- "\t) AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n" .
- "INNER JOIN albums ON files.albums_id=albums.id\n" .
+ my $sql=$self->sql_start("albums.name");
+ $sql .= ("INNER JOIN albums ON files.albums_id=albums.id\n" .
+ "WHERE albums.name != ''\n" .
"GROUP BY albums.name;");
- print "SQL(ALBUMS): \n$sql\n";
+ print "SQL(ALBUMS): \n$sql\n" if($self->{verbose});
my @names=$self->{db}->cmd_firstcol($sql);
- print "ALBUMS: ", join(', ', @names), "\n";
+ print("ALBUMS: ", join(', ', @names), "\n") if($self->{verbose});
return(@names);
}
sub artist_albums
{
my($self, $artist_id)=@_;
- my $sql=("SELECT albums.name FROM (\n" .
- $self->tags_subselect() .
- "\t) AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n" .
- "INNER JOIN albums ON albums.id=files.albums_id\n\t" .
- "INNER JOIN artists ON artists.id=files.artists_id\n\t" .
- "WHERE artists.id=? and albums.name <> ''\n\t" .
+ my $sql=$self->sql_start("albums.name");
+ $sql .= ("INNER JOIN albums ON albums.id=files.albums_id\n" .
+ "INNER JOIN artists ON artists.id=files.artists_id\n" .
+ "WHERE artists.id=? and albums.name <> ''\n" .
"GROUP BY albums.name\n");
- print "ARTIST_ALBUMS SQL: $sql\n";
+ print "ARTIST_ALBUMS SQL: $sql\n" if($self->{verbose});
my @albums=$self->{db}->cmd_firstcol($sql, $artist_id);
- print "ALBUMS: ", join(', ', @albums), "\n";
+ print("ALBUMS: ", join(', ', @albums), "\n") if($self->{verbose});
return(@albums);
}
sub artist_tracks
{
my($self, $artist_id)=@_;
- my $sql=("SELECT files.name FROM (\n" .
- $self->tags_subselect() .
- "\t) AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n" .
- "INNER JOIN artists ON artists.id=files.artists_id\n\t" .
- "INNER JOIN albums ON albums.id=files.albums_id\n\t" .
- "WHERE artists.id=? AND albums.name=''\n\t" .
+ my $sql=$self->sql_start("files.name");
+ $sql .= ("INNER JOIN artists ON artists.id=files.artists_id\n" .
+ "INNER JOIN albums ON albums.id=files.albums_id\n" .
+ "WHERE artists.id=? AND albums.name=''\n" .
"GROUP BY files.name\n");
- print "ARTIST_TRACKS SQL: $sql\n";
+ print "ARTIST_TRACKS SQL: $sql\n" if($self->{verbose});
my @names=$self->{db}->cmd_firstcol($sql, $artist_id);
- print "ARTISTTRACKS: ", join(', ', @names), "\n";
+ print("ARTISTTRACKS: ", join(', ', @names), "\n") if($self->{verbose});
return(@names);
}
sub album_tracks
{
my($self, $artist_id, $album_id)=@_;
- my $sql=("SELECT files.name FROM files\n\t" .
- "INNER JOIN albums ON albums.id=files.albums_id\n\t" .
- "INNER JOIN artists ON artists.id=files.artists_id\n\t" .
- "WHERE artists.id=? AND albums.id=?\n\t" .
+ my $sql=("SELECT files.name FROM files\n" .
+ "INNER JOIN albums ON albums.id=files.albums_id\n" .
+ "INNER JOIN artists ON artists.id=files.artists_id\n" .
+ "WHERE artists.id=? AND albums.id=?\n" .
"GROUP BY files.name\n");
- print "ALBUM_TRACKS SQL($artist_id, $album_id): $sql\n";
+ print "ALBUM_TRACKS SQL($artist_id, $album_id): $sql\n" if($self->{verbose});
my @names=$self->{db}->cmd_firstcol($sql, $artist_id, $album_id);
- print "TRACKS: ", join(', ', @names), "\n";
+ print("TRACKS: ", join(', ', @names), "\n") if($self->{verbose});
return(@names);
}
my($self)=@_;
# FIXME: rework PathElements
my $tail=$self->tail();
- if(ref($tail) eq "ID3FS::PathElement::Artist")
+ if($self->is("artist", $tail))
{
- return $self->artist_tracks($tail->{id});
+ return $self->artist_tracks($tail->id());
}
- elsif(ref($tail) eq "ID3FS::PathElement::Album")
+ elsif($self->is("album", $tail))
{
my $artist_id=0;
my $artist=$self->tail_parent();
- if(defined($artist) && (ref($artist) eq "ID3FS::PathElement::Artist"))
+ 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=("SELECT files.name\n" .
- "\tFROM (\n" .
- $self->tags_subselect() .
- "\t) AS subselect\n" .
- "INNER JOIN files ON files.id=subselect.files_id\n" .
- "GROUP BY files.name;");
- print "SQL: $sql\n";
+ my $sql=$self->sql_start("files.name");
+ $sql .= "INNER JOIN artists ON files.artists_id=artists.id\n";
+ if($self->{components}->[$#{$self->{components}}] eq $PATH_NOARTIST)
+ {
+ $sql .= "WHERE artists.name =''\n";
+ }
+ $sql .= "GROUP BY files.name;";
+ print "TRACKS SQL($self->{path}): $sql\n" if($self->{verbose});
my @names=$self->{db}->cmd_firstcol($sql);
- print "TRACKS: ", join(', ', @names), "\n";
+ print("TRACKS: ", join(', ', @names), "\n") if($self->{verbose});
return(@names);
}
{
my($self, $mountpoint)=@_;
my $tail=$self->tail();
- if(ref($tail) eq "ID3FS::PathElement::File")
+ 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" .
"GROUP BY paths.name, files.name");
- print "FILENAME SQL: $sql\n";
+ 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, $id3fs_path));
+ return($self->{db}->relativise($path, $name, $mountpoint));
}
- die("DB::filename: unhandled case\n"); #FIXME
+ # should never happen
+ return "ERROR";
}
sub tags_subselect
{
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};
- my $hasvals=$self->tag_has_values();
my $parent=$self->trailing_tag_parent();
# print "ELEMENTS: ", join('/', map { $_->{name}; } @{$self->{elements}}), "\n";
if($hasvals)
{
$tag=$self->trailing_tag_id();
- print "Trailing id: $tag\n";
+# print "Trailing id: $tag\n";
}
- my ($sqlclause, $joinsneeded)=(undef, 1);
- ($sqlclause, $joinsneeded) = $tree->to_sql($tag) if($tree);
-# print "SQL($joinsneeded): $sqlclause\n";
+ my ($sqlclause, @joins)=(undef, ());
+ ($sqlclause, @joins) = $tree->to_sql($hasvals) if($tree);
+# print "SQL(" . scalar(@joins) .": $sqlclause\n";
my $sql="\tSELECT fxt1.files_id FROM tags t1";
my @crosses=();
my @inners=();
# $joinsneeded++ if($tag);
- for(my $i=1; $i <= $joinsneeded; $i++)
+ for(my $i=0; $i <= $#joins; $i++)
{
- my $inner=("\tINNER JOIN files_x_tags fxt$i ON " .
- "t${i}.id=fxt${i}.tags_id");
- if($i > 1)
+ my $cnt=$i+1;
+ my $join=$joins[$i];
+ my $inner=("\t$join JOIN files_x_tags fxt$cnt ON " .
+ "t${cnt}.id=fxt${cnt}.tags_id");
+ if($i > 0)
{
- push(@crosses, "CROSS JOIN tags t$i");
- $inner .= " AND fxt1.files_id=fxt${i}.files_id";
+ push(@crosses, "CROSS JOIN tags t$cnt");
+ $inner .= " AND fxt1.files_id=fxt${cnt}.files_id";
}
push(@inners, $inner);
}
return $sql;
}
-sub tags_subselect_and_not
+sub bare_not_subselect
{
- my($self,@constraints)=@_;
- my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
- my @tags=@$tags;
- my @tags_vals=@$tags_vals;;
- my $cnt=1;
- my @andclauses=();
- my $sql='';
- for my $tag (@tags)
+ 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)
{
- if($cnt == 1)
- {
- $sql="\tSELECT fxt" . scalar(@tags) . ".files_id FROM files_x_tags fxt1\n";
- push(@andclauses, "\t\tfxt${cnt}.tags_id=$tag");
- }
- else
- {
- $sql .= ("\tLEFT JOIN files_x_tags fxt$cnt ON fxt" .
- ($cnt-1) . ".files_id=fxt${cnt}.files_id\n");
- push(@andclauses, "\t\tfxt${cnt}.tags_id IS NULL");
- }
- print "AND: @andclauses\n";
- $cnt++;
+ $sql .= ("(t1.parents_id='" . $tags[0]->id() . "' AND t1.id='" .
+ $tags[1]->id() . "')");
}
- if(@andclauses)
+ else
{
- $sql .= "\tWHERE\n\t\t";
- $sql .= join(" AND\n\t\t", @andclauses) . "\n";
+ $sql .= ("(t1.parents_id='' AND t1.id='" . $tags[0]->id() . "')");
}
- $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
- return $sql;
+ $sql .= "\n\t\tGROUP BY fxt1.files_id\n\t)\n";
+ return($sql);
}
-
-sub tags_subselect_and
+sub sql_start
{
- my($self,@constraints)=@_;
- my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
- my @tags=@$tags;
- my @tags_vals=@$tags_vals;;
- my $cnt=1;
- my @andclauses=();
- my $sql='';
- for my $tag (@tags)
+ my($self, $tables)=@_;
+ my $sql="SELECT $tables FROM ";
+ if($self->{in_all})
{
- if($cnt == 1)
- {
- $sql="\tSELECT fxt" . scalar(@tags) . ".files_id FROM files_x_tags fxt1\n";
- }
- else
- {
- $sql .= ("\tINNER JOIN files_x_tags fxt$cnt ON fxt" .
- ($cnt-1) . ".files_id=fxt${cnt}.files_id\n");
- }
- push(@andclauses, "\t\tfxt${cnt}.tags_id = $tag");
- print "AND: @andclauses\n";
- $cnt++;
+ $sql .= "files\n";
}
- if(@andclauses)
+ else
{
- $sql .= "\tWHERE\n\t\t";
- $sql .= join(" AND\n\t\t", @andclauses) . "\n";
+ $sql .= ("(\n" .
+ $self->tags_subselect() .
+ ") AS subselect\n" .
+ "INNER JOIN files ON subselect.files_id=files.id\n");
}
- $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
return $sql;
}
-sub tags_subselect_or
-{
- my($self,@constraints)=@_;
- my ($tags, $tags_vals, $parent)=$self->constraints_tag_list(@constraints);
- my @tags=@$tags;
- my @tags_vals=@$tags_vals;;
-
- my $sql=("\tSELECT files_x_tags.files_id FROM tags t1\n" .
- "\tINNER JOIN files_x_tags ON t1.id=files_x_tags.tags_id\n");
- my @orclauses=();
- my @andclauses=();
- # FIXME: and / or?
- if(@tags)
- {
- push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
- push(@andclauses, "( t1.id IN ( " . join(', ', @tags) ." ) )");
- }
- for my $pair (@tags_vals)
- {
- my($tag, $val)=@$pair;
- push(@orclauses, "( t1.parents_id=$tag AND t1.id=$val )");
- }
-# push(@andclauses, "( t1.parents_id=" . (defined($parent) ? $parent : "''") . " )");
- if(@orclauses)
- {
- push(@andclauses, join("\n\t\tOR ", @orclauses));
- }
- if(@andclauses)
- {
- $sql .= "\tWHERE\n\t\t";
- $sql .= join("\n\t\tAND ", @andclauses) . "\n";
- }
- $sql .= "\tGROUP BY files_x_tags.files_id\n";
- return $sql;
-}
sub constraints_tag_list
{
for my $constraint (@constraints)
{
# print ref($constraint), ": ", $constraint->{name}, "\n";
- if(ref($constraint) eq "ID3FS::PathElement::Tag")
+ if($self->is("tag", $constraint))
{
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()));
}
}
}
- unless($self->{db}->{postgres})
- {
- @tags=map{ "\"$_\""; } @tags;
- @tags_vals=map( { [ map({ "\"$_\""; } @$_ ) ] } @tags_vals);
- $lasttag="\"$lasttag\"" if defined($lasttag);
- }
+ @tags=map{ "\"$_\""; } @tags;
+ @tags_vals=map( { [ map({ "\"$_\""; } @$_ ) ] } @tags_vals);
+ $lasttag="\"$lasttag\"" if defined($lasttag);
return(\@tags, \@tags_vals, $lasttag);
}
-
-sub bare_tags
+# 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
+sub filter
{
- my($self)=@_;
- my $sql=("SELECT tags.name FROM tags\n" .
- "WHERE tags.parents_id=''\n" .
- "GROUP BY tags.name\n");
- my @names=$self->{db}->cmd_firstcol($sql);
- return (@names);
-}
-
-sub tags_with_values
-{
- # FIXME: only shows one level of tag depth
- my($self)=@_;
- my $sql=("SELECT p.name, t.name FROM tags t\n" .
- "INNER JOIN tags p ON t.parents_id=p.id\n" .
- "GROUP BY p.name, t.name\n");
- print "SQL: $sql\n";
- my $result=$self->{db}->cmd_rows($sql);
- my $tags={};
- for my $pair (@$result)
+ my($self, @dirs)=@_;
+ my $base=$self->{path};
+ my @outdirs=();
+ for my $dir (@dirs)
{
- push(@{$tags->{$pair->[0]}}, $pair->[1]);
+ 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);
+ }
}
- return $tags;
+ return(@outdirs);
}
-sub lookup_id
+sub empty
{
- my($self, $table, $name)=@_;
- my($id)=$self->{db}->cmd_onerow("SELECT id FROM $table where name=?", $name);
- return $id;
+ my($self, $dir)=@_;
+ my $path=ID3FS::Path->new($self->{db}, $dir, $self->{verbose},
+ ($self->{maxtagdepth} - $self->{curtagdepth}));
+ return 1 unless($path->isvalid());
+ my($subdirs,$subfiles)=$path->dirents();
+ return 0 if(@$subfiles || @$subdirs);
+ return 1;
}
1;
projects / id3fs.git / blobdiff