X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=lib%2FID3FS%2FDB.pm;h=784abb9ec93fdf98ae3eb023855256de9c5382c5;hb=fa93319dda0cc1919e135d6c93e93f8a11c8d1c6;hp=d0382e8ff167477860fd8d1c552d85fc7614523c;hpb=317d43426db0ebcd827fcae6abb0ca68c6b157d5;p=id3fs.git

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index d0382e8..784abb9 100644
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -4,6 +4,7 @@ use strict;
 use warnings;
 use DBI;
 use ID3FS::File;
+use Cwd;
 
 our $SCHEMA_VERSION=1;
 my $dbfile=".id3fs";
@@ -16,6 +17,8 @@ sub new
     bless($self,$class);
 
     my($dir, $init, $me)=@_;
+    $self->{base}=$dir;
+    $self->{absbase}=Cwd::abs_path($dir);
     $self->{dbpath}="$dir/$dbfile";
     $self->{me}=$me;
 
@@ -69,6 +72,19 @@ sub create
     {
 	$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) VALUES (?)", $SCHEMA_VERSION);
 }
 
@@ -107,23 +123,27 @@ sub tags
 	my $tags=$self->cmd_rows($sql);
 	return(map { $_->[0]; } @$tags);
     }
-    my @file_ids=();
-    my @tag_ids=();
-    my $main_sql_start=("SELECT tags.name FROM files\n" .
-			"  INNER JOIN files_x_tags fxt1 ON files.id=fxt1.files_id\n" .
-			"  INNER JOIN files_x_tags fxt2 ON files.id=fxt2.files_id\n" .
-			"  INNER JOIN tags ON tags.id=fxt2.tags_id\n" .
-			"  WHERE fxt1.tags_id IN \n\t(");
-    my $main_sql_mid=")\n\tAND fxt2.tags_id NOT IN \n\t(";
-    my $main_sql_end=")\n  GROUP BY fxt2.tags_id;";
+    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)
     {
 	print "CONSTRAINT: $constraint->{name}\n";
 	my $cid=$constraint->{id};
-	push(@tag_ids, $cid);
+	push(@ids, $cid);
     }
-    my $sql = ($main_sql_start . join(", ", map { "\"$_\""; } @tag_ids) .
-	       $main_sql_mid   . join(", ", map { "\"$_\""; } @tag_ids) .
+    @ids = map( { "\"$_\""; } @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);
@@ -143,17 +163,205 @@ sub tag_values
     return(map { $_->[0]; } @$tags);
 }
 
-sub tag_id
+sub artists
 {
-    my($self, $tag)=@_;
-    my $sql='SELECT id FROM tags WHERE name=?';
-    my ($id)=$self->cmd_onerow($sql, $tag);
+    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_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);
+    print "SQL: $sql\n";
+    my $result=$self->cmd_rows($sql);
+    my @tagnames=map { $_->[0]; } @$result;
+    print "ARTISTS: ", join(', ', @tagnames), "\n";
+    return(@tagnames);
+}
+
+sub albums
+{
+    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_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 $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 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" .
+	     "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 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" .
+	     "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 $sql=("SELECT files.name FROM albums\n\t" .
+	     "INNER JOIN files_x_albums ON albums.id=files_x_albums.albums_id\n\t" .
+	     "INNER JOIN albums ON albums.id=files_x_albums.albums_id\n\t" .
+	     "WHERE albums.id=?\n\t" .
+	     "GROUP BY files.name\n");
+    print "ALBUM_TRACKS SQL: $sql\n";
+    my $result=$self->cmd_rows($sql, $album_id);
+    my @names=map { $_->[0]; } @$result;
+    @names = map { s/.*\///; } @names;
+    print "TRACKS: ", join(', ', @names), "\n";
+    return(@names);
+}
+
+sub tracks
+{
+    my($self, @constraints)=@_;
+    # FIXME: rework PathElements
+    if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist")
+    {
+	return $self->artist_tracks($constraints[$#constraints]->{id});
+    }
+    elsif(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Album")
+    {
+	# FIXME
+	return(());
+#	return $self->album_tracks($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);
+    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)=@_;
+    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" .
+		 "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");
+    }
+    die("DB::filename: unhandled case\n"); #FIXME
+}
+
+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);
 }
 
 sub add
 {
     my($self,$path)=@_;
+    my $relpath=$path;
+    $relpath =~ s/$self->{base}\/?//;
+    my($filepart,$pathpart);
+    if($path !~ /\//)
+    {
+	$pathpart='';
+	$filepart=$relpath;
+    }
+    else
+    {
+	($pathpart, $filepart) = ($relpath =~ /(.*)\/(.*)/);
+    }
     my $file=ID3FS::File->new($path);
     return unless(defined($file));
     my $artist=$file->artist();
@@ -164,14 +372,40 @@ sub add
     my $tags=$file->tags();
     my $haspic=$file->haspic();
 
-    my $file_id=$self->add_to_table("files", $path);
-    my $artists_id=$self->add_to_table("artists",  $artist);
-    my $albums_id=$self->add_to_table("albums",  $album);
+    my $file_id=$self->add_to_table("files", $filepart);
+    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))
+    {
+	$artist_id=$self->add_to_table("artists",  $artist);
+	$self->add_relation("files_x_artists",
+			    { "files_id" => $file_id,
+			      "artists_id" => $artist_id });
+    }
+
+    if($self->ok($album))
+    {
+	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});
+	}
+    }
+
     if($self->ok($year))
     {
 	$self->add_tag($file_id, "year", $year);
@@ -180,6 +414,7 @@ sub add
 	    $self->add_tag($file_id, "decade", "${1}0s");
 	}
     }
+
     if($self->ok($v1genre))
     {
 	$self->add_tag($file_id, "v1genre", $v1genre);
@@ -189,14 +424,6 @@ sub add
     {
 	$self->add_tag($file_id, "haspic", undef);
     }
-
-    $self->add_relation("files_x_artists",
-			{ "files_id" => $file_id,
-			  "artists_id" => $artists_id });
-
-    $self->add_relation("artists_x_albums",
-		      { "artists_id" => $artists_id,
-			"albums_id" => $albums_id});
 }
 
 sub add_tag
@@ -276,7 +503,7 @@ sub relation_exists
 sub ok
 {
     my($self, $thing)=@_;
-    return(defined($thing) && length($thing));
+    return(defined($thing) && length($thing) && $thing =~ /\S+/);
 }
 
 sub cmd
@@ -332,6 +559,11 @@ CREATE TABLE files (
     name text
 );
 
+CREATE TABLE paths (
+    id INTEGER PRIMARY KEY,
+    name text
+);
+
 CREATE TABLE artists (
     id INTEGER PRIMARY KEY,
     name text
@@ -352,6 +584,11 @@ 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
@@ -367,6 +604,11 @@ CREATE TABLE files_x_artists (
     artists_id INTEGER
 );
 
+CREATE TABLE files_x_albums (
+    files_id INTEGER,
+    albums_id INTEGER
+);
+
 CREATE TABLE artists_x_albums (
     artists_id INTEGER,
     albums_id INTEGER