% 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 &>\
+% my $count = "";
+% $count .= "$nd{$d}/" if $nd{$d};
+% $count .= "$nf{$d}" if $nf{$d};
+ <& .thumbnail, target => $d->name, comment => $d->comment,
+ tn => $tn{$d}, size => $size,
+ caption =>
+ $m->interp->apply_escapes($d->name, "h") . " [$count]" &>\
% }
% }
%
% if (@$ff) {
Images
-
+
% 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") &>\
% }
% }
@@ -124,6 +151,55 @@ Failed to find ‘<% $path |h %>’.
<& .footer, path => $path &>
+%
+<%args>
+ $path
+
+
+%
+%###-------------------------------------------------------------------------
+<%def .zip>\
+<%perl>
+ my $st = stat "$IMGROOT/$path";
+ if (!$st) { $m->comp(".not-found", path => $path); return; }
+ my $zip = "$TMP/t$$-download.zip";
+ my $err = "$TMP/t$$-download.stderr";
+ my $kid = fork;
+ if (!$kid) {
+ untie *STDIN; open STDIN, "/dev/null";
+ untie *STDERR; open STDERR, ">", $err;
+ chdir "$IMGROOT/$path";
+ exec "zip", "-qr", $zip, ".";
+ exit 127;
+ }
+ waitpid $kid, 0;
+
+%
+% if ($?) {
+<&| .html, title => "Zip failed (rc = $?)" &>
+
+<%perl>
+ open my $f, "<", $err;
+ my $buf;
+ while (read $f, $buf, 16384) { $m->print($buf); }
+
+
+
+% } else {
+<%perl>
+ $r->content_type("application/zip");
+ open my $f, "<", $zip; binmode $f;
+ my $buf;
+ while (read $f, $buf, 16384) { $m->print($buf); }
+
+% }
+%
+<%perl>
+ eval { unlink $zip; };
+ eval { unlink $err; };
+
+
%
<%args>
$path
@@ -134,16 +210,39 @@ Failed to find ‘<% $path |h %>’.
<%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 @imgsz = sort { $SIZE{$a} <=> $SIZE{$b} } keys %SIZE;
+ my ($wd, $ht, $max);
+ 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;
+ ($wd, $ht) = ($img->wd, $img->ht);
+ $max = $img->sz;
+ SIZE: for my $sc (@imgsz) {
+ my $sz = $SIZE{$sc};
+ last SIZE if $max < $sz;
+ $vw{$sc} = $img->scale($sc);
+ }
+ }
+ }
defined $fi or die "image not found in its folder?";
my $this = $ff->[$fi];
@@ -159,12 +258,11 @@ Failed to find ‘<% $path |h %>’.
}
my $links = "";
- my $pre =
- urlencode join_paths $SCRIPTURL, $dir;
+ my $pre = urlencode join_paths $SCRIPTURL, $dir;
for my $rel (qw{up first prev next last}) {
- exists $link{$rel} and
- $links .= sprintf " \n",
- $rel, urlencode "$pre/$link{$rel}";
+ $links .= sprintf " \n", $rel,
+ urlencode "$pre/$link{$rel}"
+ if exists $link{$rel};
}
%
@@ -179,28 +277,44 @@ Failed to find ‘<% $path |h %>’.
%
% if ($link{prev}) {
-
+
% }
- 
+
+% my ($hoff, $voff) = (60, 480);
+% SIZE: for (my $i = 0; $i < @imgsz; $i++) {
+% my $scale = $imgsz[$i];
+% last SIZE unless exists $vw{$scale};
+% my $scsz = $SIZE{$scale};
+% my $f = $scsz/$max;
+% my ($thiswd, $thisht) = map int, ($f*$wd + $hoff, $f*$ht + $voff);
+
+% }
+ 
">
+
% if ($link{next}) {
-
+
% }
%
-
-% for my $f (@$ff) {
- <& .thumbnail, target => $f->name, img => $dir . "/" . $f->name,
+% for my $size (qw{smallthumb medthumb bigthumb}) {
+
- 
+
+ 
<% $caption %>
% } else {
-
-
-
+
+
+
<% $caption %>
% if (defined $comment) {
@@ -257,7 +373,8 @@ Failed to find ‘<% $path |h %>’.
%
<%args>
$target
- $img
+ $tn
+ $size
$caption
$comment => undef
$focus => 0
@@ -270,14 +387,13 @@ Failed to find ‘<% $path |h %>’.
+% 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 &>\
+% }
+% }
<& .footer, path => $dir &>
%
<%args>
$path
+ $scale => undef
%
@@ -214,17 +328,21 @@ Failed to find ‘<% $path |h %>’.
% if (!@p) {
[top]
% } else {
-[top] / \
+[top] / \
% STEP: for my $p (@p) {
% if (defined $prev) {
% $pp .= "$prev/";
-\
+\
<% $prev %> / \
% }
% $prev = $p;
% }
<% $prev %>\
% }
+% if ($m->has_content) {
+
+<% $m->content %>\
+% }
<%args>
$what
@@ -234,17 +352,15 @@ Failed to find ‘<% $path |h %>’.
%
%###-------------------------------------------------------------------------
<%def .thumbnail>\
-% my $tn;
-% if (defined $img) { $tn = scaled "thumb", $img; }
-% else { $tn = "$STATICURL/folder.svg"; }
+% $tn //= "$STATICURL/folder.svg";
% if ($focus) {
-
- ">
+ ">
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";
@@ -295,7 +411,6 @@ Failed to find ‘<% $path |h %>’.
%###-------------------------------------------------------------------------
<%once>
use autodie;
-use Data::Dumper;
use File::stat;
use TrivGal;
@@ -307,11 +422,18 @@ use Data::Dumper;
my $path = $m->dhandler_arg;
my $st = stat "$IMGROOT/$path";
my $comp;
- if (!$st) { $comp = ".not-found"; }
+ if (!$st) {
+ $comp = ".not-found";
+ if ($path =~ /^ (.*) (\.(?: zip)) $/x) {
+ $st = stat "$IMGROOT/$1";
+ if ($st) { $path = $1; $comp = $2; }
+ }
+ }
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);
%
%###----- That's all, folks -------------------------------------------------