Push v2.51 -- too many bugfixes to let the version number stay.

[pr0n] / perl / Sesse / pr0n / Common.pm

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index e12e8dc53efa85bba94a5a3221c37ab58025980f..acf43737098017210cc4dbb9227bb799ea424354 100644 (file)
--- 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.41";
+       $VERSION     = "v2.51";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -130,8 +131,7 @@ sub get_query_string {
                next unless defined($value);
                next if (defined($defparam->{$key}) && $value == $defparam->{$key});
 
-               # FIXME: We'll need to escape _ here somehow
-               $value =~ s/ /_/g;
+               $value = pretty_escape($value);
        
                $str .= ($first) ? "?" : ';';
                $str .= "$key=$value";
@@ -140,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) . "\"";
@@ -191,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'})) {
@@ -204,15 +244,12 @@ sub update_image_info {
        {
                local $dbh->{AutoCommit} = 0;
 
-               $dbh->do('UPDATE images SET width=?, height=?, date=? WHERE id=?',
-                        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) {
@@ -221,6 +258,39 @@ sub update_image_info {
                                or die "Couldn't insert EXIF information in database: $!";
                }
 
+               # Model/Lens
+               my $model = $exiftool->GetValue('Model', 'PrintConv');
+               my $lens = $exiftool->GetValue('Lens', 'PrintConv');
+               $lens = $exiftool->GetValue('LensSpec', 'PrintConv') if (!defined($lens));
+
+               $model =~ s/^\s*//;
+               $model =~ s/\s*$//;
+               $model = undef if (length($model) == 0);
+
+               $lens =~ s/^\s*//;
+               $lens =~ s/\s*$//;
+               $lens = undef if (length($lens) == 0);
+               
+               # Now update the main table with the information we've got
+               $dbh->do('UPDATE images SET width=?, height=?, date=?, model=?, lens=? WHERE id=?',
+                        undef, $width, $height, $datetime, $model, $lens, $id)
+                       or die "Couldn't update width/height in SQL: $!";
+               
+               # 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: $!";
+
+               $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=?)',
@@ -301,7 +371,7 @@ sub ensure_cached {
        my ($r, $filename, $id, $dbwidth, $dbheight, $infobox, $xres, $yres, @otherres) = @_;
 
        my $fname = get_disk_location($r, $id);
-       unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || $dbwidth == -1 || $dbheight == -1 || $xres == -1)) {
+       unless (defined($xres) && ($xres < $dbheight || $yres < $dbwidth || !defined($dbwidth) || !defined($dbheight) || $xres == -1)) {
                return ($fname, 0);
        }
 
@@ -350,7 +420,7 @@ sub ensure_cached {
                my $height = $img->Get('rows');
 
                # Update the SQL database if it doesn't contain the required info
-               if ($dbwidth == -1 || $dbheight == -1) {
+               if (!defined($dbwidth) || !defined($dbheight)) {
                        $r->log->info("Updating width/height for $id: $width x $height");
                        update_image_info($r, $id, $width, $height);
                }
@@ -496,7 +566,7 @@ sub make_infobox {
                push @classic_fields, $info->{'ISOSetting'} . " ISO";
        }
 
-       if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0) {
+       if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} ne "0") {
                push @classic_fields, $info->{'ExposureBiasValue'} . " EV";
        } elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
                push @classic_fields, $info->{'ExposureCompensation'} . " EV";