sub split_path ($) {
my ($path) = @_;
- my ($dir, $base, $ext) = $path =~ m#^(?:(.*)/)?(?:([^/]*)\.)?([^./]*)$#;
+ my ($dir, $base, $ext) =
+ $path =~ m#^ (?: (.*) /)?
+ (?: ([^/]*) \.)?
+ ([^./]*) $#x;
if (defined $base) { $ext = ".$ext"; }
else { $base = $ext; $ext = ""; }
return ($dir, $base, $ext);
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; }
$scaled->image_set_format($ty->imlibfmt);
$scaled->set_quality(90);
- my $new = "$TMP/t${$}$ext";
+ my $new = "$TMP/t$$-$ext";
make_path $TMP;
$scaled->save($new);
make_path $dir;
my (@d, @f);
my $ix = undef;
+ $path =~ s#/$##;
if (-f "$path/.tgal.index") {
open my $f, "<", "$path/.tgal.index";
my $item = undef;
$comment = defined $comment ? $comment . "\n" . $_ : $_;
} else {
if ($item && $comment) { $item->comment($comment); }
- my ($indexp, $name, $c) = /(!\s+)?(\S+)\s*(\S|\S.*\S)?\s*$/;
+ my ($indexp, $name, $c) =
+ /^ (! \s+)? # index flag
+ (\S+) \s* # filename
+ (\S | \S.*\S )? # start of the comment
+ \s*
+ $/x;
$name = urldecode $name;
my $list;
+ $item = TrivGal::Item->new($name);
if ($name =~ m#/$#) {
$list = \@d;
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;
$ix = $item;
}
}
- $item = TrivGal::Item->new($name);
$comment = $c;
push @$list, $item;
}
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);
}