mason/dhandler (.contact): Nudge index-scanning loop to focus on top level.

[tgal] / mason / dhandler

diff --git a/mason/dhandler b/mason/dhandler
index a48610c..94c39cc 100755 (executable)
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -89,8 +89,9 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
          { $tn{$f} = TrivGal::Image->new($path . $f->name)->scale($size); }
        for my $d (@$dd) {
          my $p = join_paths $path, $d->name;
+         my ($ddd, $fff, $iii);
+         ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
          DIR: for (;;) {
-           my ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
            if (defined $iii) {
              my $index = join_paths $p, $iii->name;
              $tn{$d} = TrivGal::Image->new($index)->scale($size);
@@ -98,6 +99,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
            }
            if (!@$ddd) { $tn{$d} = undef; last DIR; }
            $p = join_paths $p, $ddd->[0]->name;
+           ($ddd, $fff, $iii) = listdir join_paths $IMGROOT, $p;
          }
        }
 </%perl>
@@ -149,20 +151,29 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 <%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];
 
@@ -208,12 +219,11 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 % }
 </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}->scale($size), size => $size,
+                tn => $tn{$f->name}{$size}, size => $size,
                 caption => $m->interp->apply_escapes($f->name, "h"),
                 focus => $f eq $this &>\
 %   }