require Sesse::pr0n::Config_local;
};
- $VERSION = "v3.01";
+ $VERSION = "v3.20";
@ISA = qw(Exporter);
@EXPORT = qw(&error &dberror);
%EXPORT_TAGS = qw();
sub get_disk_location {
my ($r, $id) = @_;
- my $dir = POSIX::floor($id / 256);
+ my $dir = POSIX::floor($id / 256);
return $Sesse::pr0n::Config::image_base . "images/$dir/$id.jpg";
}
sub get_cache_location {
- my ($r, $id, $width, $height, $infobox, $dpr) = @_;
- my $dir = POSIX::floor($id / 256);
+ my ($id, $width, $height) = @_;
+ my $dir = POSIX::floor($id / 256);
- if ($infobox) {
- if ($dpr == 1) {
- return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box.png";
- } else {
- return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box\@$dpr.png";
- }
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-nobox.jpg";
+}
+
+sub get_infobox_cache_location {
+ my ($id, $width, $height, $dpr) = @_;
+ my $dir = POSIX::floor($id / 256);
+
+ if ($dpr == 1) {
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box.png";
} else {
- return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-nobox.jpg";
+ return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-$width-$height-box\@$dpr.png";
}
}
sub get_mipmap_location {
my ($r, $id, $width, $height) = @_;
- my $dir = POSIX::floor($id / 256);
+ my $dir = POSIX::floor($id / 256);
return $Sesse::pr0n::Config::image_base . "cache/$dir/$id-mipmap-$width-$height.jpg";
}
}
sub ensure_cached {
- my ($r, $filename, $id, $dbwidth, $dbheight, $dpr, $xres, $yres, @otherres) = @_;
-
- my ($new_dbwidth, $new_dbheight);
+ my ($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres) = @_;
my $fname = get_disk_location($r, $id);
unless (defined($xres) && (!defined($dbwidth) || !defined($dbheight) || $xres < $dbwidth || $yres < $dbheight || $xres == -1)) {
return ($fname, undef);
}
- my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox, $dpr);
- my $err;
+ my $cachename = get_cache_location($id, $xres, $yres);
if (! -r $cachename or (-M $cachename > -M $fname)) {
# If we are in overload mode (aka Slashdot mode), refuse to generate
# new thumbnails.
error($r, 'System is in overload mode, not doing any scaling');
}
- my $img;
- ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
-
- while (defined($xres) && defined($yres)) {
- my ($nxres, $nyres) = (shift @otherres, shift @otherres);
- my $cachename = get_cache_location($r, $id, $xres, $yres, $infobox, $dpr);
-
- my $cimg;
- if (defined($nxres) && defined($nyres)) {
- # we have more resolutions to scale, so don't throw
- # the image away
- $cimg = $img->Clone();
- } else {
- $cimg = $img;
- }
-
- my $width = $img->Get('columns');
- my $height = $img->Get('rows');
- my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
+ make_cache($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
+ }
- my $filter = 'Lanczos';
- my $quality = 87;
- my $sf = "1x1";
+ return ($cachename, 'image/jpeg');
+}
- if ($xres != -1) {
- $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter, 'sampling-factor'=>$sf);
- }
+sub make_cache {
+ my ($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres) = @_;
- # Strip EXIF tags etc.
- $cimg->Strip();
+ my ($img, $new_dbwidth, $new_dbheight) = make_mipmap($r, $filename, $id, $dbwidth, $dbheight, $xres, $yres, @otherres);
- {
- my %parms = (
- filename => $cachename,
- quality => $quality
- );
- if (($nwidth >= 640 && $nheight >= 480) ||
- ($nwidth >= 480 && $nheight >= 640)) {
- $parms{'interlace'} = 'Plane';
- }
- if (defined($sf)) {
- $parms{'sampling-factor'} = $sf;
- }
- $err = $cimg->write(%parms);
- }
+ # Update the SQL database if it doesn't contain the required info
+ if (!defined($dbwidth) && defined($new_dbwidth)) {
+ log_info($r, "Updating width/height for $id: $new_dbwidth x $new_dbheight");
+ update_image_info($r, $id, $new_dbwidth, $new_dbheight);
+ }
- undef $cimg;
+ my $err;
+ while (defined($xres) && defined($yres)) {
+ my ($nxres, $nyres) = (shift @otherres, shift @otherres);
+ my $cachename = get_cache_location($id, $xres, $yres);
+
+ my $cimg;
+ if (defined($nxres) && defined($nyres)) {
+ # we have more resolutions to scale, so don't throw
+ # the image away
+ $cimg = $img->Clone();
+ } else {
+ $cimg = $img;
+ }
+
+ my $width = $img->Get('columns');
+ my $height = $img->Get('rows');
+ my ($nwidth, $nheight) = scale_aspect($width, $height, $xres, $yres);
- ($xres, $yres) = ($nxres, $nyres);
+ my $filter = 'Lanczos';
+ my $quality = 87;
+ my $sf = "1x1";
- log_info($r, "New cache: $nwidth x $nheight for $id.jpg");
+ if ($xres != -1) {
+ $cimg->Resize(width=>$nwidth, height=>$nheight, filter=>$filter);
}
-
- undef $img;
- if ($err) {
- log_warn($r, "$fname: $err");
- $err =~ /(\d+)/;
- if ($1 >= 400) {
- #@$magick = ();
- error($r, "$fname: $err");
+
+ # Strip EXIF tags etc.
+ $cimg->Strip();
+
+ {
+ my %parms = (
+ filename => $cachename,
+ quality => $quality
+ );
+ if (($nwidth >= 640 && $nheight >= 480) ||
+ ($nwidth >= 480 && $nheight >= 640)) {
+ $parms{'interlace'} = 'Plane';
}
+ if (defined($sf)) {
+ $parms{'sampling-factor'} = $sf;
+ }
+ $err = $cimg->write(%parms);
}
+
+ undef $cimg;
+
+ ($xres, $yres) = ($nxres, $nyres);
+
+ log_info($r, "New cache: $nwidth x $nheight for $id.jpg");
}
- # Update the SQL database if it doesn't contain the required info
- if (!defined($dbwidth) && defined($new_dbwidth)) {
- log_info($r, "Updating width/height for $id: $new_dbwidth x $new_dbheight");
- update_image_info($r, $id, $new_dbwidth, $new_dbheight);
+ undef $img;
+ if ($err) {
+ log_warn($r, "$filename: $err");
+ $err =~ /(\d+)/;
+ if ($1 >= 400) {
+ #@$magick = ();
+ error($r, "$filename: $err");
+ }
}
-
- return ($cachename, 'image/jpeg');
}
sub ensure_infobox_cached {
- my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $dpr, $xres, $yres) = @_;
+ my ($r, $filename, $id, $dbwidth, $dbheight, $dpr, $xres, $yres) = @_;
my ($new_dbwidth, $new_dbheight);
my $fname = get_disk_location($r, $id);
- my $cachename = get_cache_location($r, $id, $xres, $yres, 1, $dpr);
+ my $cachename = get_infobox_cache_location($id, $xres, $yres, $dpr);
my $err;
if (! -r $cachename or (-M $cachename > -M $fname)) {
# If we are in overload mode (aka Slashdot mode), refuse to generate
$err = $img->write(filename => $cachename, quality => 90, depth => 8);
log_info($r, "New infobox cache: $width x $height for $id.jpg");
-
- return ($cachename, 'image/png');
}
-}
+ return ($cachename, 'image/png');
+}
sub get_mimetype_from_filename {
my $filename = shift;
$info->{'ExposureProgram'} =~ /shutter\b.*\bpriority/i);
my $manual_aperture = (defined($info->{'ExposureProgram'}) &&
$info->{'ExposureProgram'} =~ /aperture\b.*\bpriority/i);
- if ($info->{'ExposureProgram'} =~ /manual/i) {
+ if (defined($info->{'ExposureProgram'}) && $info->{'ExposureProgram'} =~ /manual/i) {
$manual_shutter = 1;
$manual_aperture = 1;
}
$model =~ s/^\s+//;
$model =~ s/\s+$//;
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
push @parts, [ $model, 0 ];
}
# classic fields
if (scalar @classic_fields > 0) {
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
my $first_elem = 1;
for my $field (@classic_fields) {
$info->{'Flash'} =~ /no flash/i ||
$info->{'Flash'} =~ /not fired/i ||
$info->{'Flash'} =~ /Off/) {
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
push @parts, [ "No flash", 0 ];
} elsif ($info->{'Flash'} =~ /fired/i ||
$info->{'Flash'} =~ /On/) {
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
push @parts, [ "Flash", 0 ];
} else {
- push @parts, [ ' - ', 0 ] if (scalar @parts > 0);
+ push @parts, [ "\x{00A0}\x{2013}\x{00A0}", 0 ] if (scalar @parts > 0);
push @parts, [ $info->{'Flash'}, 0 ];
}
}
projects / pr0n / blobdiff