return $newval;
}
-sub cmd_sth
-{
- my($self, $sql, @params)=@_;
- my $sth=$self->{dbh}->prepare($sql);
- my $idx=1;
- for my $param (@params)
- {
- $param="" unless(defined($param));
- $sth->bind_param($idx++, $param);
- }
- $sth->execute();
- return $sth;
-}
-
-sub tags
-{
- my($self, @constraints)=@_;
- if(!@constraints) # /
- {
- # FIXME: add ALL?
- my $sql="SELECT DISTINCT name FROM tags;";
- my $tags=$self->cmd_rows($sql);
- return(map { $_->[0]; } @$tags);
- }
- my @ids=();
-
- my $main_sql_start=("SELECT t2.name\n" .
- "\tFROM (\n" .
- $self->tags_subselect(@constraints) .
- ") AS subselect\n" .
- "INNER JOIN files_x_tags ON subselect.files_id=files_x_tags.files_id\n" .
- "INNER JOIN tags t2 ON files_x_tags.tags_id=t2.id\n" .
- "WHERE t2.id NOT IN (");
- my $main_sql_end=")\nGROUP BY t2.name;";
- # FIXME: generalise more?
-
- while(my $constraint=shift @constraints)
- {
- my $cid=$constraint->{id};
- push(@ids, $cid);
- }
- @ids = map( { "\"$_\""; } grep { defined; } @ids) unless($self->{postgres});
- my $tagstr=join(", ", @ids);
- my $sql = ($main_sql_start . $tagstr .
- $main_sql_end);
- print "SQL: $sql\n";
- my $result=$self->cmd_rows($sql);
- my @tagnames=map { $_->[0]; } @$result;
- print "SUBNAMES: ", join(', ', @tagnames), "\n";
- return(@tagnames);
-}
-
-sub tag_values
-{
- my($self, $tagid)=@_;
- my $sql=("SELECT DISTINCT name FROM tags\n" .
- "WHERE parents_id=?");
- my $tags=$self->cmd_rows($sql, $tagid);
- my @tags=map { $_->[0]; } @$tags;
- @tags=map { length($_) ? $_ : "NOVALUE"; } @tags;
- return @tags;
-}
-
-sub artists
-{
- my($self, @constraints)=@_;
- if(!@constraints) # /ALL
- {
- my $sql="SELECT DISTINCT name FROM artists;";
- my $tags=$self->cmd_rows($sql);
- return(map { $_->[0]; } @$tags);
- }
- my @ids=();
- my $sql=("SELECT artists.name FROM (\n" .
- $self->tags_subselect(@constraints) .
- ") AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n" .
- "INNER JOIN artists ON files.artists_id=artists.id\n" .
- "GROUP BY artists.name;");
- print "SQL: $sql\n";
- my $result=$self->cmd_rows($sql);
- my @tagnames=map { $_->[0]; } @$result;
- print "ARTISTS: ", join(', ', @tagnames), "\n";
- return(@tagnames);
-}
-
-sub albums
-{
- my($self, @constraints)=@_;
- my @ids=();
- # FIXME: rework PathElements
- if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist")
- {
- return $self->artist_albums($constraints[$#constraints]->{id}, @constraints);
- }
- my $sql=("SELECT albums.name\n" .
- "\tFROM (\n" .
- $self->tags_subselect(@constraints) .
- "\t) AS subselect\n" .
- "INNER JOIN files ON subselect.files_id=files.id\n" .
- "INNER JOIN albums ON files.albums_id=albums.id\n" .
- "GROUP BY albums.name;");
- my $result=$self->cmd_rows($sql);
- my @names=map { $_->[0]; } @$result;
- print "ALBUMS: ", join(', ', @names), "\n";
- return(@names);
-}
-
-sub artist_albums
-{
- my($self, $artist_id, @constraints)=@_;
- my $sql=("SELECT albums.name FROM (\n" .
- $self->tags_subselect(@constraints) .
- "\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" .
- "GROUP BY albums.name\n");
- print "ARTIST_ALBUMS SQL: $sql\n";
- my $result=$self->cmd_rows($sql, $artist_id);
- my @albums=map { $_->[0]; } @$result;
- print "ALBUMS: ", join(', ', @albums), "\n";
- return(@albums);
-}
-
-sub artist_tracks
-{
- my($self, $artist_id, @constraints)=@_;
- my $sql=("SELECT files.name FROM (\n" .
- $self->tags_subselect(@constraints) .
- "\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" .
- "GROUP BY files.name\n");
- print "ARTIST_TRACKS SQL: $sql\n";
- my $result=$self->cmd_rows($sql, $artist_id);
- my @names=map { $_->[0]; } @$result;
- print "ARTISTTRACKS: ", join(', ', @names), "\n";
- 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" .
- "GROUP BY files.name\n");
- print "ALBUM_TRACKS SQL($artist_id, $album_id): $sql\n";
- my $result=$self->cmd_rows($sql, $artist_id, $album_id);
- my @names=map { $_->[0]; } @$result;
- print "TRACKS: ", join(', ', @names), "\n";
- return(@names);
-}
-
-sub tracks
-{
- my($self, @constraints)=@_;
- # FIXME: rework PathElements
- if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist")
- {
- return $self->artist_tracks($constraints[$#constraints]->{id}, @constraints);
- }
- elsif(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Album")
- {
- my $artist_id=0;
- my $artist=$constraints[($#constraints)-1];
- if(defined($artist) && (ref($artist) eq "ID3FS::PathElement::Artist"))
- {
- # should always happen
- $artist_id=$artist->{id};
- }
- return $self->album_tracks($artist_id, $constraints[$#constraints]->{id});
- }
-
- my $sql=("SELECT files.name\n" .
- "\tFROM (\n" .
- $self->tags_subselect(@constraints) .
- "\t) AS subselect\n" .
- "INNER JOIN files ON files.id=subselect.files_id\n" .
- "GROUP BY files.name;");
- print "SQL: $sql\n";
- my $result=$self->cmd_rows($sql);
- my @names=map { $_->[0]; } @$result;
- print "TRACKS: ", join(', ', @names), "\n";
- return(@names);
-}
-
-sub filename
+sub id
{
- my($self, $mountpoint, @constraints)=@_;
- if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::File")
- {
- my $id=$constraints[$#constraints]->{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";
- my ($path, $name)=$self->cmd_onerow($sql, $id);
- my $id3fs_path=join('/', map { $_->{name}; } @constraints);
- return($self->relativise($path, $name, $mountpoint, $id3fs_path));
- }
- die("DB::filename: unhandled case\n"); #FIXME
+ my($self, $type, $val)=@_;
+ my $sql="SELECT id FROM $type WHERE name=?";
+ my ($id)=$self->cmd_onerow($sql, $val);
+ return($id);
}
-sub tags_subselect
+sub tag_has_values
{
- my($self,@constraints)=@_;
- use Data::Dumper;
- my @tags=();
- my @tags_vals=();
- my $lasttag='';
-# print "CONSTRAINTS: \n", Dumper \@constraints;
- for my $constraint (@constraints)
- {
-# print ref($constraint),"\n";
- if(ref($constraint) eq "ID3FS::PathElement::Tag")
- {
- if($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}));
- }
- }
- elsif(ref($constraint) eq "ID3FS::PathElement::Tagval")
- {
-# print "TAGVAL\n";
- push(@tags_vals, [$lasttag, $constraint->{id}]) if defined($constraint->{id});
- }
- }
- unless($self->{postgres})
- {
- @tags=map{ "\"$_\""; } @tags;
- @tags_vals=map( { [ map({ "\"$_\""; } @$_ ) ] } @tags_vals);
- }
-# print "TAGS\n", Dumper \@tags;
-# print "\nVALS\n", Dumper(\@tags_vals), "\n";
- 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 @clauses=();
- if(@tags)
- {
- push(@clauses, "(t1.id IN ( " . join(', ', @tags) ." ) )");
- }
- for my $pair (@tags_vals)
- {
- my($tag, $val)=@$pair;
- push(@clauses, "( t1.parents_id=$tag AND t1.id=$val )");
- }
- if(@clauses)
- {
- $sql .= "\tWHERE\n\t\t" . join("\n\t\tOR ", @clauses) . "\n";
- }
- return $sql;
+ my($self, $id)=@_;
+ my $sql=("SELECT COUNT(*) FROM tags\n\t" .
+ "WHERE tags.parents_id=?\n");
+ my ($rows)=$self->cmd_onerow($sql, $id);
+ return $rows;
}
-
sub relativise
{
my($self, $path, $name, $mountpoint, $id3fs_path)=@_;
{
shift(@path);
shift(@rel);
- print "POP ";
+# print "POP ";
}
- print "\n";
+# print "\n";
my $upcount=scalar(@rel);
my $result="../" x $upcount;
$result .= join("/",@path);
return $result;
}
-sub bare_tags
-{
- my($self)=@_;
- my $sql=("SELECT tags.name FROM tags\n" .
- "WHERE tags.parents_id=''\n" .
- "GROUP BY tags.name\n");
- my $result=$self->cmd_rows($sql);
- my @names=map { $_->[0]; } @$result;
- 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->cmd_rows($sql);
- my $tags={};
- for my $pair (@$result)
- {
- push(@{$tags->{$pair->[0]}}, $pair->[1]);
- }
- return $tags;
-}
-
-sub id
-{
- my($self, $type, $val)=@_;
- my $sql="SELECT id FROM $type WHERE name=?";
- my ($id)=$self->cmd_onerow($sql, $val);
- return($id);
-}
-
sub add
{
my($self,$path)=@_;
my $relpath=$path;
$relpath =~ s/^\Q$self->{base}\E\/?//;
my($filepart,$pathpart);
- if($path !~ /\//)
+ if($relpath !~ /\//)
{
$pathpart='';
$filepart=$relpath;
sub add_tag
{
- my($self, $file_id, @tags)=@_;
- my $parent_id=undef;
- for my $tag (@tags)
+ my($self, $file_id, $tag, $value)=@_;
+ my $tag_id=$self->add_to_table("tags", $tag,
+ { "parents_id" => undef });
+ $self->add_relation("files_x_tags",
+ { "files_id" => $file_id,
+ "tags_id" => $tag_id });
+ if(defined($value) && length($value))
{
- my $tag_id=$self->add_to_table("tags", $tag,
- { "parents_id" => $parent_id });
+ my $val_id=$self->add_to_table("tags", $value,
+ { "parents_id" => $tag_id });
$self->add_relation("files_x_tags",
{ "files_id" => $file_id,
- "tags_id" => $tag_id });
- $parent_id=$tag_id;
+ "tags_id" => $val_id });
}
}
$self->cmd($sql, map { $fields->{$_}; } sort keys(%$fields));
}
-sub lookup_id
-{
- my($self, $table, $name)=@_;
- my($id)=$self->cmd_onerow("SELECT id FROM $table where name=?", $name);
- return $id;
-}
-
-sub tag_has_values
-{
- my($self, $id)=@_;
- my $sql=("SELECT COUNT(*) FROM tags\n\t" .
- "WHERE tags.parents_id=?\n");
- my ($rows)=$self->cmd_onerow($sql, $id);
- return $rows;
-}
-
sub files_in
{
my ($self, $dir)=@_;
LEFT JOIN files_x_tags ON files_x_tags.tags_id=tags.id
WHERE files_x_tags.files_id IS NULL);
+ VACUUM
EOT
print "SQL: $sql\n";
my @sql=split(/\n\n/, $sql);
return(defined($thing) && length($thing) && $thing =~ /\S+/);
}
+sub cmd_sth
+{
+ my($self, $sql, @params)=@_;
+ my $sth=$self->{dbh}->prepare($sql);
+ my $idx=1;
+ for my $param (@params)
+ {
+ $param="" unless(defined($param));
+ $sth->bind_param($idx++, $param);
+ }
+ $sth->execute();
+ return $sth;
+}
+
sub cmd
{
my ($self, @args)=@_;
return $sth->fetchall_arrayref();
}
+sub cmd_firstcol
+{
+ my ($self, @args)=@_;
+ return(map { $_->[0] } @{$self->cmd_rows(@args)});
+}
+
sub cmd_id
{
my ($self, @args)=@_;
}
}
+sub lookup_id
+{
+ my($self, $table, $name)=@_;
+ my($id)=$self->cmd_onerow("SELECT id FROM $table where name=?", $name);
+ return $id;
+}
+
__DATA__
CREATE TABLE id3fs (