<html>
<head>
<meta name=viewport content="width=device-width initial-scale=1.0">
- <script type="text/javascript" src="<% "$STATICURL/tgal.js" |u %>" defer></script>
- <link rel=stylesheet type=text/css href="<% "$STATICURL/tgal.css" |u %>">
+ <script type="text/javascript" src="<% "$STATICURL/tgal.js" |hu %>" defer></script>
+ <link rel=stylesheet type=text/css href="<% "$STATICURL/tgal.css" |hu %>">
<% $head %>\
<title><% $title %></title>
</head>
%###-------------------------------------------------------------------------
<%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;
}
(my $nosl = $path) =~ s!/$!!;
+ my $size = "medthumb";
my %tn;
+ my (%nd, %nf);
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;
+ my ($ddd, $fff, $iii);
+ ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
+ $nd{$d} = @$ddd; $nf{$d} = @$fff;
+ DIR: for (;;) {
+ 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;
+ ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
+ }
}
</%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 &>
+<&| .breadcrumbs, what => "Folder", path => $path &>
+ <div class="menu">
+ <a href="<% "$SCRIPTURL/" . substr($path, 0, -1) . ".zip" |hu %>">[zip]</a>
+ </div>
+</&>
%
% my $note = contents "$IMGROOT/$path/.tgal-note.html";
% if (defined $note) {
%
% 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,
- caption => $m->interp->apply_escapes($d->name, "h") &>\
-% }
-</div>
+% for my $d (@$dd) {
+% 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]" &>\
% }
+</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>
<& .footer, path => $path &>
</&>
+%
+<%args>
+ $path
+</%args>
+</%def>
+%
+%###-------------------------------------------------------------------------
+<%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 *STDOUT; open STDOUT, ">/dev/null";
+ untie *STDERR; open STDERR, ">", $err;
+ chdir "$IMGROOT/$path";
+ exec "zip", "-qr", $zip, ".";
+ exit 127;
+ }
+ waitpid $kid, 0;
+</%perl>
+%
+% if ($?) {
+<&| .html, title => "Zip failed (rc = $?)" &>
+<pre>
+<%perl>
+ open my $f, "<", $err;
+ my $buf;
+ while (read $f, $buf, 16384) { $m->print($buf); }
+</%perl>
+</pre>
+</&>
+% } else {
+<%perl>
+ $r->content_type("application/zip");
+ open my $f, "<", $zip; binmode $f;
+ my $buf;
+ while (read $f, $buf, 16384) { $m->print($buf); }
+</%perl>
+% }
+%
+<%perl>
+ eval { unlink $zip; };
+ eval { unlink $err; };
+</%perl>
+
%
<%args>
$path
<%def .image>\
<%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)); }
+ 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 = $img->scale("view");
+ 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];
%
<div class=viewnav>
% if ($link{prev}) {
- <div class=prev><a class=prev href="<% "$pre/$link{prev}" |u %>">‹</a></div>
+ <div class=prev><a class=prev href="<% "$pre/$link{prev}" |hu %>">‹</a></div>
% }
<a class=view href="<% $url |h %>">
<img src="<% $vw |h %>">
</a>
% if ($link{next}) {
- <div class=next><a class=next href="<% "$pre/$link{next}" |u %>">›</a></div>
+ <div class=next><a class=next href="<% "$pre/$link{next}" |hu %>">›</a></div>
% }
</div>
%
-% 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,
+ <& .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>
% }
% if (!@p) {
[top]
% } else {
-<a href="<% $SCRIPTURL |u %>/">[top]</a> / \
+<a href="<% $SCRIPTURL |hu %>/">[top]</a> / \
% STEP: for my $p (@p) {
% if (defined $prev) {
% $pp .= "$prev/";
-<a href="<% join_paths($SCRIPTURL, $pp) |u %>/">\
+<a href="<% join_paths($SCRIPTURL, $pp) |hu %>/">\
<% $prev %></a> / \
% }
% $prev = $p;
% }
<% $prev %>\
% }
+% if ($m->has_content) {
+
+<% $m->content %>\
+% }
</h1>
<%args>
$what
%
%###-------------------------------------------------------------------------
<%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 %>" loading=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 %>">
+ <a class=thumb href="<% $target |hu %>">
+ <img class="thumb <% $size %>" loading=lazy src="<% $tn |h %>">
<figcaption>
<span class=name><% $caption %></span>
% if (defined $comment) {
%
<%args>
$target
- $img
+ $tn
$size
$caption
$comment => undef
</%perl>
<div class=footer>
<div class=footitem>
- <a href="https://www.gnu.org/licenses/agpl-3.0.en.html"><img class=licence src="<% "$STATICURL/agpl.png" |u %>"></a>
+ <a href="https://www.gnu.org/licenses/agpl-3.0.en.html"><img class=licence src="<% "$STATICURL/agpl.png" |hu %>"></a>
Trivial Gallery, copyright © 2021 Mark Wooding.
Free software: you can modify it and/or redistribute it under the
terms of the
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"; }
~mdw / tgal / blobdiff