Add a new table "exif_info" which contains all the EXIF tags for all images.

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

diff --git a/perl/Sesse/pr0n/Common.pm b/perl/Sesse/pr0n/Common.pm
index 3ab1c6b46ae49827d3a872e99f77167d12c51e41..a43c50af72c2b0b8974521765c171ba3c32e3487 100644 (file)
--- a/perl/Sesse/pr0n/Common.pm
+++ b/perl/Sesse/pr0n/Common.pm
@@ -12,6 +12,7 @@ use Apache2::Log;
 use ModPerl::Util;
 
 use Carp;
+use Encode;
 use DBI;
 use DBD::Pg;
 use Image::Magick;
@@ -22,6 +23,7 @@ use MIME::Types;
 use LWP::Simple;
 # use Image::Info;
 use Image::ExifTool;
+use HTML::Entities;
 
 BEGIN {
        use Exporter ();
@@ -32,7 +34,7 @@ BEGIN {
                require Sesse::pr0n::Config_local;
        };
 
-       $VERSION     = "v2.11";
+       $VERSION     = "v2.21";
        @ISA         = qw(Exporter);
        @EXPORT      = qw(&error &dberror);
        %EXPORT_TAGS = qw();
@@ -182,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.)
@@ -200,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=?)',
@@ -318,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
@@ -361,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;
 
@@ -525,6 +545,48 @@ sub gcd {
        return gcd($b, $a % $b);
 }
 
+sub add_new_event {
+       my ($dbh, $id, $date, $desc, $vhost) = @_;
+       my @errors = ();
+
+       if (!defined($id) || $id =~ /^\s*$/ || $id !~ /^([a-zA-Z0-9-]+)$/) {
+               push @errors, "Manglende eller ugyldig ID.";
+       }
+       if (!defined($date) || $date =~ /^\s*$/ || $date =~ /[<>&]/ || length($date) > 100) {
+               push @errors, "Manglende eller ugyldig dato.";
+       }
+       if (!defined($desc) || $desc =~ /^\s*$/ || $desc =~ /[<>&]/ || length($desc) > 100) {
+               push @errors, "Manglende eller ugyldig beskrivelse.";
+       }
+       
+       if (scalar @errors > 0) {
+               return @errors;
+       }
+               
+       $dbh->do("INSERT INTO events (id,date,name,vhost) VALUES (?,?,?,?)",
+               undef, $id, $date, $desc, $vhost)
+               or return ("Kunne ikke sette inn ny hendelse" . $dbh->errstr);
+       $dbh->do("INSERT INTO last_picture_cache (event,last_picture) VALUES (?,NULL)",
+               undef, $id)
+               or return ("Kunne ikke sette inn ny cache-rad" . $dbh->errstr);
+
+       return ();
+}
+
+sub guess_charset {
+       my $text = shift;
+       my $decoded;
+
+       eval {
+               $decoded = Encode::decode("utf-8", $text, Encode::FB_CROAK);
+       };
+       if ($@) {
+               $decoded = Encode::decode("iso8859-1", $text);
+       }
+
+       return $decoded;
+}
+
 1;