X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FDB.pm;h=99728646fcab5283a1ac85eb9fa701ef54408bc9;hb=96226f1036a7c15539fe93b355361f878ff5c2dd;hp=984bec0248ba228d0f62e07e676cbec72acf9c74;hpb=a77a37a3794cc178915a3c0982c6043e918b96a4;p=id3fs.git

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index 984bec0..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);
 }
@@ -195,13 +197,6 @@ sub relativise
     # 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
-	# should never happen
-	# FIXME
-	return $name;
-    }
     # f: /home/foo/bar/baz.mp3
     # r: /home/ianb/music/albums
     while(@path && @rel && ($path[0] eq $rel[0]))
@@ -240,13 +235,17 @@ sub add
     my $audiotype=$file->audiotype();
     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))
+#    if($self->{verbose} && !defined($album)) FIXME
+    if(!defined($album))
     {
 	print "$self->{me}: $path: no album tag defined\n";
     }
@@ -256,12 +255,22 @@ sub add
 				    { "artists_id" => $artist_id,
 				      "albums_id"  => $albums_id,
 				      "paths_id"   => $path_id });
-    for my $tag (@tags)
+
+    $self->remove_tag_refs($file_id);
+    if(@tags)
+    {
+	for my $tag (@tags)
+	{
+	    $self->add_tag($file_id, @$tag);
+	}
+    }
+    else
     {
-	$self->add_tag($file_id, @$tag);
+	$self->add_tag($file_id, "UNTAGGED");
     }
 
-    $year="UNKNOWN" unless($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$/)
     {
@@ -286,6 +295,32 @@ sub add
     {
 	$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
@@ -344,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)=@_;
@@ -366,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)
 	{
@@ -535,19 +580,19 @@ CREATE TABLE id3fs (
 CREATE TABLE paths (
     id INTEGER,
     name text,
-    PRIMARY KEY(id DESC)
+    PRIMARY KEY(id ASC)
 );
 
 CREATE TABLE artists (
     id INTEGER,
     name text,
-    PRIMARY KEY(id DESC)
+    PRIMARY KEY(id ASC)
 );
 
 CREATE TABLE albums (
     id INTEGER,
     name text,
-    PRIMARY KEY(id DESC)
+    PRIMARY KEY(id ASC)
 );
 
 CREATE TABLE files (
@@ -556,7 +601,7 @@ CREATE TABLE files (
     artists_id,
     albums_id,
     paths_id,
-    PRIMARY KEY(id DESC),
+    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
@@ -566,7 +611,7 @@ CREATE TABLE tags (
     id INTEGER,
     parents_id INTEGER,
     name text,
-    PRIMARY KEY(id DESC)
+    PRIMARY KEY(id ASC)
 );
 
 CREATE TABLE files_x_tags (