mason/.perl-lib/TrivGal.pm (Image::scale): Factor out thumbnail path tail.

[tgal] / mason / .perl-lib / TrivGal.pm

diff --git a/mason/.perl-lib/TrivGal.pm b/mason/.perl-lib/TrivGal.pm
index d6d3afb4ce32fa90f5c2e9a235764937c707bc2d..594b383a6fabac245f5782e33940dee7b6edcdd0 100644 (file)
--- a/mason/.perl-lib/TrivGal.pm
+++ b/mason/.perl-lib/TrivGal.pm
@@ -240,9 +240,12 @@ package TrivGal::Image {
 
     my $path = $me->{path};
     my $sz = $SIZE{$scale} or die "unknown scale `$scale'";
-    my $thumb = "$CACHE/scale.$sz/$path";
-    my $thumburl =
-      $m->interp->apply_escapes("$CACHEURL/scale.$sz/$path", "u");
+    if ($me->sz <= $sz)
+      { return $m->interp->apply_escapes("$IMGURL/$path", "u"); }
+
+    my $tail = "scale.$sz/$path";
+    my $thumb = "$CACHE/$tail";
+    my $thumburl = $m->interp->apply_escapes("$CACHEURL/$tail", "u");
     my $st = stat $thumb;
     if (defined $st && $st->mtime > $me->{mtime}) { return $thumburl; }
     return
@@ -265,8 +268,6 @@ package TrivGal::Image {
       }
     }
 
-    if ($me->sz <= $sz)
-      { return $m->interp->apply_escapes("$IMGURL/$path", "u"); }
     my $sc = $sz/$me->sz;
     my $scaled = $img->create_scaled_image($sc*$wd, $sc*$ht);