mason/{.perl-lib/TrivGal,dhandler}: Make an image object.

[tgal] / mason / dhandler

diff --git a/mason/dhandler b/mason/dhandler
index 44a9ceb..7d76fdf 100755 (executable)
--- a/mason/dhandler
+++ b/mason/dhandler
@@ -100,9 +100,9 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 <div class=gallery>
 %   for my $d (@$dd) {
 %     my ($ddd, $fff, $iii) = listdir $real . "/" . $d->name;
-%     my $tn;
-%     if ($iii) { $tn = join_paths $path, $d->name, $iii->name; }
-%     else { $tn = undef; }
+%     my $tn = $iii ?
+%      TrivGal::Image->new(join_paths $path, $d->name, $iii->name) :
+%       undef;
   <& .thumbnail, target => $d->name . "/", comment => $d->comment,
                 img => $tn, size => "bigthumb",
                 caption => $m->interp->apply_escapes($d->name, "h") &>\
@@ -115,7 +115,8 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 <div class=gallery>
 %   for my $f (@$ff) {
   <& .thumbnail, target => $f->name, comment => $f->comment,
-                img => $path . $f->name, size => "bigthumb",
+                img => TrivGal::Image->new($path . $f->name),
+                size => "bigthumb",
                 caption => $m->interp->apply_escapes($f->name, "h") &>\
 %   }
 </div>
@@ -139,7 +140,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
        my $realdir = join_paths $IMGROOT, $dir;
        my $urldir = join_paths $SCRIPTURL, $dir;
        my ($dd, $ff, $ii) = listdir $realdir;
-       my $vw = scaled "view", $path;
+       my $vw = TrivGal::Image->new($path)->scale("view");
 
        my $fi = undef;
        FILE: for (my $i = 0; $i < @$ff; $i++)
@@ -191,7 +192,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %
 <div class=thumbstrip>
 % for my $f (@$ff) {
-%   my $img = $dir . "/" . $f->name;
+%   my $img = TrivGal::Image->new($dir . "/" . $f->name);
   <& .thumbnail, target => $f->name, img => $img, size => "bigthumb",
                 caption => $m->interp->apply_escapes($f->name, "h"),
                 focus => $f->name eq "$base$ext" &>\
@@ -236,7 +237,7 @@ Failed to find &lsquo;<% $path |h %>&rsquo;.
 %###-------------------------------------------------------------------------
 <%def .thumbnail>\
 % my $tn;
-% if (defined $img) { $tn = scaled $size, $img; }
+% if (defined $img) { $tn = $img->scale($size); }
 % else { $tn = "$STATICURL/folder.svg"; }
 % if ($focus) {
   <figure class="thumb <% $size %>" id=focusthumb>