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;
sub split_path ($) {
my ($path) = @_;
- my ($dir, $base, $ext) = $path =~ m,^(?:(.*)/)?(?:([^/]*)\.)?([^./]*)$,;
+ my ($dir, $base, $ext) =
+ $path =~ m#^ (?: (.*) /)?
+ (?: ([^/]*) \.)?
+ ([^./]*) $#x;
if (defined $base) { $ext = ".$ext"; }
else { $base = $ext; $ext = ""; }
return ($dir, $base, $ext);
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;
}
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,
bigthumb => 228,
+ small => 480,
+ embed => 720,
view => 1200);
export qw{init};
}, $cls;
}
- sub scale ($$) {
- my ($me, $scale) = @_;
+ sub scale ($$;$) {
+ my ($me, $scale, $forcep) = @_;
+ my $m = HTML::Mason::Request->instance;
my $path = $me->{path};
my $sz = $SIZE{$scale} or die "unknown scale `$scale'";
my $thumb = "$CACHE/scale.$sz/$path";
- my $thumburl = "$CACHEURL/scale.$sz/$path";
+ my $thumburl =
+ $m->interp->apply_escapes("$CACHEURL/scale.$sz/$path", "u");
my $st = stat $thumb;
if (defined $st && $st->mtime > $me->{mtime}) { return $thumburl; }
+ return
+ $m->interp->apply_escapes("$SCRIPTURL/$path", "u") . "?scale=$scale"
+ unless $forcep;
my ($dir, $base, $ext) = TrivGal::split_path $thumb;
my $ty = $TYPE{lc $ext} or die "unknown type `$ext'";
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(); }
}
}
$scaled->image_set_format($ty->imlibfmt);
$scaled->set_quality(90);
- my $new = "$TMP/t${$}$ext";
- make_path $TMP;
+ my $new = "$TMP/t$$-$ext";
+ make_path $TMP, { mode => 0771 };
$scaled->save($new);
- make_path $dir;
+ make_path $dir, { mode => 0771 };
rename $new, $thumb;
return $thumburl;
}
my (@d, @f);
my $ix = undef;
+ $path =~ s#/$##;
if (-f "$path/.tgal.index") {
open my $f, "<", "$path/.tgal.index";
my $item = undef;
$comment = defined $comment ? $comment . "\n" . $_ : $_;
} else {
if ($item && $comment) { $item->comment($comment); }
- my ($indexp, $name, $c) = /(!\s+)?(\S+)\s*(\S|\S.*\S)?\s*$/;
+ my ($flags, $name, $c) =
+ /^ (?: ([-!]+) \s+)? # flags
+ (\S+) \s* # filename
+ (\S | \S.*\S )? # start of the comment
+ \s*
+ $/x;
+ my $indexp = $flags =~ /!/;
+ my $hidep = $flags =~ /-/;
$name = urldecode $name;
my $list;
- if ($name =~ m!/$!) {
+ $item = TrivGal::Item->new($name);
+ if ($name =~ m#/$#) {
$list = \@d;
die "can't index a folder" if $indexp;
} else {
$list = \@f;
- my ($dir, $base, $ext) = TrivGal::split_path $name;
+ my ($dir, $base, $ext) = split_path $name;
die "unknown image type" unless $TYPE{lc $ext};
if ($indexp) {
die "two index images" if defined $ix;
$ix = $item;
}
}
- $item = TrivGal::Item->new($name);
$comment = $c;
- push @$list, $item;
+ push @$list, $item unless $hidep;
}
}
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;
my $st = stat "$path/$e";
my $list = undef;
if ($dotp) { }
- elsif (-d $st) { $list = \@d; }
+ elsif (-d $st) { $list = \@d; $e .= "/"; }
elsif ($TYPE{lc $ext} && -f $st) { $list = \@f; }
$list and push @$list, TrivGal::Item->new($e);
}
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 = ""; }
}
}