}
(my $nosl = $path) =~ s!/$!!;
+ my $size = "medthumb";
my %tn;
for my $f (@$ff)
- { $tn{$f} = TrivGal::Image->new($path . $f->name); }
+ { $tn{$f} = TrivGal::Image->new($path . $f->name)->scale($size); }
for my $d (@$dd) {
- my ($ddd, $fff, $iii) = listdir $real . "/" . $d->name;
- $tn{$d} = $iii ?
- TrivGal::Image->new(join_paths $path, $d->name, $iii->name) :
- undef;
+ my $p = join_paths $path, $d->name;
+ my ($ddd, $fff, $iii);
+ ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
+ DIR: for (;;) {
+ if (defined $iii) {
+ my $index = join_paths $p, $iii->name;
+ $tn{$d} = TrivGal::Image->new($index)->scale($size);
+ last DIR;
+ }
+ if (!@$ddd) { $tn{$d} = undef; last DIR; }
+ $p = join_paths $p, $ddd->[0]->name;
+ ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
+ }
}
</%perl>
%
-<&| .html, title => "Folder " . $m->interp->apply_escapes($nosl || "[top]", "h"),
+<&| .html, title =>
+ "Folder " . $m->interp->apply_escapes($nosl || "[top]", "h"),
head => $links &>
<& .breadcrumbs, what => "Folder", path => $path &>
%
%
% if (@$dd) {
<h2>Subfolders</h2>
-% for my $size (qw{medthumb}) {
<div class="gallery <% $size %>">
-% for my $d (@$dd) {
+% for my $d (@$dd) {
<& .thumbnail, target => $d->name, comment => $d->comment,
- img => $tn{$d}, size => $size,
+ tn => $tn{$d}, size => $size,
caption => $m->interp->apply_escapes($d->name, "h") &>\
-% }
-</div>
% }
+</div>
% }
%
% if (@$ff) {
<h2>Images</h2>
-% for my $size (qw{medthumb}) {
<div class="gallery <% $size %>">
-% for my $f (@$ff) {
+% for my $f (@$ff) {
<& .thumbnail, target => $f->name, comment => $f->comment,
- img => $tn{$f}, size => "bigthumb",
+ tn => $tn{$f}, size => $size,
caption => $m->interp->apply_escapes($f->name, "h") &>\
-% }
-</div>
% }
+</div>
% }
%
<div class=fill></div>
<%def .image>\
<%perl>
my ($dir, $base, $ext) = split_path $path;
- my $real = join_paths $IMGROOT, $path;
- my $img = TrivGal::Image->new($path);
- if (defined $scale) { $m->redirect($img->scale($scale)); }
+ if (defined $scale) {
+ my $img = TrivGal::Image->new($path);
+ $m->redirect($img->scale($scale, 1));
+ }
+ my $real = join_paths $IMGROOT, $path;
my $url = join_paths $IMGURL, $path;
my $realdir = join_paths $IMGROOT, $dir;
my $urldir = join_paths $SCRIPTURL, $dir;
my ($dd, $ff, $ii) = listdir $realdir;
- my $vw = $img->scale("view");
+ my @thumbsz = qw{smallthumb medthumb bigthumb};
+ my %tn;
+ my $vw;
my $fi = undef;
- FILE: for (my $i = 0; $i < @$ff; $i++)
- { if ($ff->[$i]->name eq "$base$ext") { $fi = $i; last FILE; } }
+ FILE: for (my $i = 0; $i < @$ff; $i++) {
+ my $f = $ff->[$i];
+ my $img = TrivGal::Image->new(join_paths $dir, $f->name);
+ for my $sz (@thumbsz) { $tn{$f->name}{$sz} = $img->scale($sz); }
+ if ($ff->[$i]->name eq "$base$ext")
+ { $fi = $i; $vw = $img->scale("view"); }
+ }
defined $fi or die "image not found in its folder?";
my $this = $ff->[$fi];
% }
</div>
%
-% my %img = map { $_ => TrivGal::Image->new($dir . "/" . $_->name) } @$ff;
% for my $size (qw{smallthumb medthumb bigthumb}) {
<div class="thumbstrip <% $size %>">
% for my $f (@$ff) {
- <& .thumbnail, target => $f->name, img => $img{$f}, size => $size,
+ <& .thumbnail, target => $f->name,
+ tn => $tn{$f->name}{$size}, size => $size,
caption => $m->interp->apply_escapes($f->name, "h"),
- focus => $f->name eq "$base$ext" &>\
+ focus => $f eq $this &>\
% }
</div>
% }
%
%###-------------------------------------------------------------------------
<%def .thumbnail>\
-% my $tn;
-% if (defined $img) { $tn = $img->scale($size); }
-% else { $tn = "$STATICURL/folder.svg"; }
+% $tn //= "$STATICURL/folder.svg";
% if ($focus) {
<figure class="thumb focusthumb <% $size %>">
- <img class="thumb <% $size %>" load=lazy src="<% $tn |u %>">
+ <img class="thumb <% $size %>" load=lazy src="<% $tn |h %>">
<figcaption><span class=name><% $caption %></span></figcaption>
% } else {
<figure class="thumb <% $size %>">
<a class=thumb href="<% $target |u %>">
- <img class="thumb <% $size %>" load=lazy src="<% $tn |u %>">
+ <img class="thumb <% $size %>" load=lazy src="<% $tn |h %>">
<figcaption>
<span class=name><% $caption %></span>
% if (defined $comment) {
%
<%args>
$target
- $img
+ $tn
$size
$caption
$comment => undef