tweak relativise

[id3fs.git] / lib / ID3FS / DB.pm

diff --git a/lib/ID3FS/DB.pm b/lib/ID3FS/DB.pm
index 29c50e3..955e117 100644 (file)
--- a/lib/ID3FS/DB.pm
+++ b/lib/ID3FS/DB.pm
@@ -23,11 +23,11 @@ sub new
     $self->{base}=shift;
     my $fallbackdir=shift;
 
-    $dbpath=$self->find_db($init, $dbpath, $fallbackdir);
-    return undef unless($dbpath);
+    $self->{dbpath}=$self->find_db($init, $dbpath, $fallbackdir);
+    return undef unless($self->{dbpath});
     $self->{absbase}=Cwd::abs_path($self->{base});
 
-    my $connectstr="dbi:SQLite:dbname=$dbpath";
+    my $connectstr="dbi:SQLite:dbname=$self->{dbpath}";
     my ($user, $pass)=("", "");
     if($self->{postgres})
     {
@@ -35,7 +35,7 @@ sub new
        $user="ianb";
        $pass="foo";
     }
-    my $exists=-f $dbpath;
+    my $exists=-f $self->{dbpath};
     $self->{dbh}=DBI->connect($connectstr, $user, $pass,
                              { AutoCommit=>1 } );
     unless(defined($self->{dbh}))
@@ -169,6 +169,33 @@ sub last_update
     return $newval;
 }
 
+sub bare_tags
+{
+    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 tags_with_values
+{
+    # 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 $tags={};
+    for my $pair (@$result)
+    {
+       push(@{$tags->{$pair->[0]}}, $pair->[1]);
+    }
+    return $tags;
+}
+
 sub tag_has_values
 {
     my($self, $id)=@_;
@@ -180,7 +207,8 @@ sub tag_has_values
 
 sub relativise
 {
-    my($self, $path, $name, $mountpoint, $id3fs_path)=@_;
+    my($self, $path, $name, $mountpoint)=@_;
+    my $id3fs_path=$self->{dbpath};
     $id3fs_path=~s/(.*)\/.*/$1/;
     my $rpath="$self->{absbase}/$path";
     my $vpath="$mountpoint/$id3fs_path";