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?
}
return($self->{tagtree}->used_tags());
}
-sub tag_has_values
+sub expecting_values
{
my($self)=@_;
my $tail=$self->tail();
sub tags
{
my($self)=@_;
- if(!$self->{tagtree}) # / or /NOT # FIXME: /ALL too?
+ 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";
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)=@_;
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(ARTISTS): $sql\n" if($self->{verbose});
{
return $self->artist_albums($tail->{id});
}
- my $sql;
- if($self->{in_all})
- {
- $sql="SELECT name FROM albums";
- }
- else
- {
- $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" .
- "WHERE albums.name != ''\n" .
- "GROUP BY albums.name;");
- }
+ 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" if($self->{verbose});
my @names=$self->{db}->cmd_firstcol($sql);
print("ALBUMS: ", join(', ', @names), "\n") if($self->{verbose});
sub artist_albums
{
my($self, $artist_id)=@_;
- my $sql="SELECT albums.name FROM ";
- if($self->{in_all})
- {
- $sql .= "files\n";
- }
- else
- {
- $sql .= ("(\n" .
- $self->tags_subselect() .
- ") AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n");
- }
+ 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" .
sub artist_tracks
{
my($self, $artist_id)=@_;
- my $sql="SELECT files.name FROM ";
- if($self->{in_all})
- {
- $sql .= "files\n";
- }
- else
- {
- $sql .= ("(\n" .
- $self->tags_subselect() .
- "\t) AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n");
- }
+ 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" .
}
return $self->album_tracks($artist_id, $tail->{id});
}
- my $sql="SELECT files.name FROM ";
- if($self->{in_all})
- {
- $sql .= "files\n";
- }
- else
- {
- $sql .= ("(\n" .
- $self->tags_subselect() .
- ") AS subselect\n" .
- "INNER JOIN files ON files.id=subselect.files_id\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)
{
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
}
sub tags_subselect
{
my($self)=@_;
- my $hasvals=$self->tag_has_values();
+ 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($sql);
}
+sub sql_start
+{
+ my($self, $tables)=@_;
+ my $sql="SELECT $tables FROM ";
+ if($self->{in_all})
+ {
+ $sql .= "files\n";
+ }
+ else
+ {
+ $sql .= ("(\n" .
+ $self->tags_subselect() .
+ ") AS subselect\n" .
+ "INNER JOIN files ON subselect.files_id=files.id\n");
+ }
+ return $sql;
+}
+
+
sub constraints_tag_list
{
my($self, @constraints)=@_;
return(\@tags, \@tags_vals, $lasttag);
}
-
-sub bare_tags
-{
- 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)
- {
- push(@{$tags->{$pair->[0]}}, $pair->[1]);
- }
- return $tags;
-}
-
-
+# Not used, slows things down too much
sub filter
{
my($self, @dirs)=@_;
return 1;
}
-sub tagname_has_values
-{
- my($self, $name)=@_;
- my $id=$self->{db}->lookup_id("tags", $name);
- return 0 unless($id);
- return $self->{db}->tag_has_values($id);
-
-}
-
sub dir_is_special
{
my($self, $dir)=@_;
- if((grep { $_ eq $dir; }
- qw(AND OR NOT), $PATH_ALLTRACKS, $PATH_NOARTIST, $PATH_NOALBUM) ||
- ($self->tagname_has_values($dir)))
+ my $id=$self->{db}->lookup_id("tags", $dir);
+ if((grep { $_ eq $dir; } (qw(AND OR NOT), $PATH_ALLTRACKS,
+ $PATH_NOARTIST, $PATH_NOALBUM)) ||
+ ($id && $self->{db}->tag_has_values($id)))
{
return 1;
}