X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Memories%2FPhoto.pm;h=5ce8d956145728a8906e6f6418b78aba0893cd95;hb=2fbbd5523381d92d751d9930ccd2993449a508da;hp=3af95ce787c57e87ac73b4509b3601af46b63e04;hpb=ee3791309bc60968e2ec00e5bc2d5158253b1dce;p=memories.git

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index 3af95ce..5ce8d95 100644
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -1,5 +1,5 @@
 package Memories::Photo;
-use Apache2::Upload;
+#use Apache2::Upload;
 use File::Basename;
 use File::Copy;
 use Archive::Any;
@@ -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);
@@ -64,7 +65,7 @@ sub do_upload :Exported {
     }
     $r->objects(\@photos);
     if (@photos == 0) { $r->template("upload"); return  }
-    if (@photos > 1) { $r->template("list") } 
+    if (@photos > 1) { $r->template_args->{title} = "This upload"; $r->template("paged") } 
     else { $r->template("view"); }
     $r->message("Thanks for the upload!"); 
 }
@@ -83,7 +84,7 @@ sub quarantine :Exported {
     }
     $r->{session}{quarantined} = join ",", sort keys %q;
     if (!$r->{session}{quarantined}) {
-        $r->template("list");
+        $r->template_args->{title} = "This upload"; $r->template("paged");
         $r->objects([ map { $self->retrieve($_) } @quarantined ]);
     } else {
         $r->objects([ map { $self->retrieve($_) } sort keys %q ]);
@@ -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,11 +125,11 @@ 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
+    my $photo = $self->upload_jpeg($r, $jpg, $offered_name);
+    $photo->format($format);
     copy($filename, 
          Memories->config->{data_store}."/".$photo->id.".".$format);
     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' });
 
@@ -306,7 +302,7 @@ my %banned_tags = map { $_ => 1 }
 sub _exif_info {
     my $exifTool = new Image::ExifTool;
     $exifTool->Options(Group0 => ['IPTC', 'EXIF', 'XMP', 'MakerNotes', 'Composite']);
-    my $info = $exifTool->ImageInfo(shift->path);
+    my $info = $exifTool->ImageInfo(shift->path(0,0,1));
     my $hash = {};
     foreach my $tag ($exifTool->GetFoundTags('Group0')) {
         next if $banned_tags{$tag};
@@ -337,21 +333,20 @@ 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);
 }
 
 sub path { 
-    my ($self, $is_url, $scale) = @_;
+    my ($self, $is_url, $scale, $raw) = @_;
     my $path =
         Memories->config->{$is_url eq "url" ? "data_store_external" : "data_store" };
     if ($scale) { $path .= "$scale/" }
     # Make dir if it doesn't exist, save trouble later
     use File::Path;
     if ($is_url ne "url" and ! -d $path) {mkpath($path) or die "Couldn't make path $path: $!";}
-    if ($scale or $is_url ne "url") { 
+    if ($scale or ($is_url ne "url" and !$raw)) { 
         $path .= $self->id.".jpg";
     } else {
         $path .= $self->id.".".($self->format||"jpg");
@@ -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;