sub scale ($$) {
my ($me, $scale) = @_;
+ my $m = HTML::Mason::Request->instance;
my $path = $me->{path};
my $sz = $SIZE{$scale} or die "unknown scale `$scale'";
my $thumb = "$CACHE/scale.$sz/$path";
- my $thumburl = "$CACHEURL/scale.$sz/$path";
+ my $thumburl =
+ $m->interp->apply_escapes("$CACHEURL/scale.$sz/$path", "u");
my $st = stat $thumb;
if (defined $st && $st->mtime > $me->{mtime}) { return $thumburl; }
my (@d, @f);
my $ix = undef;
+ $path =~ s#/$##;
if (-f "$path/.tgal.index") {
open my $f, "<", "$path/.tgal.index";
my $item = undef;
die "can't index a folder" if $indexp;
} else {
$list = \@f;
- my ($dir, $base, $ext) = TrivGal::split_path $name;
+ my ($dir, $base, $ext) = split_path $name;
die "unknown image type" unless $TYPE{lc $ext};
if ($indexp) {
die "two index images" if defined $ix;
my $st = stat "$path/$e";
my $list = undef;
if ($dotp) { }
- elsif (-d $st) { $list = \@d; }
+ elsif (-d $st) { $list = \@d; $e .= "/"; }
elsif ($TYPE{lc $ext} && -f $st) { $list = \@f; }
$list and push @$list, TrivGal::Item->new($e);
}