X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Memories%2FPhoto.pm;h=4945dd8fc719510f045da426022b9692882dc649;hb=d6ac351d3aa425d6701da07e736aa2490b09468b;hp=12016efb3cf93d610e7b4ed274b8ea736b55ebae;hpb=429b1202cdefc39eb1b83d5f9f634f3a959db873;p=memories.git

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index 12016ef..4945dd8 100644
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -1,8 +1,9 @@
 package Memories::Photo;
+use Apache2::Upload;
 use File::Basename;
 use File::Copy;
 use Archive::Any;
-use File::Temp qw(tempdir);
+use File::Temp qw(tempdir tmpnam);
 use File::Path qw(rmtree);
 use File::Find;
 use File::MMagic;
@@ -13,7 +14,7 @@ use constant INTERESTINGNESS_ALGORITHM => '((rating+3)/(rated+1))*(1+rated/hit_c
 use Time::Piece;
 use Image::Seek;
 use constant PAGER_SYNTAX => "LimitXY";
-__PACKAGE__->columns(Essential => qw(id title uploader uploaded x y rating rated hit_count));
+__PACKAGE__->columns(Essential => qw(id title uploader uploaded x y rating rated hit_count format));
 __PACKAGE__->untaint_columns(printable => [qw/title/]);
 __PACKAGE__->columns(TEMP => qw/exif_object/);
 
@@ -93,9 +94,10 @@ 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/) {
+    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) {
+        return $self->upload_raw($r, $filename, $offered_name);
     } elsif ($res =~ m{image/jpeg}) {
         return $self->upload_jpeg($r, $filename, $offered_name);
     } else {
@@ -118,6 +120,20 @@ sub upload_archive {
     return @results;
 }
 
+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
+    copy($filename, 
+         Memories->config->{data_store}."/".$photo->id.".".$format);
+    return $photo;
+}
+
 sub upload_jpeg {
     my ($self, $r, $filename, $offered_name) = @_;
     my $photo = $self->create({
@@ -129,7 +145,8 @@ sub upload_jpeg {
         rated => 0,
     });
     if (!copy($filename, $photo->path("file"))) {
-        $photo->delete(); die "Couldn't copy photo: $!";
+	warn "Couldn't copy photo to ".$photo->path("file").": $!";
+        $photo->delete(); die;
     }
     my ($x, $y) = dim(image_info($photo->path));
     $photo->x($x); $photo->y($y);
@@ -145,7 +162,6 @@ sub upload_jpeg {
     $photo->add_tags($tags);
     $photo->add_to_imageseek_library;
     Memories->zap_cache();
-
     # Add system tags here
     my $tag = "date:".$photo->shot->ymd;
     $photo->add_to_system_tags({tag => Memories::SystemTag->find_or_create({name =>$tag}) });
@@ -222,10 +238,6 @@ sub add_comment :Exported {
     });
 }
 
-sub format { 
-    "jpg" # For now
-} 
-
 use Cache::MemoryCache;
 use Image::Info qw(dim image_info);
 use Image::ExifTool;
@@ -290,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};
@@ -321,21 +333,24 @@ 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") {mkpath($path);}
-    $path .= $self->id.".".$self->format;
+    if ($is_url ne "url" and ! -d $path) {mkpath($path) or die "Couldn't make path $path: $!";}
+    if ($scale or ($is_url ne "url" and !$raw)) { 
+        $path .= $self->id.".jpg";
+    } else {
+        $path .= $self->id.".".($self->format||"jpg");
+    }
     return $path;
 }