mason/.perl-lib/TrivGal.pm: Settle on `#' as the emergency regex delimiter.

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

diff --git a/mason/.perl-lib/TrivGal.pm b/mason/.perl-lib/TrivGal.pm
index 4a41612..bbef2ed 100644 (file)
--- a/mason/.perl-lib/TrivGal.pm
+++ b/mason/.perl-lib/TrivGal.pm
@@ -56,10 +56,10 @@ sub join_paths (@) {
   my @p = @_;
   my $p = "";
   ELT: for my $e (@p) {
-    $e =~ s:^/{2,}:/:;
-    $e =~ s,([^/])/+$,$1,;
+    $e =~ s#^/{2,}#/#;
+    $e =~ s#([^/])/+$#$1#;
     if ($e eq "") { next ELT; }
-    elsif ($p eq "" || $e =~ m,^/,) { $p = $e; }
+    elsif ($p eq "" || $e =~ m#^/#) { $p = $e; }
     else { $p = "$p/$e"; }
   }
   return $p;
@@ -69,7 +69,7 @@ export qw{split_path};
 sub split_path ($) {
   my ($path) = @_;
 
-  my ($dir, $base, $ext) = $path =~ m,^(?:(.*)/)?(?:([^/]*)\.)?([^./]*)$,;
+  my ($dir, $base, $ext) = $path =~ m#^(?:(.*)/)?(?:([^/]*)\.)?([^./]*)$#;
   if (defined $base) { $ext = ".$ext"; }
   else { $base = $ext; $ext = ""; }
   return ($dir, $base, $ext);
@@ -78,14 +78,14 @@ sub split_path ($) {
 export qw{urlencode};
 sub urlencode ($) {
   my ($u) = @_;
-  $u =~ s:([^0-9a-zA-Z_./~-]):sprintf "%%%02x", ord $1:eg;
+  $u =~ s#([^0-9a-zA-Z_./~-])#sprintf "%%%02x", ord $1#eg;
   return $u;
 }
 
 export qw{urldecode};
 sub urldecode ($) {
   my ($u) = @_;
-  $u =~ s:\%([0-9a-fA-F]{2}):chr hex $1:eg;
+  $u =~ s#\%([0-9a-fA-F]{2})#chr hex $1#eg;
   return $u;
 }
 
@@ -138,6 +138,9 @@ our $CACHEURL //= "$ROOTURL/tgal-cache";
 our $STATICURL //= "$ROOTURL/tgal-static";
 our $SCRIPTURL;
 
+export qw{$SRCURL};
+our $SRCURL = "https://git.distorted.org.uk/~mdw/tgal/";
+
 export qw{%SIZE};
 our %SIZE = (smallthumb => 96,
             medthumb => 144,
@@ -234,7 +237,7 @@ package TrivGal::Image {
       if (defined $orient) {
        my ($rot, $flip) = @{$ORIENT{$orient}};
        if ($rot) { $img->image_orientate($rot); }
-       if ($flip) { $img->flip_horizontal($rot); }
+       if ($flip) { $img->flip_horizontal(); }
       }
     }
 
@@ -294,7 +297,7 @@ sub listdir ($) {
        my ($indexp, $name, $c) = /(!\s+)?(\S+)\s*(\S|\S.*\S)?\s*$/;
        $name = urldecode $name;
        my $list;
-       if ($name =~ m!/$!) {
+       if ($name =~ m#/$#) {
          $list = \@d;
          die "can't index a folder" if $indexp;
        } else {
@@ -314,7 +317,7 @@ sub listdir ($) {
     if ($item && $comment) { $item->comment($comment); }
     close $f;
   } else {
-    my $st = stat "$path/$e";
+    my $st = stat $path;
     unless ($st->mode&0004) { return ([], [], undef); }
 
     opendir $d, $path;
@@ -360,7 +363,7 @@ sub find_covering_file ($$$) {
   for (;;) {
     my $stuff = contents "$top/$path/$name"; return $stuff if defined $stuff;
     if ($path eq "") { return undef; }
-    if ($path =~ m!^(.*)/[^/]+/?!) { $path = $1; }
+    if ($path =~ m#^(.*)/[^/]+/?#) { $path = $1; }
     else { $path = ""; }
   }
 }