my $init=shift;
$self->{base}=shift;
$self->{dbpath}=shift || ($self->{base} . "/" . $dbfile);
+ $self->{dbpath}=Cwd::abs_path($self->{dbpath});
$self->{absbase}=Cwd::abs_path($self->{base});
my $connectstr="dbi:SQLite:dbname=$self->{dbpath}";
sub relativise
{
- my($self, $path, $name, $mountpoint)=@_;
- my $id3fs_path=$self->{dbpath};
- $id3fs_path=~s/(.*)\/.*/$1/;
+ my($self, $path, $name, $mountpoint, $querypath)=@_;
my $rpath="$self->{absbase}/$path";
- my $vpath="$mountpoint/$id3fs_path";
+ my $vpath=$mountpoint . $querypath;
my @path=split(/\//,$rpath);
my @rel=split(/\//,$vpath);
- #absolute paths have empty first element due to leading /
+ # drop filename from rel
+ pop @rel;
+ # 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
- print "FAIL: NO PATHS IN COMMON\n";
+ # no path in common, return absolute
+ # should never happen
+ # FIXME
return $name;
}
# f: /home/foo/bar/baz.mp3
print "FILENAME SQL: $sql\n" if($self->{verbose});
my ($path, $name)=$self->{db}->cmd_onerow($sql, $id);
my $id3fs_path=join('/', map { $_->{name}; } @{$self->{elements}});
- return($self->{db}->relativise($path, $name, $mountpoint));
+ return($self->{db}->relativise($path, $name, $mountpoint, $self->{path}));
}
# should never happen
return "ERROR";