X-Git-Url: https://git.distorted.org.uk/~mdw/tgal/blobdiff_plain/dfdd19641b4eba66aefedb9c1a7ce4f93d74b347..1408b7a293e5a35d99744aaa51192eab972a95a1:/mason/dhandler

diff --git a/mason/dhandler b/mason/dhandler
index 44a9ceb..813e637 100755
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -82,6 +82,16 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 	    urlencode "$SCRIPTURL/$uplink";
 	}
 	(my $nosl = $path) =~ s!/$!!;
+
+	my %tn;
+	for my $f (@$ff)
+	  { $tn{$f} = TrivGal::Image->new($path . $f->name); }
+	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;
+	}
 </%perl>
 %
 <&| .html, title => "Folder " . $m->interp->apply_escapes($nosl || "[top]", "h"),
@@ -97,28 +107,28 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 % if (@$dd) {
 <h2>Subfolders</h2>
-<div class=gallery>
-%   for my $d (@$dd) {
-%     my ($ddd, $fff, $iii) = listdir $real . "/" . $d->name;
-%     my $tn;
-%     if ($iii) { $tn = join_paths $path, $d->name, $iii->name; }
-%     else { $tn = undef; }
+%   for my $size (qw{medthumb}) {
+<div class="gallery <% $size %>">
+%     for my $d (@$dd) {
   <& .thumbnail, target => $d->name . "/", comment => $d->comment,
-		 img => $tn, size => "bigthumb",
+		 img => $tn{$d}, size => $size,
 		 caption => $m->interp->apply_escapes($d->name, "h") &>\
-%   }
+%     }
 </div>
+%   }
 % }
 %
 % if (@$ff) {
 <h2>Images</h2>
-<div class=gallery>
-%   for my $f (@$ff) {
+%   for my $size (qw{medthumb}) {
+<div class="gallery <% $size %>">
+%     for my $f (@$ff) {
   <& .thumbnail, target => $f->name, comment => $f->comment,
-		 img => $path . $f->name, size => "bigthumb",
+		 img => $tn{$f}, size => "bigthumb",
 		 caption => $m->interp->apply_escapes($f->name, "h") &>\
-%   }
+%     }
 </div>
+%   }
 % }
 %
 <div class=fill></div>
@@ -139,7 +149,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 	my $realdir = join_paths $IMGROOT, $dir;
 	my $urldir = join_paths $SCRIPTURL, $dir;
 	my ($dd, $ff, $ii) = listdir $realdir;
-	my $vw = scaled "view", $path;
+	my $vw = TrivGal::Image->new($path)->scale("view");
 
 	my $fi = undef;
 	FILE: for (my $i = 0; $i < @$ff; $i++)
@@ -189,14 +199,16 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 % }
 </div>
 %
-<div class=thumbstrip>
-% for my $f (@$ff) {
-%   my $img = $dir . "/" . $f->name;
-  <& .thumbnail, target => $f->name, img => $img, size => "bigthumb",
+% 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,
 		 caption => $m->interp->apply_escapes($f->name, "h"),
 		 focus => $f->name eq "$base$ext" &>\
-% }
+%   }
 </div>
+% }
 <& .footer, path => $dir &>
 </&>
 %
@@ -236,10 +248,10 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %###-------------------------------------------------------------------------
 <%def .thumbnail>\
 % my $tn;
-% if (defined $img) { $tn = scaled $size, $img; }
+% if (defined $img) { $tn = $img->scale($size); }
 % else { $tn = "$STATICURL/folder.svg"; }
 % if ($focus) {
-  <figure class="thumb <% $size %>" id=focusthumb>
+  <figure class="thumb focusthumb <% $size %>">
     <img class="thumb <% $size %>" load=lazy src="<% $tn |u %>">
     <figcaption><span class=name><% $caption %></span></figcaption>
 % } else {