X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FDB.pm;h=99728646fcab5283a1ac85eb9fa701ef54408bc9;hb=HEAD;hp=794b77c55c524119d488e37de196e23495ccdb0b;hpb=1d88d6f165856d2b8d08f098a2ee1dea22a107d1;p=id3fs.git

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index 794b77c..9972864 100644
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -71,7 +71,8 @@ sub find_db
     my $base=undef;
     for my $dir (@dirs)
     {
-	my $path=Cwd::abs_path($dir);
+#	my $path=Cwd::abs_path($dir);
+	my $path=$dir;
 	do
 	{
 	    $base=$path;
@@ -152,9 +153,10 @@ sub last_update
 sub bare_tags
 {
     my($self)=@_;
-    my $sql=("SELECT tags.name FROM tags\n" .
-	     "WHERE tags.parents_id=''\n" .
-	     "GROUP BY tags.name\n");
+    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);
 }
@@ -253,6 +255,8 @@ sub add
 				    { "artists_id" => $artist_id,
 				      "albums_id"  => $albums_id,
 				      "paths_id"   => $path_id });
+
+    $self->remove_tag_refs($file_id);
     if(@tags)
     {
 	for my $tag (@tags)
@@ -266,6 +270,7 @@ sub add
     }
 
     $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$/)
     {
@@ -374,6 +379,14 @@ sub add_relation
     $self->cmd($sql, map { $fields->{$_}; } sort keys(%$fields));
 }
 
+# remove existing files_x_tags relations before reindexing
+sub remove_tag_refs
+{
+    my ($self, $id)=@_;
+    my $sql="DELETE FROM files_x_tags WHERE files_id=?\n";
+    return($self->cmd($sql, $id));
+}
+
 sub files_in
 {
     my ($self, $dir)=@_;
@@ -396,13 +409,15 @@ sub unindex
 
 sub prune_directories
 {
-    my($self)=@_;
+    my($self,@includepaths)=@_;
     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 $relpath = $self->{base} . "/" . $path;
+	next unless(grep { $relpath =~ /^$_/; } @includepaths);
 	my $fullpath="$self->{absbase}/$path";
 	unless(-d $fullpath)
 	{