X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FDB.pm;h=fced79ecac28aef2ba70212d674843b4f7f61914;hb=4ed458e770bcb52bf90b05844f2a0c5a9713ee6f;hp=99306091241d5a70f9116b45a0fac3cb5d363adf;hpb=eb98d37f4a2ff614889f70f0dfa639ac8600a920;p=id3fs.git

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index 9930609..fced79e 100644
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -85,6 +85,11 @@ sub find_db
 	    $base=$fallbackdir;
 	}
     }
+    else
+    {
+	print "$self->{me}: $fallbackdir: not a directory\n";
+	return undef;
+    }
     if(!-f $file && !$init)
     {
 	print "$self->{me}: db not found at $file\n";
@@ -164,241 +169,40 @@ sub last_update
     return $newval;
 }
 
-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 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);
-    }
-    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;";
-    while(my $constraint=shift @constraints)
-    {
-	my $cid=$constraint->{id};
-	push(@ids, $cid);
-    }
-    @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);
-    my @tagnames=map { $_->[0]; } @$result;
-    print "SUBNAMES: ", join(', ', @tagnames), "\n";
-    return(@tagnames);
-}
-
-sub tag_values
-{
-    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
+sub bare_tags
 {
-    my($self, @constraints)=@_;
-    if(!@constraints) # /ALL
-    {
-	my $sql="SELECT DISTINCT name FROM artists;";
-	my $tags=$self->cmd_rows($sql);
-	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 ON subselect.files_id=files.id\n" .
-		      "\tINNER JOIN artists ON files.artists_id=artists.id\n" .
-		      "\n\tGROUP BY artists.name;");
-    while(my $constraint=shift @constraints)
-    {
-	my $cid=$constraint->{id};
-	push(@ids, $cid);
-    }
-    @ids = map( { "\"$_\""; } grep { defined; } @ids) unless($self->{postgres});
-    my $tagstr=join(", ", @ids);
-    my $sql = ($main_sql_start . $tagstr .
-	       $main_sql_end);
-    print "SQL: $sql\n";
-    my $result=$self->cmd_rows($sql);
-    my @tagnames=map { $_->[0]; } @$result;
-    print "ARTISTS: ", join(', ', @tagnames), "\n";
-    return(@tagnames);
+    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 albums
+sub tags_with_values
 {
-    my($self, @constraints)=@_;
-    my @ids=();
-    # FIXME: rework PathElements
-    if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist")
-    {
-	return $self->artist_albums($constraints[$#constraints]->{id});
-    }
-    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 ON subselect.files_id=files.id\n" .
-		      "\tINNER JOIN albums ON files.albums_id=albums.id\n" .
-		      "\n\tGROUP BY albums.name;");
-    while(my $constraint=shift @constraints)
-    {
-	my $cid=$constraint->{id};
-	push(@ids, $cid);
-    }
-    @ids = map( { "\"$_\""; } grep { defined; } @ids) unless($self->{postgres});
-    my $str=join(", ", @ids);
-    my $sql = ($main_sql_start . $str .
-	       $main_sql_end);
+    # FIXME: only shows one level of tag depth
+    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 @names=map { $_->[0]; } @$result;
-    print "ALBUMS: ", join(', ', @names), "\n";
-    return(@names);
-}
-
-sub artist_albums
-{
-    my($self, $artist_id)=@_;
-    my $sql=("SELECT albums.name FROM files\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.name <> ''\n\t" .
-	     "GROUP BY albums.name\n");
-    print "ARTIST_ALBUMS SQL: $sql\n";
-    my $result=$self->cmd_rows($sql, $artist_id);
-    my @albums=map { $_->[0]; } @$result;
-    print "ALBUMS: ", join(', ', @albums), "\n";
-    return(@albums);
-}
-
-sub artist_tracks
-{
-    my($self, $artist_id)=@_;
-    my $sql=("SELECT files.name FROM files\n\t" .
-	     "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;
-    print "ARTISTTRACKS: ", join(', ', @names), "\n";
-    return(@names);
-}
-
-sub album_tracks
-{
-    my($self, $artist_id, $album_id)=@_;
-    my $sql=("SELECT files.name FROM files\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($artist_id, $album_id): $sql\n";
-    my $result=$self->cmd_rows($sql, $artist_id, $album_id);
-    my @names=map { $_->[0]; } @$result;
-    print "TRACKS: ", join(', ', @names), "\n";
-    return(@names);
-}
-
-sub tracks
-{
-    my($self, @constraints)=@_;
-    # FIXME: rework PathElements
-    if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist")
+    my $tags={};
+    for my $pair (@$result)
     {
-	return $self->artist_tracks($constraints[$#constraints]->{id});
+	push(@{$tags->{$pair->[0]}}, $pair->[1]);
     }
-    elsif(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Album")
-    {
-	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)
-    {
-	my $cid=$constraint->{id};
-	push(@ids, $cid);
-    }
-    @ids = map( { "\"$_\""; } grep { defined; } @ids) unless($self->{postgres});
-    my $str=join(", ", @ids);
-    my $sql = ($main_sql_start . $str .
-	       $main_sql_end);
-    print "SQL: $sql\n";
-    my $result=$self->cmd_rows($sql);
-    my @names=map { $_->[0]; } @$result;
-    print "TRACKS: ", join(', ', @names), "\n";
-    return(@names);
+    return $tags;
 }
 
-sub filename
+sub tag_has_values
 {
-    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 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);
-	my $id3fs_path=join('/', map { $_->{name}; }  @constraints);
-	return($self->relativise($path, $name, $mountpoint, $id3fs_path));
-    }
-    die("DB::filename: unhandled case\n"); #FIXME
+    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
@@ -424,9 +228,9 @@ sub relativise
     {
 	shift(@path);
 	shift(@rel);
-	print "POP ";
+#	print "POP ";
     }
-    print "\n";
+#    print "\n";
     my $upcount=scalar(@rel);
     my $result="../" x $upcount;
     $result .= join("/",@path);
@@ -434,49 +238,13 @@ sub relativise
     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)=@_;
-    my $sql="SELECT id FROM $type WHERE name=?";
-    my ($id)=$self->cmd_onerow($sql, $val);
-    return($id);
-}
-
 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($path !~ /\//)
+    if($relpath !~ /\//)
     {
 	$pathpart='';
 	$filepart=$relpath;
@@ -492,7 +260,7 @@ sub add
     my $v1genre=$file->v1genre();
     my $year=$file->year();
     my $audiotype=$file->audiotype();
-    my $tags=$file->tags();
+    my @tags=$file->tags();
     my $haspic=$file->haspic();
 
     $artist=undef unless($self->ok($artist));
@@ -510,18 +278,20 @@ sub add
 				    { "artists_id" => $artist_id,
 				      "albums_id"  => $albums_id,
 				      "paths_id"   => $path_id });
-    for my $tag (keys %$tags)
+    for my $tag (@tags)
     {
-	$self->add_tag($file_id, $tag, $tags->{$tag});
+	$self->add_tag($file_id, @$tag);
     }
 
-    if($self->ok($year))
+    $year="UNKNOWN" unless($self->ok($year));
+    $self->add_tag($file_id, "year", $year);
+    if($year=~/^(\d\d\d)\d$/)
     {
-	$self->add_tag($file_id, "year", $year);
-	if($year=~/^(\d\d\d)\d$/)
-	{
-	    $self->add_tag($file_id, "decade", "${1}0s");
-	}
+	$self->add_tag($file_id, "decade", "${1}0s");
+    }
+    else
+    {
+	$self->add_tag($file_id, "decade", "UNKNOWN");
     }
 
     if($self->ok($v1genre))
@@ -537,24 +307,31 @@ sub add
 
 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 });
     }
 }
 
 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 (";
@@ -586,35 +363,27 @@ sub add_relation
     $self->cmd($sql, map { $fields->{$_}; } sort keys(%$fields));
 }
 
-sub lookup_id
-{
-    my($self, $table, $name)=@_;
-    my($id)=$self->cmd_onerow("SELECT id FROM $table where name=?", $name);
-    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);
+#    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)=@_;
@@ -640,7 +409,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);
 }
 
@@ -673,17 +442,9 @@ sub remove_unused
        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);
+    VACUUM
 EOT
-    print "SQL: $sql\n";
+#    print "SQL: $sql\n";
     my @sql=split(/\n\n/, $sql);
     $self->cmd($_) for (@sql);
 }
@@ -710,6 +471,20 @@ sub ok
     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
 {
     my ($self, @args)=@_;
@@ -731,6 +506,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)=@_;
@@ -752,6 +533,20 @@ sub last_insert_id
     }
 }
 
+sub lookup_id
+{
+    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;
+}
+
 __DATA__
 
 CREATE TABLE id3fs (
@@ -760,39 +555,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,
-    name text
-);
-
-CREATE TABLE tagvals (
-    id INTEGER PRIMARY KEY,
-    name text
+    id INTEGER,
+    parents_id INTEGER,
+    name text,
+    PRIMARY KEY(id DESC)
 );
 
 CREATE TABLE files_x_tags (
@@ -802,10 +598,3 @@ CREATE TABLE files_x_tags (
     FOREIGN KEY(tags_id)  REFERENCES tags(id)  ON DELETE CASCADE ON UPDATE CASCADE
 );
 
-CREATE TABLE tags_x_tagvals (
-    tags_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
-);
-