mason/dhandler (.image): Slight reformatting.

[tgal] / mason / dhandler

diff --git a/mason/dhandler b/mason/dhandler
index f3a8cfc..4676769 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;
@@ -178,7 +231,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
          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"); }
+           { $fi = $i; $vw = $img->scale("medium"); }
        }
        defined $fi or die "image not found in its folder?";
        my $this = $ff->[$fi];
@@ -195,12 +248,11 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
        }
 
        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 "  <link rel=%s href=\"%s\">\n",
-             $rel, urlencode "$pre/$link{$rel}";
+         $links .= sprintf "  <link rel=%s href=\"%s\">\n", $rel,
+                           urlencode "$pre/$link{$rel}"
+           if exists $link{$rel};
        }
 </%perl>
 %
@@ -265,6 +317,10 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %   }
 <% $prev %>\
 % }
+% if ($m->has_content) {
+
+<% $m->content %>\
+% }
 </h1>
 <%args>
        $what
@@ -277,12 +333,12 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 % $tn //= "$STATICURL/folder.svg";
 % if ($focus) {
   <figure class="thumb focusthumb <% $size %>">
-    <img class="thumb <% $size %>" load=lazy src="<% $tn |h %>">
+    <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 |h %>">
+    <a class=thumb href="<% $target |hu %>">
+      <img class="thumb <% $size %>" loading=lazy src="<% $tn |h %>">
       <figcaption>
        <span class=name><% $caption %></span>
 % if (defined $comment) {
@@ -344,7 +400,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"; }