X-Git-Url: https://git.distorted.org.uk/~mdw/tgal/blobdiff_plain/4e74ddf4ab1a4c3a7a3b9936a978f225a690aa7d..24f4eac3128ad2053a503924519076a2cd342e95:/mason/dhandler
diff --git a/mason/dhandler b/mason/dhandler
index 7d76fdf..014f5da 100755
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -82,6 +82,16 @@ Failed to find ‘<% $path |h %>’.
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,29 +107,28 @@ Failed to find ‘<% $path |h %>’.
%
% if (@$dd) {
-% for my $d (@$dd) {
-% my ($ddd, $fff, $iii) = listdir $real . "/" . $d->name;
-% my $tn = $iii ?
-% TrivGal::Image->new(join_paths $path, $d->name, $iii->name) :
-% undef;
- <& .thumbnail, target => $d->name . "/", comment => $d->comment,
- img => $tn, size => "bigthumb",
+% for my $size (qw{medthumb}) {
+
+% for my $d (@$dd) {
+ <& .thumbnail, target => $d->name, comment => $d->comment,
+ img => $tn{$d}, size => $size,
caption => $m->interp->apply_escapes($d->name, "h") &>\
-% }
+% }
+% }
% }
%
% if (@$ff) {
Images
-
-% for my $f (@$ff) {
+% for my $size (qw{medthumb}) {
+
+% for my $f (@$ff) {
<& .thumbnail, target => $f->name, comment => $f->comment,
- img => TrivGal::Image->new($path . $f->name),
- size => "bigthumb",
+ img => $tn{$f}, size => "bigthumb",
caption => $m->interp->apply_escapes($f->name, "h") &>\
-% }
+% }
+% }
% }
%
@@ -136,11 +145,15 @@ Failed to find ‘<% $path |h %>’.
<%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++)
@@ -190,19 +203,22 @@ Failed to find ‘<% $path |h %>’.
% }
%
-
-% for my $f (@$ff) {
-% my $img = TrivGal::Image->new($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}) {
+
+% 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" &>\
-% }
+% }
+% }
<& .footer, path => $dir &>
&>
%
<%args>
$path
+ $scale => undef
%args>
%def>
%
@@ -240,7 +256,7 @@ Failed to find ‘<% $path |h %>’.
% if (defined $img) { $tn = $img->scale($size); }
% else { $tn = "$STATICURL/folder.svg"; }
% if ($focus) {
-
+
<% $caption %>
% } else {
@@ -277,10 +293,9 @@ Failed to find ‘<% $path |h %>’.
Trivial Gallery, copyright © 2021 Mark Wooding.
Free software: you can modify it and/or redistribute it under the
terms of the
- GNU Affero
+ GNU Affero
General Public License version 3.
- Browse or download
- the source code.
+ Browse or download the source code.
% my $user =
% find_covering_file $IMGROOT, $path, ".tgal-footer.html";
@@ -298,7 +313,6 @@ Failed to find ‘<% $path |h %>’.
%###-------------------------------------------------------------------------
<%once>
use autodie;
-use Data::Dumper;
use File::stat;
use TrivGal;
@@ -314,7 +328,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 -------------------------------------------------