X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FDB.pm;h=07a5f863a8e1eec918c731deed37fbd2d1e23d6a;hb=d2b54433e560a84120e89cd6881799889a590b34;hp=11381c6b954cff9470f39585163e712e6cf85066;hpb=7c549737241ec9dd03289a9710bb352b66e60569;p=id3fs.git

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index 11381c6..07a5f86 100644
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -3,7 +3,7 @@ package ID3FS::DB;
 use strict;
 use warnings;
 use DBI;
-use ID3FS::File;
+use ID3FS::AudioFile;
 use Cwd;
 
 our $SCHEMA_VERSION=1;
@@ -17,20 +17,17 @@ sub new
     bless($self,$class);
 
     $self->{me}=shift;
-    $self->{dbpath}=shift;
+    $self->{verbose}=shift;
+    my $init=shift;
+    my $dbpath=shift;
     $self->{base}=shift;
-    $self->{fallbackdir}=shift;
+    my $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}));
+    $dbpath=$self->find_db($init, $dbpath, $fallbackdir);
+    return undef unless($dbpath);
     $self->{absbase}=Cwd::abs_path($self->{base});
 
-    my $connectstr="dbi:SQLite:dbname=$self->{dbpath}";
+    my $connectstr="dbi:SQLite:dbname=$dbpath";
     my ($user, $pass)=("", "");
     if($self->{postgres})
     {
@@ -38,7 +35,7 @@ sub new
 	$user="ianb";
 	$pass="foo";
     }
-    my $exists=-f $self->{dbpath};
+    my $exists=-f $dbpath;
     $self->{dbh}=DBI->connect($connectstr, $user, $pass,
 			      { AutoCommit=>1 } );
     unless(defined($self->{dbh}))
@@ -54,10 +51,51 @@ sub new
     {
 	$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)=@_;
@@ -84,7 +122,8 @@ sub create
 	    $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
@@ -99,6 +138,32 @@ sub checkschema
     }
 }
 
+sub analyze
+{
+    my $self=shift;
+    $self->cmd("ANALYZE");
+}
+
+sub enable_foreign_keys
+{
+    my $self=shift;
+    $self->cmd("PRAGMA foreign_keys = ON");
+}
+
+sub last_update
+{
+    my($self, $newval)=@_;
+    if(defined($newval))
+    {
+	$self->cmd("UPDATE id3fs SET last_update=?", $newval);
+    }
+    else
+    {
+	($newval)=$self->cmd_onerow("SELECT last_update from id3fs");
+    }
+    return $newval;
+}
+
 sub cmd_sth
 {
     my($self, $sql, @params)=@_;
@@ -118,6 +183,7 @@ 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);
@@ -125,24 +191,23 @@ sub 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;";
+			"\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)
     {
-	print "CONSTRAINT: $constraint->{name}\n";
 	my $cid=$constraint->{id};
 	push(@ids, $cid);
     }
-    @ids = map( { "\"$_\""; } @ids) unless($self->{postgres});
+    @ids = map( { "\"$_\""; } grep { defined; } @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);
@@ -153,13 +218,14 @@ sub tags
 
 sub tag_values
 {
-    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, $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
@@ -172,24 +238,12 @@ sub artists
 	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_x_artists ON subselect.files_id=files_x_artists.files_id\n" .
-		      "\tINNER JOIN artists ON artists.id=files_x_artists.artists_id\n" .
-		      "\n\tGROUP BY artists.name;");
-    while(my $constraint=shift @constraints)
-    {
-	print "CONSTRAINT: $constraint->{name}\n";
-	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);
+    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;
@@ -204,27 +258,15 @@ sub albums
     # FIXME: rework PathElements
     if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist")
     {
-	return $self->artist_albums($constraints[$#constraints]->{id});
+	return $self->artist_albums($constraints[$#constraints]->{id}, @constraints);
     }
-    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_x_albums ON subselect.files_id=files_x_albums.files_id\n" .
-		      "\tINNER JOIN albums ON albums.id=files_x_albums.albums_id\n" .
-		      "\n\tGROUP BY albums.name;");
-    while(my $constraint=shift @constraints)
-    {
-	print "CONSTRAINT: $constraint->{name}\n";
-	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 $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";
@@ -233,11 +275,14 @@ sub albums
 
 sub artist_albums
 {
-    my($self, $artist_id)=@_;
-    my $sql=("SELECT albums.name FROM artists\n\t" .
-	     "INNER JOIN artists_x_albums ON artists.id=artists_x_albums.artists_id\n\t" .
-	     "INNER JOIN albums ON albums.id=artists_x_albums.albums_id\n\t" .
-	     "WHERE artists.id=?\n\t" .
+    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);
@@ -248,32 +293,33 @@ sub artist_albums
 
 sub artist_tracks
 {
-    my($self, $artist_id)=@_;
-    my $sql=("SELECT files.name FROM artists\n\t" .
-	     "INNER JOIN artists_x_files ON artists.id=files_x_artists.artists_id\n\t" .
-	     "INNER JOIN files ON files.id=files_x_artists.files_id\n\t" .
-	     "WHERE artists.id=?\n\t" .
+    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;
-    @names = map { s/.*\///; } @names;
     print "ARTISTTRACKS: ", join(', ', @names), "\n";
     return(@names);
 }
 
 sub album_tracks
 {
-    my($self, $album_id)=@_;
+    my($self, $artist_id, $album_id)=@_;
     my $sql=("SELECT files.name FROM files\n\t" .
-	     "INNER JOIN files_x_albums ON files.id=files_x_albums.files_id\n\t" .
-	     "INNER JOIN albums ON albums.id=files_x_albums.albums_id\n\t" .
-	     "WHERE albums.id=?\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($album_id): $sql\n";
-    my $result=$self->cmd_rows($sql, $album_id);
+    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);
 }
@@ -284,61 +330,173 @@ sub tracks
     # FIXME: rework PathElements
     if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist")
     {
-	return $self->artist_tracks($constraints[$#constraints]->{id});
+	return $self->artist_tracks($constraints[$#constraints]->{id}, @constraints);
     }
     elsif(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Album")
     {
-	return $self->album_tracks($constraints[$#constraints]->{id});
+	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)
-    {
-	print "CONSTRAINT: $constraint->{name}\n";
-	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 $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;
-    @names = map { s/.*\///; $_; } @names;
     print "TRACKS: ", join(', ', @names), "\n";
     return(@names);
 }
 
 sub filename
 {
-    my($self, @constraints)=@_;
+    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_x_files ON files.id=paths_x_files.files_id\n" .
-		 "INNER JOIN paths ON paths_x_files.paths_id=paths.id\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");
+	my $id3fs_path=join('/', map { $_->{name}; }  @constraints);
+	return($self->relativise($path, $name, $mountpoint, $id3fs_path));
     }
     die("DB::filename: unhandled case\n"); #FIXME
 }
 
+sub tags_subselect
+{
+    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_id FROM tags t1\n" .
+	     "\tINNER JOIN files_x_tags ON t1.id=files_x_tags.tags_id\n" .
+	     "\tINNER JOIN tags_x_tagvals ON t1.id=tags_x_tagvals.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.id=$tag AND tags_x_tagvals.tagvals_id=$val )");
+    }
+    if(@clauses)
+    {
+	$sql .= "\tWHERE\n\t\t" . join("\n\t\tOR ", @clauses) . "\n";
+    }
+    return $sql;
+}
+
+
+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 bare_tags
+{
+    my($self)=@_;
+    my $sql=("SELECT tags.name FROM tags\n" .
+	     "LEFT JOIN tags_x_tagvals ON tags.id=tags_x_tagvals.tags_id\n" .
+	     "WHERE tags_x_tagvals.tags_id IS NULL\n" .
+	     "GROUP BY tags.name\n");
+    my $result=$self->cmd_rows($sql);
+    my @names=map { $_->[0]; } @$result;
+    return (@names);
+}
+
+sub tags_with_values
+{
+    my($self)=@_;
+    my $sql=("SELECT tags.name, 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" .
+	     "GROUP BY tags.name, tagvals.name\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)=@_;
-    print "ID: $type $val\n";
     my $sql="SELECT id FROM $type WHERE name=?";
     my ($id)=$self->cmd_onerow($sql, $val);
     return($id);
@@ -359,48 +517,34 @@ sub add
     {
 	($pathpart, $filepart) = ($relpath =~ /(.*)\/(.*)/);
     }
-    my $file=ID3FS::File->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->album();
+    my $audiotype=$file->audiotype();
     my $tags=$file->tags();
     my $haspic=$file->haspic();
 
-    my $file_id=$self->add_to_table("files", $filepart);
+    $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);
-    $self->add_relation("paths_x_files",
-			{ "paths_id" => $path_id,
-			  "files_id" => $file_id});
-
-    for my $tag (keys %$tags)
-    {
-	$self->add_tag($file_id, $tag, $tags->{$tag});
-    }
-
-    my $artist_id;
-    if($self->ok($artist))
+    $album=undef unless($self->ok($album));
+    if($self->{verbose} && !defined($album))
     {
-	$artist_id=$self->add_to_table("artists",  $artist);
-	$self->add_relation("files_x_artists",
-			    { "files_id" => $file_id,
-			      "artists_id" => $artist_id });
+	print "$self->{me}: $path: no album tag defined\n";
     }
 
-    if($self->ok($album))
+    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)
     {
-	my $albums_id=$self->add_to_table("albums", $album);
-	$self->add_relation("files_x_albums",
-			    { "files_id" => $file_id,
-			      "albums_id" => $albums_id});
-	if($self->ok($artist))
-	{
-	    $self->add_relation("artists_x_albums",
-				{ "artists_id" => $artist_id,
-				  "albums_id" => $albums_id});
-	}
+	$self->add_tag($file_id, $tag, $tags->{$tag});
     }
 
     if($self->ok($year))
@@ -481,6 +625,101 @@ sub lookup_id
     return $id;
 }
 
+sub tag_has_values
+{
+    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;
+}
+
+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);
+}
+
+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);
+
+   DELETE FROM tags_x_tagvals WHERE tags_id IN (
+       SELECT tags_x_tagvals.tags_id FROM tags_x_tagvals
+       LEFT JOIN tags ON tags.id=tags_x_tagvals.tags_id
+       WHERE tags.id IS NULL);
+
+   DELETE FROM tagvals WHERE id IN (
+       SELECT tagvals.id FROM tagvals
+       LEFT JOIN tags_x_tagvals ON tags_x_tagvals.tagvals_id=tagvals.id
+       WHERE tags_x_tagvals.tagvals_id IS NULL);
+EOT
+    print "SQL: $sql\n";
+    my @sql=split(/\n\n/, $sql);
+    $self->cmd($_) for (@sql);
+}
+
 sub relation_exists
 {
     my ($self, $relname, $fields)=@_;
@@ -548,12 +787,8 @@ sub last_insert_id
 __DATA__
 
 CREATE TABLE id3fs (
-    schema_version INTEGER
-);
-
-CREATE TABLE files (
-    id INTEGER PRIMARY KEY,
-    name text
+    schema_version INTEGER,
+    last_update
 );
 
 CREATE TABLE paths (
@@ -571,6 +806,17 @@ CREATE TABLE albums (
     name text
 );
 
+CREATE TABLE files (
+    id INTEGER PRIMARY KEY,
+    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 tags (
     id INTEGER PRIMARY KEY,
     name text
@@ -581,32 +827,17 @@ CREATE TABLE tagvals (
     name text
 );
 
-CREATE TABLE paths_x_files (
-    paths_id INTEGER,
-    files_id INTEGER
-);
-
 CREATE TABLE files_x_tags (
     files_id INTEGER,
-    tags_id INTEGER
+    tags_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 tags_x_tagvals (
     tags_id INTEGER,
-    tagvals_id INTEGER
-);
-
-CREATE TABLE files_x_artists (
-    files_id INTEGER,
-    artists_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 TABLE files_x_albums (
-    files_id INTEGER,
-    albums_id INTEGER
-);
-
-CREATE TABLE artists_x_albums (
-    artists_id INTEGER,
-    albums_id INTEGER
-);