X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FCommon.pm;h=43ea98853ffbd6e41f9e108512009d46063f1cb5;hp=d7a081d1f8241bc6e7e6805b63a13906461d7c3b;hb=4e9898a97f5c3c52d1277ed73cb4365b8644870a;hpb=6a46b55c9390d00d5aef5c7720622a35d48b187e

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index d7a081d..43ea988 100644
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -24,6 +24,7 @@ use LWP::Simple;
 # use Image::Info;
 use Image::ExifTool;
 use HTML::Entities;
+use URI::Escape;
 
 BEGIN {
 	use Exporter ();
@@ -34,7 +35,7 @@ BEGIN {
 		require Sesse::pr0n::Config_local;
 	};
 
-	$VERSION     = "v2.40";
+	$VERSION     = "v2.41";
 	@ISA         = qw(Exporter);
 	@EXPORT      = qw(&error &dberror);
 	%EXPORT_TAGS = qw();
@@ -129,6 +130,8 @@ sub get_query_string {
 	while (my ($key, $value) = each %$param) {
 		next unless defined($value);
 		next if (defined($defparam->{$key}) && $value == $defparam->{$key});
+
+		$value = pretty_escape($value);
 	
 		$str .= ($first) ? "?" : ';';
 		$str .= "$key=$value";
@@ -137,6 +140,44 @@ sub get_query_string {
 	return $str;
 }
 
+# This is not perfect (it can't handle "_ " right, for one), but it will do for now
+sub weird_space_encode {
+	my $val = shift;
+	if ($val =~ /_/) {
+		return "_" x (length($val) * 2);
+	} else {
+		return "_" x (length($val) * 2 - 1);
+	}
+}
+
+sub weird_space_unencode {
+	my $val = shift;
+	if (length($val) % 2 == 0) {
+		return "_" x (length($val) / 2);
+	} else {
+		return " " x ((length($val) + 1) / 2);
+	}
+}
+		
+sub pretty_escape {
+	my $value = shift;
+
+	$value =~ s/(([_ ])\2*)/weird_space_encode($1)/ge;
+	$value = URI::Escape::uri_escape($value);
+	$value =~ s/%2F/\//g;
+
+	return $value;
+}
+
+sub pretty_unescape {
+	my $value = shift;
+
+	# URI unescaping is already done for us
+	$value =~ s/(_+)/weird_space_unencode($1)/ge;
+
+	return $value;
+}
+
 sub print_link {
 	my ($r, $title, $baseurl, $param, $defparam, $accesskey) = @_;
 	my $str = "<a href=\"$baseurl" . get_query_string($param, $defparam) . "\"";
@@ -188,7 +229,9 @@ sub update_image_info {
 	my ($r, $id, $width, $height) = @_;
 
 	# Also find the date taken if appropriate (from the EXIF tag etc.)
-	my $info = Image::ExifTool::ImageInfo(get_disk_location($r, $id));
+	my $exiftool = Image::ExifTool->new;
+	$exiftool->ExtractInfo(get_disk_location($r, $id));
+	my $info = $exiftool->GetInfo();
 	my $datetime = undef;
 			
 	if (defined($info->{'DateTimeOriginal'})) {
@@ -205,11 +248,12 @@ sub update_image_info {
 			 undef, $width, $height, $datetime, $id)
 			or die "Couldn't update width/height in SQL: $!";
 
+		# EXIF information
 		$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 (?,?,?)')
+		my $q = $dbh->prepare('INSERT INTO exif_info (image,key,value) VALUES (?,?,?)')
 			or die "Couldn't prepare inserting EXIF information: $!";
 
 		for my $key (keys %$info) {
@@ -218,6 +262,20 @@ sub update_image_info {
 				or die "Couldn't insert EXIF information in database: $!";
 		}
 
+		# Tags
+		my @tags = $exiftool->GetValue('Keywords', 'ValueConv');
+		$dbh->do('DELETE FROM tags WHERE image=?',
+			undef, $id)
+			or die "Couldn't delete old tag information in SQL: $!";
+
+		my $q = $dbh->prepare('INSERT INTO tags (image,tag) VALUES (?,?)')
+			or die "Couldn't prepare inserting tag information: $!";
+
+		for my $tag (@tags) {
+			$q->execute($id, guess_charset($tag))
+				or die "Couldn't insert tag 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 (vhost,event)=(SELECT vhost,event FROM images WHERE id=?)',
@@ -375,10 +433,12 @@ sub ensure_cached {
 			# Use lanczos (sharper) for heavy scaling, mitchell (faster) otherwise
 			my $filter = 'Mitchell';
 			my $quality = 90;
+			my $sf = undef;
 
 			if ($width / $nwidth > 8.0 || $height / $nheight > 8.0) {
 				$filter = 'Lanczos';
-				$quality = 80;
+				$quality = 85;
+				$sf = "1x1";
 			}
 
 			if ($xres != -1) {
@@ -392,11 +452,19 @@ sub ensure_cached {
 			# Strip EXIF tags etc.
 			$cimg->Strip();
 
-			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);
+			{
+				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;