X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=a43c50af72c2b0b8974521765c171ba3c32e3487;hb=0790a2542347fea51482ae2c4aa3d128a8c87721;hp=d0bafe648af346c7def363b87ce0f92ae2c0dfb9;hpb=7039a36da013481c21f65bd5a808b61ea9e5656a;p=pr0n

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index d0bafe6..a43c50a 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -23,6 +23,7 @@ use MIME::Types;
 use LWP::Simple;
 # use Image::Info;
 use Image::ExifTool;
+use HTML::Entities;
 
 BEGIN {
 	use Exporter ();
@@ -33,7 +34,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.20";
+	$VERSION     = "v2.21";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -183,7 +184,7 @@ sub get_cache_location {
 	}
 }
 
-sub update_width_height {
+sub update_image_info {
 	my ($r, $id, $width, $height) = @_;
 
 	# Also find the date taken if appropriate (from the EXIF tag etc.)
@@ -201,6 +202,19 @@ sub update_width_height {
 		 undef, $width, $height, $datetime, $id)
 		or die "Couldn't update width/height in SQL: $!";
 
+	$dbh->do('DELETE FROM exif_info WHERE image=?',
+		undef, $id)
+		or die "Couldn't delete old EXIF information in SQL: $!";
+
+	my $q = $dbh->prepare('INSERT INTO exif_info (image,tag,value) VALUES (?,?,?)')
+		or die "Couldn't prepare inserting EXIF information: $!";
+
+	for my $key (keys %$info) {
+		next if ref $info->{$key};
+		$q->execute($id, $key, $info->{$key})
+			or die "Couldn't insert EXIF information in database: $!";
+	}
+
 	# update the last_picture cache as well (this should of course be done
 	# via a trigger, but this is less complicated :-) )
 	$dbh->do('UPDATE last_picture_cache SET last_picture=GREATEST(last_picture, ?) WHERE event=(SELECT event FROM images WHERE id=?)',
@@ -319,7 +333,7 @@ sub ensure_cached {
 		# Update the SQL database if it doesn't contain the required info
 		if ($dbwidth == -1 || $dbheight == -1) {
 			$r->log->info("Updating width/height for $id: $width x $height");
-			update_width_height($r, $id, $width, $height);
+			update_image_info($r, $id, $width, $height);
 		}
 			
 		# We always want RGB JPEGs
@@ -362,7 +376,12 @@ sub ensure_cached {
 			# Strip EXIF tags etc.
 			$cimg->Strip();
 
-			$err = $cimg->write(filename=>$cachename, quality=>$quality);
+			if (($nwidth >= 640 && $nheight >= 480) ||
+			    ($nwidth >= 480 && $nheight >= 640)) {
+				$err = $cimg->write(filename=>$cachename, quality=>$quality, interlace=>'Plane');
+			} else {
+				$err = $cimg->write(filename=>$cachename, quality=>$quality);
+			}
 
 			undef $cimg;