mason/dhandler (.thumbnail + callers): Pass in pre-scaled thumbnail.

[tgal] / mason / dhandler

diff --git a/mason/dhandler b/mason/dhandler
index ca5dad2..a48610c 100755 (executable)
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -67,9 +67,9 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %###-------------------------------------------------------------------------
 <%def .contact>\
 <%perl>
-       unless ($r->path_info =~ m!/$!) {
-         $m->redirect(join_paths($SCRIPTURL, $path) . "/");
-       }
+       unless ($r->path_info =~ m!/$!)
+         { $m->redirect(join_paths($SCRIPTURL, $path) . "/"); }
+
        my $real = join_paths $IMGROOT, $path;
        my $url = join_paths $SCRIPTURL, $path;
        my ($dd, $ff, $ii) = listdir $real;
@@ -83,18 +83,27 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
        }
        (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;
+         DIR: for (;;) {
+           my ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
+           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;
+         }
        }
 </%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 &>
 %
@@ -107,28 +116,24 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 % if (@$dd) {
 <h2>Subfolders</h2>
-%   for my $size (qw{medthumb}) {
 <div class="gallery <% $size %>">
-%     for my $d (@$dd) {
-  <& .thumbnail, target => $d->name . "/", comment => $d->comment,
-                img => $tn{$d}, size => $size,
+%   for my $d (@$dd) {
+  <& .thumbnail, target => $d->name, comment => $d->comment,
+                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>
@@ -145,11 +150,15 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 <%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)); }
+
        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 = TrivGal::Image->new($path)->scale("view");
+       my $vw = $img->scale("view");
 
        my $fi = undef;
        FILE: for (my $i = 0; $i < @$ff; $i++)
@@ -203,9 +212,10 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 % 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,
+                img => $img{$f}->scale($size), size => $size,
                 caption => $m->interp->apply_escapes($f->name, "h"),
-                focus => $f->name eq "$base$ext" &>\
+                focus => $f eq $this &>\
 %   }
 </div>
 % }
@@ -214,6 +224,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 <%args>
        $path
+       $scale => undef
 </%args>
 </%def>
 %
@@ -247,17 +258,15 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 %###-------------------------------------------------------------------------
 <%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) {
@@ -270,7 +279,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 <%args>
        $target
-       $img
+       $tn
        $size
        $caption
        $comment => undef