use Errno;
use Exporter qw{import};
use File::stat;
+use Image::ExifTool qw{};
use Image::Imlib2;
use User::pwent;
use POSIX;
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,
###--------------------------------------------------------------------------
### Scaled images.
+my %ORIENT =
+ (1 => [0, 0],
+ 2 => [0, 1],
+ 3 => [2, 0],
+ 4 => [2, 1],
+ 5 => [3, 1],
+ 6 => [1, 0],
+ 7 => [1, 1],
+ 8 => [3, 0]);
+
package TrivGal::Image {
use File::Path qw{make_path};
use File::stat;
my $img = $me->{img};
unless (defined $img) {
my $imgpath = "$IMGROOT/$path";
+ my $exif = new Image::ExifTool;
+ $exif->ExtractInfo($imgpath);
+ my $orient = $exif->GetValue("Orientation", "ValueConv");
$img = $me->{img} = Image::Imlib2->load($imgpath);
+ if (defined $orient) {
+ my ($rot, $flip) = @{$ORIENT{$orient}};
+ if ($rot) { $img->image_orientate($rot); }
+ if ($flip) { $img->flip_horizontal(); }
+ }
}
my ($wd, $ht) = ($img->width, $img->height);
$comment = defined $comment ? $comment . "\n" . $_ : $_;
} else {
if ($item && $comment) { $item->comment($comment); }
- my ($indexp, $name, $c) = /(!\s+)?(\S+)\s*(\S|\S.*\S)?\s*$/;
+ my ($indexp, $name, $c) =
+ /^ (! \s+)? # index flag
+ (\S+) \s* # filename
+ (\S | \S.*\S )? # start of the comment
+ \s*
+ $/x;
$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 {
$ix = $item;
}
}
- $item = TrivGal::Item->new($name);
$comment = $c;
push @$list, $item;
}
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;
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 = ""; }
}
}