X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~mdw/git/tgal/blobdiff_plain/3de03c7ad617d0f03c062a82a5bb5eb070f0f7cd..f6ac176798628842d70f993c03b4f4978bccbef1:/mason/dhandler
diff --git a/mason/dhandler b/mason/dhandler
index 611567a..78f0f95 100755
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -85,14 +85,19 @@ Failed to find ‘<% $path |h %>’.
my $size = "medthumb";
my %tn;
- my (%nd, %nf);
+ my %count;
for my $f (@$ff)
{ $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;
- $nd{$d} = @$ddd; $nf{$d} = @$fff;
+
+ my $count = "";
+ $count .= scalar(@$ddd) . "/" if @$ddd;
+ $count .= scalar(@$fff) if @$fff;
+ $count{$d} = $count;
+
DIR: for (;;) {
if (defined $iii) {
my $index = join_paths $p, $iii->name;
@@ -125,14 +130,11 @@ Failed to find ‘<% $path |h %>’.
% if (@$dd) {
Subfolders
-% 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]" &>\
+ $m->interp->apply_escapes($d->name, "h") .
+ " [$count{$d}]" &>\
% }
% }
@@ -222,16 +224,26 @@ Failed to find ‘<% $path |h %>’.
my $urldir = join_paths $SCRIPTURL, $dir;
my ($dd, $ff, $ii) = listdir $realdir;
my @thumbsz = qw{smallthumb medthumb bigthumb};
+ my @imgsz = sort { $SIZE{$a} <=> $SIZE{$b} } keys %SIZE;
+ my ($wd, $ht, $max);
my %tn;
- my $vw;
+ my %vw;
my $fi = undef;
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("medium"); }
+ 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];
@@ -248,12 +260,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};
}
%perl>
%
@@ -271,7 +282,19 @@ Failed to find ‘<% $path |h %>’.
% }
-
+
% if ($link{next}) {