my ($self, $r, $filename, $offered_name) = @_;
my $mm = File::MMagic->new;
my $res = $mm->checktype_filename($filename);
my ($self, $r, $filename, $offered_name) = @_;
my $mm = File::MMagic->new;
my $res = $mm->checktype_filename($filename);
if ($res =~ m{/x-zip} or $offered_name =~ /t(ar\.)?gz$/i) {
return $self->upload_archive($r, $filename);
if ($res =~ m{/x-zip} or $offered_name =~ /t(ar\.)?gz$/i) {
return $self->upload_archive($r, $filename);
return $self->upload_raw($r, $filename, $offered_name);
} elsif ($res =~ m{image/jpeg}) {
return $self->upload_jpeg($r, $filename, $offered_name);
return $self->upload_raw($r, $filename, $offered_name);
} elsif ($res =~ m{image/jpeg}) {
return $self->upload_jpeg($r, $filename, $offered_name);
my ($self, $r, $filename, $offered_name) = @_;
my $jpg = tmpnam().".jpg";
system("dcraw -c $filename | convert - $jpg");
my ($self, $r, $filename, $offered_name) = @_;
my $jpg = tmpnam().".jpg";
system("dcraw -c $filename | convert - $jpg");
# Add system tags here
my $tag = "date:".$photo->shot->ymd;
$photo->add_to_system_tags({tag => Memories::SystemTag->find_or_create({name =>$tag}) });
# 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']);
sub _exif_info {
my $exifTool = new Image::ExifTool;
$exifTool->Options(Group0 => ['IPTC', 'EXIF', 'XMP', 'MakerNotes', 'Composite']);
my $resized = Memories->config->{sizes}->[$size];
if (!$resized) { cluck "Asked for crazy size $size"; return; }
if ($resized eq "full") { return $self->path("url") }
my $resized = Memories->config->{sizes}->[$size];
if (!$resized) { cluck "Asked for crazy size $size"; return; }
if ($resized eq "full") { return $self->path("url") }
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;
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)) {
map { split /\s*,\s*/, $md{$_}}
grep {$md{$_} and $md{$_} =~/[^ 0:]/}
(qw(Keywords Subject City State Location Country Province-State),
map { split /\s*,\s*/, $md{$_}}
grep {$md{$_} and $md{$_} =~/[^ 0:]/}
(qw(Keywords Subject City State Location Country Province-State),