Allow latin1 in EXIF info.

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

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 324efe9fb0fabc9a39e3caaf1caf3bce47db4b0d..da8173f8bbd04d2fd881bf55b97666c040d2efc0 100644 (file)
--- 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 ();
@@ -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, guess_charset($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
@@ -451,7 +465,11 @@ sub make_infobox {
                push @classic_fields, $info->{'ISOSetting'} . " ISO";
        }
 
-       push @classic_fields, $info->{'ExposureBiasValue'} . " EV" if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0);
+       if (defined($info->{'ExposureBiasValue'}) && $info->{'ExposureBiasValue'} != 0) {
+               push @classic_fields, $info->{'ExposureBiasValue'} . " EV";
+       } elsif (defined($info->{'ExposureCompensation'}) && $info->{'ExposureCompensation'} != 0) {
+               push @classic_fields, $info->{'ExposureCompensation'} . " EV";
+       }
        
        if (scalar @classic_fields > 0) {
                push @lines, join(', ', @classic_fields);