package Memories::Photo;
+use Apache2::Upload;
use File::Basename;
use File::Copy;
use Archive::Any;
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)/i) {
+ } 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);
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);
$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}) });
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};
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);}
- if ($scale or $is_url ne "url") {
+ 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");