X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Memories%2FPhoto.pm;h=a92280782c721af1d6e04987d5861d9981d9d7dd;hb=fab613118bc37d7a6f48b60e1b4ff0e7ab0041ea;hp=6e09ae9cf6034a978899960fa2a638c8a24f272d;hpb=9f88be0c76a71ec511c21a872ae02db66a015176;p=memories.git

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index 6e09ae9..a922807 100644
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -7,6 +7,7 @@ use File::Temp qw(tempdir tmpnam);
 use File::Path qw(rmtree);
 use File::Find;
 use File::MMagic;
+use Image::Size qw(imgsize);
 use strict;
 use Carp qw(cluck confess);
 use base qw(Memories::DBI Maypole::Model::CDBI::Plain);
@@ -94,7 +95,6 @@ sub upload_file {
     my ($self, $r, $filename, $offered_name) = @_;
     my $mm = File::MMagic->new;
     my $res = $mm->checktype_filename($filename);
-    warn "$filename is a $res\n";
     if ($res =~ m{/x-zip} or $offered_name =~ /t(ar\.)?gz$/i) {
         return $self->upload_archive($r, $filename);
     } elsif ($offered_name =~ /\.(raw|nef|dng|cr2)/i) {
@@ -125,13 +125,13 @@ sub upload_raw {
     my ($self, $r, $filename, $offered_name) = @_;
     my $jpg = tmpnam().".jpg";
     system("dcraw -c $filename | convert - $jpg");
-    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
     $filename =~ /\.(.*)$/;
     my $format = $1;
-    $photo->format($format);
     # Put the file in place
+    $photo->format($format);
     copy($filename, 
          Memories->config->{data_store}."/".$photo->id.".".$format);
+    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
     return $photo;
 }
 
@@ -149,7 +149,7 @@ sub upload_jpeg {
 	warn "Couldn't copy photo to ".$photo->path("file").": $!";
         $photo->delete(); die;
     }
-    my ($x, $y) = dim(image_info($photo->path));
+    my ($x, $y, undef) = imgsize($photo->path);
     $photo->x($x); $photo->y($y);
 
     # Rotate?
@@ -161,11 +161,8 @@ sub upload_jpeg {
     $photo->make_thumb;
     my $tags = $r->{params}{tags}.join " ", map { qq{"$_"} } $photo->tags_exif;
     $photo->add_tags($tags);
-warn "D";
     $photo->add_to_imageseek_library;
     Memories->zap_cache();
-warn "E";
-
     # Add system tags here
     my $tag = "date:".$photo->shot->ymd;
     $photo->add_to_system_tags({tag => Memories::SystemTag->find_or_create({name =>$tag}) });
@@ -243,7 +240,6 @@ sub add_comment :Exported {
 }
 
 use Cache::MemoryCache;
-use Image::Info qw(dim image_info);
 use Image::ExifTool;
 my $cache = new Cache::MemoryCache( { 'namespace' => 'MemoriesInfo' });
 
@@ -337,7 +333,6 @@ sub sized_url { # Use this rather than ->path from TT
     my $resized = Memories->config->{sizes}->[$size];
     if (!$resized) { cluck "Asked for crazy size $size"; return; }
     if ($resized eq "full") { return $self->path("url") }
-    warn "Looking for path ".$self->path(file => $resized);
     $self->scale($resized) 
         unless -e $self->path( file => $resized );
     return $self->path(url => $resized);
@@ -457,7 +452,7 @@ sub tags_exif {
         map { split /\s*,\s*/, $md{$_}}
         grep {$md{$_} and $md{$_} =~/[^ 0:]/}
         (qw(Keywords Subject City State Location Country Province-State), 
-        'Transmission Reference', 'Intellectual Genre', 
+        'Intellectual Genre', 
         'Country-Primary Location Name'
         );
     return keys %tags;