X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FDB.pm;h=aa9eaf1b8384315f40fe5ff581a0d4a515188e16;hb=97b9ef0d0c66f3c3d995d74b82f93613e2c81dd4;hp=01b41d8aefdf187a5f19f0ceeec023f3a15c22e6;hpb=c22855a1c82add5238b01fd0aa0f111a0befa24b;p=id3fs.git diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm index 01b41d8..aa9eaf1 100644 --- a/lib/ID3FS/DB.pm +++ b/lib/ID3FS/DB.pm @@ -3,7 +3,8 @@ package ID3FS::DB; use strict; use warnings; use DBI; -use ID3FS::File; +use ID3FS::AudioFile; +use Cwd; our $SCHEMA_VERSION=1; my $dbfile=".id3fs"; @@ -15,21 +16,18 @@ sub new my $self={}; bless($self,$class); - my($dir, $init, $me)=@_; - $self->{dbpath}="$dir/$dbfile"; - $self->{me}=$me; + $self->{me}=shift; + $self->{verbose}=shift; + my $init=shift; + my $dbpath=shift; + $self->{base}=shift; + my $fallbackdir=shift; - my $exists=-f $self->{dbpath}; + $dbpath=$self->find_db($init, $dbpath, $fallbackdir); + return undef unless($dbpath); + $self->{absbase}=Cwd::abs_path($self->{base}); - $self->{postgres}=0; - - unless($self->{postgres}) - { - die("$me: $self->{dbpath}: not found. use --init to create.\n") if(!$exists && !$init); - die("$me: --init used but $self->{dbpath} exists.\n") if($exists && $init); - } - - my $connectstr="dbi:SQLite:dbname=$self->{dbpath}"; + my $connectstr="dbi:SQLite:dbname=$dbpath"; my ($user, $pass)=("", ""); if($self->{postgres}) { @@ -37,25 +35,67 @@ sub new $user="ianb"; $pass="foo"; } + my $exists=-f $dbpath; $self->{dbh}=DBI->connect($connectstr, $user, $pass, { AutoCommit=>1 } ); unless(defined($self->{dbh})) { - die("$me: DB Error: " . $DBI::errstr . "\n"); + die("$self->{me}: DB Error: " . $DBI::errstr . "\n"); } - if($init) + if($exists) { - $self->create(); + $self->checkschema(); } else { - $self->checkschema(); + $self->create(); } - + $self->enable_foreign_keys(); return $self; } +sub find_db +{ + my($self, $init, $dbpath, $fallbackdir)=@_; + my $file=undef; + my $base=undef; + if(defined($dbpath)) + { + $file=$dbpath; + } + if(defined ($self->{base})) + { + $file="$self->{base}/$dbfile" unless defined($file); + $base=$self->{base}; + } + elsif(defined($fallbackdir) && -d $fallbackdir) + { + my $path=Cwd::abs_path($fallbackdir); + do + { + $file="$path/$dbfile"; + $base=$path; + $path=~s/(.*)\/.*/$1/; + } + while(! -f $file && length($path) && -d $path); + if(! -f $file) + { + $file="$fallbackdir/$dbfile"; + $base=$fallbackdir; + } + } + if(!-f $file && !$init) + { + print "$self->{me}: db not found at $file\n"; + return undef; + } + $self->{base}=$base; + return $file; +} + +sub base_dir { return shift->{base}; } + sub create { my($self,$name)=@_; @@ -71,18 +111,19 @@ sub create } else { - my %indexes=( "idx_files_id" => "files(id)", - "idx_fxt_both" => "files_x_tags(files_id, tags_id)", + 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)" ); + "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) VALUES (?)", $SCHEMA_VERSION); + $self->cmd("INSERT INTO id3fs (schema_version, last_update) VALUES (?, ?)", + $SCHEMA_VERSION, time()); } sub checkschema @@ -97,97 +138,125 @@ sub checkschema } } -sub cmd_sth +sub analyze { - 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=shift; + $self->cmd("ANALYZE"); } -sub tags +sub enable_foreign_keys { - my($self, @constraints)=@_; - if(!@constraints) # / + my $self=shift; + $self->cmd("PRAGMA foreign_keys = ON"); +} + +sub last_update +{ + my($self, $newval)=@_; + if(defined($newval)) { - my $sql="SELECT DISTINCT name FROM tags;"; - my $tags=$self->cmd_rows($sql); - return(map { $_->[0]; } @$tags); + $self->cmd("UPDATE id3fs SET last_update=?", $newval); } - my @file_ids=(); - my @tag_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 fxt1\n" . - "\tINNER JOIN files_x_tags fxt2 ON fxt1.files_id=fxt2.files_id\n" . - "\tINNER JOIN tags t2 ON fxt2.tags_id=t2.id\n" . - "\tWHERE t2.id NOT IN ("); - my $main_sql_end=")\n\tGROUP BY t2.name;"; - while(my $constraint=shift @constraints) + else { - print "CONSTRAINT: $constraint->{name}\n"; - my $cid=$constraint->{id}; - push(@tag_ids, $cid); + ($newval)=$self->cmd_onerow("SELECT last_update from id3fs"); } - @tag_ids = map( { "\"$_\""; } @tag_ids) unless($self->{postgres}); - my $tagstr=join(", ", @tag_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); + return $newval; } -sub tag_values +sub id { - my($self, $tag)=@_; - my $sql=("SELECT DISTINCT tagvals.name FROM tags\n" . - "INNER JOIN tags_x_tagvals ON tags.id=tags_x_tagvals.tags_id\n" . - "INNER JOIN tagvals ON tagvals.id=tags_x_tagvals.tagvals_id\n" . - "WHERE tags.name=?"); - my $tags=$self->cmd_rows($sql, $tag); - return(map { $_->[0]; } @$tags); + my($self, $type, $val)=@_; + my $sql="SELECT id FROM $type WHERE name=?"; + my ($id)=$self->cmd_onerow($sql, $val); + return($id); } -sub tag_id +sub tag_has_values { - my($self, $tag)=@_; - my $sql='SELECT id FROM tags WHERE name=?'; - my ($id)=$self->cmd_onerow($sql, $tag); - return($id); + 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)=@_; + $id3fs_path=~s/(.*)\/.*/$1/; + my $rpath="$self->{absbase}/$path"; + my $vpath="$mountpoint/$id3fs_path"; + my @path=split(/\//,$rpath); + my @rel=split(/\//,$vpath); + #absolute paths have empty first element due to leading / + shift(@path) if($path[0] eq ""); + shift(@rel) if($rel[0] eq ""); + if($path[0] ne $rel[0]) + { + #no path in common, return absolute + print "FAIL: NO PATHS IN COMMON\n"; + return $name; + } + # f: /home/foo/bar/baz.mp3 + # r: /home/ianb/music/albums + while(@path && @rel && ($path[0] eq $rel[0])) + { + shift(@path); + shift(@rel); +# print "POP "; + } +# print "\n"; + my $upcount=scalar(@rel); + my $result="../" x $upcount; + $result .= join("/",@path); + $result .= "/$name"; + return $result; } sub add { my($self,$path)=@_; - my $file=ID3FS::File->new($path); + my $relpath=$path; + $relpath =~ s/^\Q$self->{base}\E\/?//; + my($filepart,$pathpart); + if($relpath !~ /\//) + { + $pathpart=''; + $filepart=$relpath; + } + else + { + ($pathpart, $filepart) = ($relpath =~ /(.*)\/(.*)/); + } + 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->album(); - my $tags=$file->tags(); + my $audiotype=$file->audiotype(); + my @tags=$file->tags(); my $haspic=$file->haspic(); - my $file_id=$self->add_to_table("files", $path); - my $artists_id=$self->add_to_table("artists", $artist); - my $albums_id=$self->add_to_table("albums", $album); - for my $tag (keys %$tags) + $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)) + { + 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 (@tags) { - $self->add_tag($file_id, $tag, $tags->{$tag}); + $self->add_tag($file_id, @$tag); } if($self->ok($year)) @@ -198,6 +267,7 @@ sub add $self->add_tag($file_id, "decade", "${1}0s"); } } + if($self->ok($v1genre)) { $self->add_tag($file_id, "v1genre", $v1genre); @@ -207,29 +277,23 @@ sub add { $self->add_tag($file_id, "haspic", undef); } - - $self->add_relation("files_x_artists", - { "files_id" => $file_id, - "artists_id" => $artists_id }); - - $self->add_relation("artists_x_albums", - { "artists_id" => $artists_id, - "albums_id" => $albums_id}); } 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 }); } } @@ -268,11 +332,80 @@ 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)=@_; + $dir=~s/^$self->{base}\/?//; + my $sql=("SELECT files.name FROM files\n" . + "INNER JOIN paths ON files.paths_id=paths.id\n" . + "WHERE paths.name=?\n"); + my $files=$self->cmd_rows($sql, $dir); + return(map { $_->[0]; } @$files); +} + +sub prune_directories +{ + my($self)=@_; + my $sql=("SELECT name, id FROM paths ORDER BY name\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)"); + print "SQL: \n", $sql, "\n"; + $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 @@ -294,7 +427,21 @@ sub relation_exists sub ok { my($self, $thing)=@_; - return(defined($thing) && length($thing)); + 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 @@ -318,6 +465,12 @@ sub cmd_rows return $sth->fetchall_arrayref(); } +sub cmd_firstcol +{ + my ($self, @args)=@_; + return(map { $_->[0] } @{$self->cmd_rows(@args)}); +} + sub cmd_id { my ($self, @args)=@_; @@ -339,13 +492,21 @@ sub last_insert_id } } +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 ( - schema_version INTEGER + schema_version INTEGER, + last_update ); -CREATE TABLE files ( +CREATE TABLE paths ( id INTEGER PRIMARY KEY, name text ); @@ -360,32 +521,27 @@ CREATE TABLE albums ( name text ); -CREATE TABLE tags ( +CREATE TABLE files ( id INTEGER PRIMARY KEY, - name text + name text, + artists_id, + albums_id, + paths_id, + 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 tagvals ( +CREATE TABLE tags ( id INTEGER PRIMARY KEY, + parents_id INTEGER, name text ); CREATE TABLE files_x_tags ( files_id INTEGER, - tags_id INTEGER -); - -CREATE TABLE tags_x_tagvals ( tags_id INTEGER, - tagvals_id INTEGER + FOREIGN KEY(files_id) REFERENCES files(id) ON DELETE CASCADE ON UPDATE CASCADE, + FOREIGN KEY(tags_id) REFERENCES tags(id) ON DELETE CASCADE ON UPDATE CASCADE ); -CREATE TABLE files_x_artists ( - files_id INTEGER, - artists_id INTEGER -); - -CREATE TABLE artists_x_albums ( - artists_id INTEGER, - albums_id INTEGER -);