$self->{elements}=[];
$self->{db}=shift;
$self->{path}=shift;
+ $self->{verbose}=shift;
$self->{path} =~ s/\/\//\//g; # drop doubled slashes
$self->parse();
# print "DIRENTS: FILE: $self->{path}\n";
if($state==$STATE_ALL)
{
- push(@dents, $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
+ @dents=($self->artists(), $PATH_ALLTRACKS, $PATH_NOARTIST);
}
elsif($state==$STATE_TAG || $state==$STATE_TAGVAL)
{
}
else
{
- push(@dents, qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST, $self->artists());
+ @dents=($self->artists(), qw(AND OR), $PATH_ALLTRACKS, $PATH_NOARTIST);
}
}
elsif($state==$STATE_BOOLEAN)
{
+ @dents=$self->tags();
my $parent=$self->tail();
unless(defined($parent) &&
ref($parent) eq "ID3FS::PathElement::Boolean" &&
{
push(@dents, "NOT");
}
- push(@dents, $self->tags());
}
elsif($state==$STATE_ROOT)
{
- @dents=(qw(ALL NOT), $self->tags());
+ @dents=($self->tags(), qw(ALL NOT));
}
elsif($state==$STATE_ALBUMS)
{
- @dents=($PATH_ALLTRACKS, $PATH_NOALBUM, $self->albums());
+ @dents=($self->albums(), $PATH_ALLTRACKS, $PATH_NOALBUM);
}
elsif($state==$STATE_TRACKLIST)
{
$sql .= "WHERE " . join(' AND ', @andclauses) . "\n";
}
$sql .= "GROUP BY tags.name;";
-# print "SQL(TAGS): $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);
}
"INNER JOIN artists ON files.artists_id=artists.id\n" .
"WHERE artists.name != ''\n" .
"GROUP BY artists.name;");
-# print "SQL(ARTISTS): $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);
}
"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);
}
"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);
}
"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);
}
"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);
}
$sql .= "WHERE artists.name =''\n";
}
$sql .= "GROUP BY files.name;";
-# print "TRACKS SQL($self->{path}): $sql\n";
+ 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);
}
"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($sql);
}
-sub tags_subselect_and_not
-{
- 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)
- {
- 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++;
- }
- if(@andclauses)
- {
- $sql .= "\tWHERE\n\t\t";
- $sql .= join(" AND\n\t\t", @andclauses) . "\n";
- }
- $sql .= "\tGROUP BY fxt". scalar(@tags).".files_id\n";
- return $sql;
-}
-
-
-sub tags_subselect_and
-{
- 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)
- {
- 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++;
- }
- if(@andclauses)
- {
- $sql .= "\tWHERE\n\t\t";
- $sql .= join(" AND\n\t\t", @andclauses) . "\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
{
my($self, @constraints)=@_;
my $maxdepth=4;
for my $dir (@dirs)
{
-# print "FILTER (",$self->state(), "): $base / $dir\n";
+# print "\nFILTER (",$self->state(), "): $base / $dir\n";
if($self->empty("$base/$dir", $maxdepth))
{
# print "empty: $base / $dir\n";
}
else
{
-# print "accepting: $base / $dir\n";
+# print "non-empty, accepting: $base / $dir\n";
push(@outdirs, $dir);
}
}
sub empty
{
my($self, $dir, $maxdepth)=@_;
- return 1 unless($maxdepth);
+ return 0 unless($maxdepth);
# print "testing($maxdepth): $dir\n";
- my $path=ID3FS::Path->new($self->{db}, $dir);
+ my $path=ID3FS::Path->new($self->{db}, $dir, $self->{verbose});
# print "PATH INVALID\n" unless($path->isvalid());
return 1 unless($path->isvalid());
my($subdirs,$subfiles)=$path->dirents();