X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FDB.pm;h=14f55c5b723e14f830999110575adaa4b13a4c68;hb=3cfb86272c06fe583e4eea36c27a5383115ff4c3;hp=3e91bddf70f269fde77fc319cc206a7e5ae0b4ac;hpb=421a6e39b3b0eb3b160e5acd882e2c3805842249;p=id3fs.git diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm index 3e91bdd..14f55c5 100644 --- a/lib/ID3FS/DB.pm +++ b/lib/ID3FS/DB.pm @@ -19,24 +19,13 @@ sub new $self->{me}=shift; $self->{verbose}=shift; my $init=shift; - my $dbpath=shift; $self->{base}=shift; - my $fallbackdir=shift; - - $dbpath=$self->find_db($init, $dbpath, $fallbackdir); - return undef unless($dbpath); + $self->{dbpath}=shift || ($self->{base} . "/" . $dbfile); $self->{absbase}=Cwd::abs_path($self->{base}); - my $connectstr="dbi:SQLite:dbname=$dbpath"; - my ($user, $pass)=("", ""); - if($self->{postgres}) - { - $connectstr="dbi:Pg:dbname=id3fs"; - $user="ianb"; - $pass="foo"; - } - my $exists=-f $dbpath; - $self->{dbh}=DBI->connect($connectstr, $user, $pass, + my $connectstr="dbi:SQLite:dbname=$self->{dbpath}"; + my $exists=-f $self->{dbpath}; + $self->{dbh}=DBI->connect($connectstr, undef, undef, { AutoCommit=>1 } ); unless(defined($self->{dbh})) { @@ -57,41 +46,36 @@ sub new sub find_db { - my($self, $init, $dbpath, $fallbackdir)=@_; - my $file=undef; + # class method + shift if(ref($_[0]) eq "ID3FS::DB"); + + my($me, $init, @dirs)=@_; 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) + for my $dir (@dirs) { - my $path=Cwd::abs_path($fallbackdir); + my $path=Cwd::abs_path($dir); do { - $file="$path/$dbfile"; $base=$path; $path=~s/(.*)\/.*/$1/; } - while(! -f $file && length($path) && -d $path); - if(! -f $file) + while(! -f "$base/$dbfile" && length($path) && -d $path); + if(-f "$base/$dbfile") { - $file="$fallbackdir/$dbfile"; - $base=$fallbackdir; + return $base; } } - if(!-f $file && !$init) + if(!-f "$base/$dbfile") { - print "$self->{me}: db not found at $file\n"; - return undef; + unless($init) + { + print "$me: db not found at $base/$dbfile\n"; + return undef; + } + $base=$dirs[0]; + } - $self->{base}=$base; - return $file; + return $base; } sub base_dir { return shift->{base}; } @@ -105,23 +89,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()); } @@ -164,12 +131,30 @@ sub last_update return $newval; } -sub id +sub bare_tags { - my($self, $type, $val)=@_; - my $sql="SELECT id FROM $type WHERE name=?"; - my ($id)=$self->cmd_onerow($sql, $val); - return($id); + my($self)=@_; + my $sql=("SELECT tags.name FROM tags\n" . + "WHERE tags.parents_id=''\n" . + "GROUP BY tags.name\n"); + my @names=$self->cmd_firstcol($sql); + return (@names); +} + +sub tags_with_values +{ + 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 tag_has_values @@ -183,7 +168,8 @@ sub tag_has_values sub relativise { - my($self, $path, $name, $mountpoint, $id3fs_path)=@_; + my($self, $path, $name, $mountpoint)=@_; + my $id3fs_path=$self->{dbpath}; $id3fs_path=~s/(.*)\/.*/$1/; my $rpath="$self->{absbase}/$path"; my $vpath="$mountpoint/$id3fs_path"; @@ -217,8 +203,8 @@ sub relativise 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($relpath !~ /\//) { @@ -265,6 +251,10 @@ sub add { $self->add_tag($file_id, "decade", "${1}0s"); } + else + { + $self->add_tag($file_id, "decade", "UNKNOWN"); + } if($self->ok($v1genre)) { @@ -275,6 +265,11 @@ sub add { $self->add_tag($file_id, "haspic", undef); } + + if($self->ok($audiotype)) + { + $self->add_tag($file_id, "audiotype", $audiotype); + } } sub add_tag @@ -298,11 +293,15 @@ sub add_tag 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)) { @@ -310,7 +309,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); @@ -333,18 +331,28 @@ sub add_relation sub files_in { 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); +# print "files_in: SQL: $sql\n"; + return($self->cmd_firstcol($sql, $dir)); +} + +sub unindex +{ + 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 ORDER BY name\n"); + my $sql=("SELECT name, id FROM paths\n"); my $pathsref=$self->cmd_rows($sql); my @ids=(); for my $pathpair (@$pathsref) @@ -366,7 +374,7 @@ sub prune_paths return unless(@ids); my $sql=("DELETE FROM files WHERE paths_id IN (\n\t" . join(', ', map { "\"$_\""; } @ids). "\n\t)"); - print "SQL: \n", $sql, "\n"; +# print "SQL: \n", $sql, "\n"; $self->cmd($sql); } @@ -401,7 +409,7 @@ sub remove_unused VACUUM EOT - print "SQL: $sql\n"; +# print "SQL: $sql\n"; my @sql=split(/\n\n/, $sql); $self->cmd($_) for (@sql); } @@ -479,21 +487,20 @@ 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("","","",""); - } + return $self->{dbh}->last_insert_id("","","",""); } sub lookup_id { - my($self, $table, $name)=@_; - my($id)=$self->cmd_onerow("SELECT id FROM $table where name=?", $name); + my($self, $table, $name, $parent)=@_; + my $sql="SELECT id FROM $table where name=?"; + my @args=($name); + if($parent) + { + $sql .= " AND parents_id=?"; + push(@args, $parent); + } + my($id)=$self->cmd_onerow($sql, @args); return $id; } @@ -505,35 +512,40 @@ CREATE TABLE id3fs ( ); CREATE TABLE paths ( - id INTEGER PRIMARY KEY, - name text + id INTEGER, + name text, + PRIMARY KEY(id DESC) ); CREATE TABLE artists ( - id INTEGER PRIMARY KEY, - name text + id INTEGER, + name text, + PRIMARY KEY(id DESC) ); CREATE TABLE albums ( - id INTEGER PRIMARY KEY, - name text + id INTEGER, + name text, + PRIMARY KEY(id DESC) ); CREATE TABLE files ( - id INTEGER PRIMARY KEY, + id INTEGER, name text, artists_id, albums_id, paths_id, + PRIMARY KEY(id DESC), 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, + id INTEGER, parents_id INTEGER, - name text + name text, + PRIMARY KEY(id DESC) ); CREATE TABLE files_x_tags ( @@ -543,3 +555,16 @@ CREATE TABLE files_x_tags ( FOREIGN KEY(tags_id) REFERENCES tags(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)