use warnings;
use DBI;
use ID3FS::File;
+use Cwd;
our $SCHEMA_VERSION=1;
my $dbfile=".id3fs";
bless($self,$class);
my($dir, $init, $me)=@_;
+ $self->{base}=$dir;
+ $self->{absbase}=Cwd::abs_path($dir);
$self->{dbpath}="$dir/$dbfile";
$self->{me}=$me;
}
else
{
- my %indexes=( "idx_files_id" => "files(id)",
- "idx_fxt_both" => "files_x_tags(files_id, tags_id)",
+ 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)" );
+ "idx_tags_name" => "tags (name)");
for my $index (keys %indexes)
{
$self->{dbh}->do("CREATE INDEX $index ON " . $indexes{$index});
my $tags=$self->cmd_rows($sql);
return(map { $_->[0]; } @$tags);
}
- my @file_ids=();
- my @tag_ids=();
+ my @ids=();
my $main_sql_start=("SELECT t2.name\n" .
"\tFROM (SELECT files_id FROM tags t1\n" .
{
print "CONSTRAINT: $constraint->{name}\n";
my $cid=$constraint->{id};
- push(@tag_ids, $cid);
+ push(@ids, $cid);
}
- @tag_ids = map( { "\"$_\""; } @tag_ids) unless($self->{postgres});
- my $tagstr=join(", ", @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);
my $tags=$self->cmd_rows($sql);
return(map { $_->[0]; } @$tags);
}
- my @file_ids=();
- my @tag_ids=();
+ 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" .
{
print "CONSTRAINT: $constraint->{name}\n";
my $cid=$constraint->{id};
- push(@tag_ids, $cid);
+ push(@ids, $cid);
}
- @tag_ids = map( { "\"$_\""; } @tag_ids) unless($self->{postgres});
- my $tagstr=join(", ", @tag_ids);
+ @ids = map( { "\"$_\""; } @ids) unless($self->{postgres});
+ my $tagstr=join(", ", @ids);
my $sql = ($main_sql_start . $tagstr .
$main_sql_end);
print "SQL: $sql\n";
sub albums
{
my($self, @constraints)=@_;
- my @file_ids=(); # FIXME: needed? what about in artists()
- my @tag_ids=();
+ my @ids=();
# FIXME: rework PathElements
if(ref($constraints[$#constraints]) eq "ID3FS::PathElement::Artist")
{
return $self->artist_albums($constraints[$#constraints]->{id});
}
- return(); # FIXME
- my $main_sql_start=("SELECT artists.name\n" .
+ 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_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;");
+ "\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(@tag_ids, $cid);
+ push(@ids, $cid);
}
- @tag_ids = map( { "\"$_\""; } @tag_ids) unless($self->{postgres});
- my $tagstr=join(", ", @tag_ids);
- my $sql = ($main_sql_start . $tagstr .
+ @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 @tagnames=map { $_->[0]; } @$result;
- print "ARTISTS: ", join(', ', @tagnames), "\n";
- return(@tagnames);
+ my @names=map { $_->[0]; } @$result;
+ print "ALBUMS: ", join(', ', @names), "\n";
+ return(@names);
}
sub artist_albums
"GROUP BY files.name\n");
print "ARTIST_TRACKS SQL: $sql\n";
my $result=$self->cmd_rows($sql, $artist_id);
- my @albums=map { $_->[0]; } @$result;
- print "ALBUMS: ", join(', ', @albums), "\n";
- return(@albums);
+ my @names=map { $_->[0]; } @$result;
+ @names = map { s/.*\///; } @names;
+ print "ARTISTTRACKS: ", join(', ', @names), "\n";
+ return(@names);
}
sub album_tracks
{
- # FIXME: need albums_x_files table
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" .
"GROUP BY files.name\n");
print "ALBUM_TRACKS SQL: $sql\n";
my $result=$self->cmd_rows($sql, $album_id);
- my @tracks=map { $_->[0]; } @$result;
- print "TRACKS: ", join(', ', @tracks), "\n";
- return(@tracks);
+ my @names=map { $_->[0]; } @$result;
+ @names = map { s/.*\///; } @names;
+ print "TRACKS: ", join(', ', @names), "\n";
+ return(@names);
}
sub tracks
return(());
# return $self->album_tracks($constraints[$#constraints]->{id});
}
- return(); # FIXME
- my $main_sql_start=("SELECT artists.name\n" .
+
+ 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_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;");
- my @tag_ids;
+ "\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(@tag_ids, $cid);
+ push(@ids, $cid);
}
- @tag_ids = map( { "\"$_\""; } @tag_ids) unless($self->{postgres});
- my $tagstr=join(", ", @tag_ids);
- my $sql = ($main_sql_start . $tagstr .
+ @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 @tagnames=map { $_->[0]; } @$result;
- print "ARTISTS: ", join(', ', @tagnames), "\n";
- return(@tagnames);
+ 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();
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);
$self->add_tag($file_id, "decade", "${1}0s");
}
}
+
if($self->ok($v1genre))
{
$self->add_tag($file_id, "v1genre", $v1genre);
{
$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
sub ok
{
my($self, $thing)=@_;
- return(defined($thing) && length($thing));
+ return(defined($thing) && length($thing) && $thing =~ /\S+/);
}
sub cmd
name text
);
+CREATE TABLE paths (
+ id INTEGER PRIMARY KEY,
+ name text
+);
+
CREATE TABLE artists (
id INTEGER PRIMARY KEY,
name text
name text
);
+CREATE TABLE paths_x_files (
+ paths_id INTEGER,
+ files_id INTEGER
+);
+
CREATE TABLE files_x_tags (
files_id INTEGER,
tags_id INTEGER
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