X-Git-Url: http://erislabs.net/gitweb/?p=id3fs.git;a=blobdiff_plain;f=lib%2FID3FS%2FDB.pm;h=5821b538cb6e8633c406abe2896b2391ca5f700d;hp=a5230335f5b26e0e614ced09bfa0670a10a57cae;hb=6b5e5fdddc2243b1a0b02157a70bc12361b797d4;hpb=234da9eadf245b1e1fdf28d3361c309c9ec6ca6d diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm index a523033..5821b53 100644 --- a/lib/ID3FS/DB.pm +++ b/lib/ID3FS/DB.pm @@ -1,3 +1,19 @@ +# id3fs - a FUSE-based filesystem for browsing audio metadata +# Copyright (C) 2010 Ian Beckwith +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . + package ID3FS::DB; use strict; @@ -7,7 +23,7 @@ use ID3FS::AudioFile; use Cwd; our $SCHEMA_VERSION=1; -my $dbfile=".id3fs"; +my $dbfile=".id3fs"; # default sub new { @@ -17,29 +33,16 @@ sub new bless($self,$class); $self->{me}=shift; - $self->{dbpath}=shift; + $self->{verbose}=shift; + my $init=shift; $self->{base}=shift; - $self->{fallbackdir}=shift; - - if(!defined($self->{base}) && - defined($self->{fallbackdir}) && - -d $self->{fallbackdir}) - { - $self->{base}=$self->{fallbackdir}; - } - $self->{dbpath}="$self->{base}/$dbfile" unless(defined($self->{dbpath})); + $self->{dbpath}=shift || ($self->{base} . "/" . $dbfile); + $self->{dbpath}=Cwd::abs_path($self->{dbpath}); $self->{absbase}=Cwd::abs_path($self->{base}); my $connectstr="dbi:SQLite:dbname=$self->{dbpath}"; - my ($user, $pass)=("", ""); - if($self->{postgres}) - { - $connectstr="dbi:Pg:dbname=id3fs"; - $user="ianb"; - $pass="foo"; - } my $exists=-f $self->{dbpath}; - $self->{dbh}=DBI->connect($connectstr, $user, $pass, + $self->{dbh}=DBI->connect($connectstr, undef, undef, { AutoCommit=>1 } ); unless(defined($self->{dbh})) { @@ -58,6 +61,43 @@ sub new return $self; } +# search parent directories for db +sub find_db +{ + # class method + shift if(ref($_[0]) eq "ID3FS::DB"); + + my($me, $init, @dirs)=@_; + my $base=undef; + for my $dir (@dirs) + { + my $path=Cwd::abs_path($dir); + do + { + $base=$path; + $path=~s/(.*)\/.*/$1/; + } + while(! -f "$base/$dbfile" && length($path) && -d $path); + if(-f "$base/$dbfile") + { + return $base; + } + } + if(!-f "$base/$dbfile") + { + unless($init) + { + print "$me: db not found at $base/$dbfile\n"; + return undef; + } + $base=$dirs[0]; + + } + return $base; +} + +sub base_dir { return shift->{base}; } + sub create { my($self,$name)=@_; @@ -67,23 +107,6 @@ sub create { $self->{dbh}->do($cmd); } - if($self->{postgres}) - { - $self->cmd("CREATE SEQUENCE seq"); - } - else - { - my %indexes=( "idx_files_id" => "files (id)", - "idx_fxt_both" => "files_x_tags (files_id, tags_id)", - "idx_fxt_files" => "files_x_tags (files_id)", - "idx_fxt_tags" => "files_x_tags (tags_id)", - "idx_tags_id" => "tags (id)", - "idx_tags_name" => "tags (name)"); - for my $index (keys %indexes) - { - $self->{dbh}->do("CREATE INDEX $index ON " . $indexes{$index}); - } - } $self->cmd("INSERT INTO id3fs (schema_version, last_update) VALUES (?, ?)", $SCHEMA_VERSION, time()); } @@ -100,6 +123,12 @@ sub checkschema } } +sub analyze +{ + my $self=shift; + $self->cmd("ANALYZE"); +} + sub enable_foreign_keys { my $self=shift; @@ -120,260 +149,74 @@ sub last_update return $newval; } -sub cmd_sth +sub bare_tags { - 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; + my($self)=@_; + my $sql=("SELECT t1.name FROM tags t1\n" . + "LEFT JOIN tags t2 on t1.id=t2.parents_id\n" . + "WHERE t1.parents_id='' AND t2.id IS NULL\n" . + "GROUP BY t1.name\n"); + my @names=$self->cmd_firstcol($sql); + return (@names); } -sub tags +sub tags_with_values { - 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 (SELECT files_id FROM tags t1\n" . - "\t\tINNER JOIN files_x_tags ON t1.id=files_x_tags.tags_id\n" . - "\t\tWHERE t1.id in\n\t\t\t("); - my $main_sql_mid=(")\n\t\t) AS subselect\n" . - "\tINNER JOIN files_x_tags ON subselect.files_id=files_x_tags.files_id\n" . - "\tINNER JOIN tags t2 ON files_x_tags.tags_id=t2.id\n" . - "\tWHERE t2.id NOT IN ("); - my $main_sql_end=")\n\tGROUP BY t2.name;"; - while(my $constraint=shift @constraints) - { - my $cid=$constraint->{id}; - push(@ids, $cid); - } - @ids = map( { "\"$_\""; } @ids) unless($self->{postgres}); - my $tagstr=join(", ", @ids); - my $sql = ($main_sql_start . $tagstr . - $main_sql_mid . $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 tagvals.name FROM tagvals\n" . - "INNER JOIN tags_x_tagvals ON tagvals.id=tags_x_tagvals.tagvals_id\n" . - "WHERE tags_x_tagvals.tags_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 $main_sql_start=("SELECT artists.name\n" . - "\tFROM (SELECT files_id FROM tags\n" . - "\t\tINNER JOIN files_x_tags ON tags.id=files_x_tags.tags_id\n" . - "\t\tWHERE tags.id in\n\t\t\t("); - my $main_sql_end=(")\n\t\t) AS subselect\n" . - "\tINNER JOIN files ON subselect.files_id=files.id\n" . - "\tINNER JOIN artists ON files.artists_id=artists.id\n" . - "\n\tGROUP BY artists.name;"); - while(my $constraint=shift @constraints) - { - my $cid=$constraint->{id}; - push(@ids, $cid); - } - @ids = map( { "\"$_\""; } @ids) unless($self->{postgres}); - my $tagstr=join(", ", @ids); - my $sql = ($main_sql_start . $tagstr . - $main_sql_end); - print "SQL: $sql\n"; + 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"); 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}); - } - my $main_sql_start=("SELECT albums.name\n" . - "\tFROM (SELECT files_id FROM tags\n" . - "\t\tINNER JOIN files_x_tags ON tags.id=files_x_tags.tags_id\n" . - "\t\tWHERE tags.id in\n\t\t\t("); - my $main_sql_end=(")\n\t\t) AS subselect\n" . - "\tINNER JOIN files ON subselect.files_id=files.id\n" . - "\tINNER JOIN albums ON files.albums_id=albums.id\n" . - "\n\tGROUP BY albums.name;"); - while(my $constraint=shift @constraints) - { - my $cid=$constraint->{id}; - push(@ids, $cid); - } - @ids = map( { "\"$_\""; } @ids) unless($self->{postgres}); - my $str=join(", ", @ids); - my $sql = ($main_sql_start . $str . - $main_sql_end); - 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)=@_; - my $sql=("SELECT albums.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.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)=@_; - my $sql=("SELECT files.name FROM files\n\t" . - "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; - @names = map { s/.*\///; $_; } @names; - 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; - @names = map { s/.*\///; $_;} @names; - print "TRACKS: ", join(', ', @names), "\n"; - return(@names); -} - -sub tracks -{ - my($self, @constraints)=@_; - # FIXME: rework PathElements - if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist") + my $tags={}; + for my $pair (@$result) { - return $self->artist_tracks($constraints[$#constraints]->{id}); + push(@{$tags->{$pair->[0]}}, $pair->[1]); } - 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 $main_sql_start=("SELECT files.name\n" . - "\tFROM (SELECT files_id FROM tags\n" . - "\t\tINNER JOIN files_x_tags ON tags.id=files_x_tags.tags_id\n" . - "\t\tWHERE tags.id in\n\t\t\t("); - my $main_sql_end=(")\n\t\t) AS subselect\n" . - "\tINNER JOIN files ON files.id=subselect.files_id" . - "\tGROUP BY files.name;"); - my @ids; - while(my $constraint=shift @constraints) - { - my $cid=$constraint->{id}; - push(@ids, $cid); - } - @ids = map( { "\"$_\""; } @ids) unless($self->{postgres}); - my $str=join(", ", @ids); - my $sql = ($main_sql_start . $str . - $main_sql_end); - print "SQL: $sql\n"; - my $result=$self->cmd_rows($sql); - my @names=map { $_->[0]; } @$result; - @names = map { s/.*\///; $_; } @names; - print "TRACKS: ", join(', ', @names), "\n"; - return(@names); + return $tags; } -sub filename +sub tag_has_values { - my($self, @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); - return($self->{absbase} . "/$path/$name"); - } - die("DB::filename: unhandled case\n"); #FIXME + 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 id +sub relativise { - my($self, $type, $val)=@_; - my $sql="SELECT id FROM $type WHERE name=?"; - my ($id)=$self->cmd_onerow($sql, $val); - return($id); + my($self, $path, $name, $mountpoint, $querypath)=@_; + my $rpath="$self->{absbase}/$path"; + my $vpath=$mountpoint . $querypath; + my @path=split(/\//,$rpath); + my @rel=split(/\//,$vpath); + # drop filename from rel + pop @rel; + # absolute paths have empty first element due to leading / + shift(@path) if($path[0] eq ""); + shift(@rel) if($rel[0] eq ""); + # f: /home/foo/bar/baz.mp3 + # r: /home/ianb/music/albums + while(@path && @rel && ($path[0] eq $rel[0])) + { + shift(@path); + shift(@rel); + } + my $upcount=scalar(@rel); + my $result="../" x $upcount; + $result .= join("/",@path); + $result .= "/$name"; + return $result; } sub add { my($self,$path)=@_; - my $relpath=$path; - $relpath =~ s/^\Q$self->{base}\E\/?//; + my $relpath=Cwd::abs_path($path); + $relpath =~ s/^\Q$self->{absbase}\E\/?//; my($filepart,$pathpart); - if($path !~ /\//) + if($relpath !~ /\//) { $pathpart=''; $filepart=$relpath; @@ -382,37 +225,57 @@ sub add { ($pathpart, $filepart) = ($relpath =~ /(.*)\/(.*)/); } - my $file=ID3FS::AudioFile->new($path); + my $file=ID3FS::AudioFile->new($path, $self->{me}); return unless(defined($file)); my $artist=$file->artist(); my $album=$file->album(); my $v1genre=$file->v1genre(); my $year=$file->year(); my $audiotype=$file->audiotype(); - my $tags=$file->tags(); + my @tags=$file->tags(); my $haspic=$file->haspic(); + my $channels=$file->channels(); + my $bitrate=$file->bitrate(); + my $samplerate=$file->samplerate(); $artist=undef unless($self->ok($artist)); + print "$self->{me}: $path: no artist tag defined\n" unless(defined($artist)); my $artist_id=$self->add_to_table("artists", $artist); my $path_id=$self->add_to_table("paths", $pathpart); $album=undef unless($self->ok($album)); +# if($self->{verbose} && !defined($album)) FIXME + if(!defined($album)) + { + print "$self->{me}: $path: no album tag defined\n"; + } + my $albums_id=$self->add_to_table("albums", $album); my $file_id=$self->add_to_table("files", $filepart, { "artists_id" => $artist_id, "albums_id" => $albums_id, "paths_id" => $path_id }); - for my $tag (keys %$tags) + if(@tags) { - $self->add_tag($file_id, $tag, $tags->{$tag}); + for my $tag (@tags) + { + $self->add_tag($file_id, @$tag); + } + } + else + { + $self->add_tag($file_id, "UNTAGGED"); } - if($self->ok($year)) + $year="UNKNOWN" if(!$self->ok($year) || $year =~ /^0+$/); + $year+=1900 if($year=~/^\d\d$/); + $self->add_tag($file_id, "year", $year); + if($year=~/^(\d\d\d)\d$/) { - $self->add_tag($file_id, "year", $year); - if($year=~/^(\d\d\d)\d$/) - { - $self->add_tag($file_id, "decade", "${1}0s"); - } + $self->add_tag($file_id, "decade", "${1}0s"); + } + else + { + $self->add_tag($file_id, "decade", "UNKNOWN"); } if($self->ok($v1genre)) @@ -424,32 +287,69 @@ sub add { $self->add_tag($file_id, "haspic", undef); } + + if($self->ok($audiotype)) + { + $self->add_tag($file_id, "audiotype", $audiotype); + } + else + { + # should never happen + $self->add_tag($file_id, "audiotype", "UNKNOWN"); + } + + if($self->ok($channels)) + { + if ($channels eq "2") { $channels="stereo"; } + elsif ($channels eq "1") { $channels="mono"; } + elsif ($channels eq "0") { $channels="UNKNOWN"; } + $self->add_tag($file_id, "channels", $channels); + } + + if($self->ok($bitrate)) + { + $bitrate="UNKNOWN" if($bitrate=~/^0+$/); + $self->add_tag($file_id, "bitrate", $bitrate); + } + + if($self->ok($samplerate)) + { + $samplerate="UNKNOWN" if($samplerate=~/^0+$/); + $self->add_tag($file_id, "samplerate", $samplerate); + } + } sub add_tag { - my($self, $file_id, $tag, $val)=@_; - my $tag_id=$self->add_to_table("tags", $tag); + 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($val)) + if(defined($value) && length($value)) { - my $val_id=$self->add_to_table("tagvals", $val); - $self->add_relation("tags_x_tagvals", - { "tags_id" => $tag_id, - "tagvals_id" => $val_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" => $val_id }); } } sub add_to_table { my($self, $table, $name, $extradata)=@_; - my $id=$self->lookup_id($table, $name); + my $parent=undef; + if($extradata && $extradata->{parents_id}) + { + $parent=$extradata->{parents_id}; + } + my $id=$self->lookup_id($table, $name, $parent); unless(defined($id)) { my $sql="INSERT INTO $table ("; - $sql .= "id, " if($self->{postgres}); my @fields=qw(name); if(defined($extradata)) { @@ -457,7 +357,6 @@ sub add_to_table } $sql .= join(", ", @fields); $sql .=") VALUES ("; - $sql .=") nextval('seq'), " if($self->{postgres}); $sql .= join(", ", map { "?"; } @fields); $sql .= ");"; $id=$self->cmd_id($sql, $name, map { $extradata->{$_} || ""; } sort keys %$extradata); @@ -477,22 +376,88 @@ sub add_relation $self->cmd($sql, map { $fields->{$_}; } sort keys(%$fields)); } -sub lookup_id +sub files_in { - my($self, $table, $name)=@_; - my($id)=$self->cmd_onerow("SELECT id FROM $table where name=?", $name); - return $id; + my ($self, $dir)=@_; + my $sql=("SELECT files.name FROM files\n" . + "INNER JOIN paths ON files.paths_id=paths.id\n" . + "WHERE paths.name=?\n"); + return($self->cmd_firstcol($sql, $dir)); } -sub tag_has_values +sub unindex { - my($self, $id)=@_; - my $sql=("SELECT COUNT(*) FROM tags\n\t" . - "INNER JOIN tags_x_tagvals ON tags.id=tags_x_tagvals.tags_id\n\t" . - "INNER JOIN tagvals ON tagvals.id=tags_x_tagvals.tagvals_id\n\t" . - "WHERE tags.id=?\n"); - my ($rows)=$self->cmd_onerow($sql, $id); - return $rows; + my($self, $path, $file)=@_; + my $sql=("DELETE FROM files WHERE id IN (" . + "\tSELECT files.id FROM files\n" . + "\tINNER JOIN paths ON paths.id=files.paths_id\n" . + "\tWHERE paths.name=? and files.name=? )\n"); + $self->cmd_rows($sql, $path, $file); +} + + +sub prune_directories +{ + my($self)=@_; + my $sql=("SELECT name, id FROM paths\n"); + my $pathsref=$self->cmd_rows($sql); + my @ids=(); + for my $pathpair (@$pathsref) + { + my($path, $id)=@$pathpair; + my $fullpath="$self->{absbase}/$path"; + unless(-d $fullpath) + { + push(@ids, $id) + } + } + $self->prune_paths(@ids); + return scalar(@ids); +} + +sub prune_paths +{ + my($self, @ids)=@_; + return unless(@ids); + my $sql=("DELETE FROM files WHERE paths_id IN (\n\t" . + join(', ', map { "\"$_\""; } @ids). "\n\t)"); + $self->cmd($sql); +} + +sub remove_unused +{ + my($self)=@_; + my $sql=<<'EOT'; + DELETE FROM artists WHERE id IN ( + SELECT artists.id FROM artists + LEFT JOIN files ON files.artists_id=artists.id + WHERE files.id IS NULL); + + DELETE FROM albums WHERE id IN ( + SELECT albums.id FROM albums + LEFT JOIN files ON files.albums_id=albums.id + WHERE files.id IS NULL); + + DELETE FROM paths WHERE id IN ( + SELECT paths.id FROM paths + LEFT JOIN files ON files.paths_id=paths.id + WHERE files.id IS NULL); + + DELETE FROM files_x_tags WHERE files_id IN ( + SELECT files_x_tags.files_id FROM files_x_tags + LEFT JOIN files ON files.id=files_x_tags.files_id + WHERE files.id IS NULL); + + DELETE FROM tags WHERE id IN ( + SELECT tags.id FROM tags + 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); + $self->cmd($_) for (@sql); } sub relation_exists @@ -517,6 +482,22 @@ sub ok return(defined($thing) && length($thing) && $thing =~ /\S+/); } +# actually call the database +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; +} + +# pass cmd to db, ignore response sub cmd { my ($self, @args)=@_; @@ -524,6 +505,7 @@ sub cmd $self->cmd_sth(@args); } +# return one row sub cmd_onerow { my ($self, @args)=@_; @@ -531,6 +513,7 @@ sub cmd_onerow return($sth->fetchrow_array()); } +# returns all rows sub cmd_rows { my ($self, @args)=@_; @@ -538,6 +521,14 @@ sub cmd_rows return $sth->fetchall_arrayref(); } +# returns just the first column +sub cmd_firstcol +{ + my ($self, @args)=@_; + return(map { $_->[0] } @{$self->cmd_rows(@args)}); +} + +# runs cmd, returns id of last insert sub cmd_id { my ($self, @args)=@_; @@ -548,15 +539,22 @@ sub cmd_id sub last_insert_id { my $self=shift; - if($self->{postgres}) - { - return $self->{dbh}->last_insert_id(undef, undef, undef, undef, - { sequence => "seq" }); - } - else + return $self->{dbh}->last_insert_id("","","",""); +} + +# lookup id of $name in $table, also matching on $parent if needed +sub lookup_id +{ + my($self, $table, $name, $parent)=@_; + my $sql="SELECT id FROM $table where name=?"; + my @args=($name); + if($parent) { - return $self->{dbh}->last_insert_id("","","",""); + $sql .= " AND parents_id=?"; + push(@args, $parent); } + my($id)=$self->cmd_onerow($sql, @args); + return $id; } __DATA__ @@ -567,39 +565,40 @@ CREATE TABLE id3fs ( ); CREATE TABLE paths ( - id INTEGER PRIMARY KEY, - name text + id INTEGER, + name text, + PRIMARY KEY(id ASC) ); CREATE TABLE artists ( - id INTEGER PRIMARY KEY, - name text + id INTEGER, + name text, + PRIMARY KEY(id ASC) ); CREATE TABLE albums ( - id INTEGER PRIMARY KEY, - name text + id INTEGER, + name text, + PRIMARY KEY(id ASC) ); CREATE TABLE files ( - id INTEGER PRIMARY KEY, + id INTEGER, name text, artists_id, albums_id, paths_id, + PRIMARY KEY(id ASC), FOREIGN KEY(artists_id) REFERENCES artists(id) ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY(albums_id) REFERENCES albums(id) ON DELETE CASCADE ON UPDATE CASCADE, FOREIGN KEY(paths_id) REFERENCES paths(id) ON DELETE CASCADE ON UPDATE CASCADE ); CREATE TABLE tags ( - id INTEGER PRIMARY KEY, - name text -); - -CREATE TABLE tagvals ( - id INTEGER PRIMARY KEY, - name text + id INTEGER, + parents_id INTEGER, + name text, + PRIMARY KEY(id ASC) ); CREATE TABLE files_x_tags ( @@ -609,9 +608,16 @@ CREATE TABLE files_x_tags ( FOREIGN KEY(tags_id) REFERENCES tags(id) ON DELETE CASCADE ON UPDATE CASCADE ); -CREATE TABLE tags_x_tagvals ( - tags_id INTEGER, - tagvals_id INTEGER, - FOREIGN KEY(tags_id) REFERENCES tags(id) ON DELETE CASCADE ON UPDATE CASCADE, - FOREIGN KEY(tagvals_id) REFERENCES tagvals(id) ON DELETE CASCADE ON UPDATE CASCADE -); +CREATE INDEX idx_fxt_both ON files_x_tags (files_id, tags_id) + +CREATE INDEX idx_fxt_tags ON files_x_tags (tags_id) + +CREATE INDEX idx_files_id_name ON files (id, name) + +CREATE INDEX idx_files_name_id ON files (name, id) + +CREATE INDEX idx_tags_id_parent_name ON tags (id, parents_id, name) + +CREATE INDEX idx_tags_parent_id_name ON tags (parents_id, id, name) + +CREATE INDEX idx_tags_name ON tags (name)