mason/dhandler, static/tgal.css: Add option to download zipfiles.

This might turn out to be a terrible mistake.

diff --git a/mason/dhandler b/mason/dhandler
index f523432..49e5f84 100755 (executable)
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -109,7 +109,11 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 <&| .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) {
@@ -154,6 +158,55 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 </%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
+</%args>
+</%def>
+%
+%###-------------------------------------------------------------------------
 <%def .image>\
 <%perl>
        my ($dir, $base, $ext) = split_path $path;
@@ -348,7 +401,13 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
        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"; }

diff --git a/static/tgal.css b/static/tgal.css
index b94038e..aa64878 100644 (file)
--- a/static/tgal.css
+++ b/static/tgal.css
@@ -61,6 +61,18 @@ h1, h2, h3, h4, h5, h6 { font-family: sans-serif; font-weight bold; }
 hr { width: calc(100% - 4em); }
 div.fill { flex-grow: 1; }
 
+div.menu {
+       font-family: sans;
+       font-weight: normal;
+       font-size: initial;
+       float: right;
+}
+h1 div.menu:before {
+       visibility: hidden;
+       font-size: 200%;
+       content: "";
+}
+
 div.footer {
        border-top: medium black solid;  
        margin-top: 3.43ex;