X-Git-Url: https://git.distorted.org.uk/~mdw/tgal/blobdiff_plain/6ac5dde2c2826f066d96e167f6f1fcdc46d5fab4..784bdf8f1aab63a19724cb60026e78f8f7550ab8:/mason/dhandler

diff --git a/mason/dhandler b/mason/dhandler
index 4355b7a..de50cd8 100755
--- 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;
@@ -82,9 +82,28 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 	    urlencode "$SCRIPTURL/$uplink";
 	}
 	(my $nosl = $path) =~ s!/$!!;
+
+	my $size = "medthumb";
+	my %tn;
+	for my $f (@$ff)
+	  { $tn{$f} = TrivGal::Image->new($path . $f->name)->scale($size); }
+	for my $d (@$dd) {
+	  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 &>
 %
@@ -97,26 +116,22 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 % if (@$dd) {
 <h2>Subfolders</h2>
-<div class=gallery>
+<div class="gallery <% $size %>">
 %   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; }
-  <& .thumbnail, target => $d->name . "/", img => $tn,
-		 caption => $m->interp->apply_escapes($d->name, "h"),
-		 comment => $d->comment &>\
+  <& .thumbnail, target => $d->name, comment => $d->comment,
+		 tn => $tn{$d}, size => $size,
+		 caption => $m->interp->apply_escapes($d->name, "h") &>\
 %   }
 </div>
 % }
 %
 % if (@$ff) {
 <h2>Images</h2>
-<div class=gallery>
+<div class="gallery <% $size %>">
 %   for my $f (@$ff) {
-  <& .thumbnail, target => $f->name, img => $path . $f->name,
-		 caption => $m->interp->apply_escapes($f->name, "h"),
-		 comment => $f->comment &>\
+  <& .thumbnail, target => $f->name, comment => $f->comment,
+		 tn => $tn{$f}, size => $size,
+		 caption => $m->interp->apply_escapes($f->name, "h") &>\
 %   }
 </div>
 % }
@@ -134,16 +149,29 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 <%def .image>\
 <%perl>
 	my ($dir, $base, $ext) = split_path $path;
+
+	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 = scaled "view", $path;
+	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];
 
@@ -189,18 +217,22 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 % }
 </div>
 %
-<div class=thumbstrip>
-% for my $f (@$ff) {
-  <& .thumbnail, target => $f->name, img => $dir . "/" . $f->name,
+% for my $size (qw{smallthumb medthumb bigthumb}) {
+<div class="thumbstrip <% $size %>">
+%   for my $f (@$ff) {
+  <& .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>
+% }
 <& .footer, path => $dir &>
 </&>
 %
 <%args>
 	$path
+	$scale => undef
 </%args>
 </%def>
 %
@@ -234,30 +266,29 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 %###-------------------------------------------------------------------------
 <%def .thumbnail>\
-% my $tn;
-% if (defined $img) { $tn = scaled "thumb", $img; }
-% else { $tn = "$STATICURL/folder.svg"; }
+% $tn //= "$STATICURL/folder.svg";
 % if ($focus) {
-  <div class=pic id=focusthumb>
-    <img class=thumb src="<% $tn |u %>">
-    <div class=caption><span class=name><% $caption %></span></div>
+  <figure class="thumb focusthumb <% $size %>">
+    <img class="thumb <% $size %>" load=lazy src="<% $tn |h %>">
+    <figcaption><span class=name><% $caption %></span></figcaption>
 % } else {
-  <div class=pic>
-    <a class=pic href="<% $target |u %>">
-      <img class=thumb src="<% $tn |u %>">
-      <div class=caption>
+  <figure class="thumb <% $size %>">
+    <a class=thumb href="<% $target |u %>">
+      <img class="thumb <% $size %>" load=lazy src="<% $tn |h %>">
+      <figcaption>
 	<span class=name><% $caption %></span>
 % if (defined $comment) {
 	<span class=comment><% $comment %></span>
 % }
-      </div>
+      </figcaption>
     </a>
 % }
-  </div>
+  </figure>
 %
 <%args>
 	$target
-	$img
+	$tn
+	$size
 	$caption
 	$comment => undef
 	$focus => 0
@@ -274,10 +305,9 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
     Trivial Gallery, copyright &copy; 2021 Mark Wooding.
     Free software: you can modify it and/or redistribute it under the
     terms of the
-    <a href="https://www.gnu.org/licenses/agpl-3.0.en.html">GNU Affero
+    <a rel=license href="https://www.gnu.org/licenses/agpl-3.0.en.html">GNU Affero
     General Public License version 3</a>.
-    Browse or download
-    the <a href="https://git.distorted.org.uk/~mdw/tgal/">source code</a>.
+    Browse or download the <a href="<% $SRCURL %>">source code</a>.
   </div>
 % my $user =
 %   find_covering_file $IMGROOT, $path, ".tgal-footer.html";
@@ -295,7 +325,6 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %###-------------------------------------------------------------------------
 <%once>
 	use autodie;
-use Data::Dumper;
 	use File::stat;
 
 	use TrivGal;
@@ -311,7 +340,8 @@ use Data::Dumper;
 	elsif (-d $st) { $comp = ".contact"; }
 	elsif (-f $st) { $comp = ".image"; }
 	else { $comp = ".not-found"; }
-	$m->comp($comp, path => $path);
+        $r->header_out("X-AGPL-Source" => $SRCURL);
+	$m->comp($comp, path => $path, %ARGS);
 </%init>
 %
 %###----- That's all, folks -------------------------------------------------