package Memories::Photo;
+#use Apache2::Upload;
+use File::Basename;
+use File::Copy;
+use Archive::Any;
+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);
+use constant INTERESTINGNESS_ALGORITHM => '((rating+3)/(rated+1))*(1+rated/hit_count)*(1+hit_count/(select max(hit_count) from photo))';
use Time::Piece;
use Image::Seek;
use constant PAGER_SYNTAX => "LimitXY";
-__PACKAGE__->columns(Essential => qw(id title uploader uploaded x y));
+__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/);
-__PACKAGE__->set_sql(recent => q{
-SELECT __ESSENTIAL__
-FROM __TABLE__
-ORDER BY uploaded DESC
-LIMIT 4
-});
+BEGIN {
+my %order_by = (
+ recent => "uploaded",
+ popular => "hit_count",
+ loved => "rating/(1+rated)",
+ interesting => INTERESTINGNESS_ALGORITHM,
+ random => "rand()"
+);
+
+while (my($label, $how) = each %order_by) {
+ __PACKAGE__->set_sql($label => qq{
+ SELECT __ESSENTIAL__
+ FROM __TABLE__
+ ORDER BY $how DESC
+ LIMIT 4
+ });
+ no strict;
+ *$label = sub {
+ my ($self, $r) = @_;
+ $self->view_paged_ordered($r, "$how desc");
+ };
+ __PACKAGE__->MODIFY_CODE_ATTRIBUTES(*{$label}{CODE}, "Exported"); # Hack
+}
+}
__PACKAGE__->has_many(comments => "Memories::Comment");
__PACKAGE__->has_a(uploader => "Memories::User");
__PACKAGE__->has_a(uploaded => "Time::Piece",
sub do_upload :Exported {
my ($self, $r) = @_;
- my %upload = $r->upload("photo");
+ my $upload = $r->{ar}->upload("photo");
+ # Check $self->type
+ my @photos = ($self->upload_file($r, $upload->tempname, $upload->filename));
+ my @quarantined = grep { !$_->tags } @photos;
+ # Set it up to go again
+ if (@quarantined) {
+ $r->{session}{quarantined} = join ",", sort map { $_->id} @quarantined;
+ $r->objects(\@quarantined);
+ $r->template("quarantine");
+ return;
+ }
+ $r->objects(\@photos);
+ if (@photos == 0) { $r->template("upload"); return }
+ if (@photos > 1) { $r->template_args->{title} = "This upload"; $r->template("paged") }
+ else { $r->template("view"); }
+ $r->message("Thanks for the upload!");
+}
- # XXX Stop anonymous uploads!
+sub quarantine :Exported {
+ my ($self, $r) = @_;
+ my @quarantined = split /,/, $r->{session}{quarantined};
+ my %q = map { $_ => 1 } @quarantined;
+ for (map /(\d+)/,grep /tags\d+/, keys %{$r->{params}}) {
+ my $tags = $r->{params}{"tags$_"};
+ next unless $tags;
+ if (my $photo = $self->retrieve($_)) {
+ $photo->add_tags($tags);
+ delete $q{$_};
+ }
+ }
+ $r->{session}{quarantined} = join ",", sort keys %q;
+ if (!$r->{session}{quarantined}) {
+ $r->template_args->{title} = "This upload"; $r->template("paged");
+ $r->objects([ map { $self->retrieve($_) } @quarantined ]);
+ } else {
+ $r->objects([ map { $self->retrieve($_) } sort keys %q ]);
+ }
+}
+
+sub upload_file {
+ 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);
+ } 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 {
+ $r->message(basename($offered_name).": I can't handle $res files yet");
+ return ();
+ }
+}
+
+sub upload_archive {
+ my ($self, $r, $filename, $tags) = @_;
+ $r->{params}{title} = ""; # Kill that dead.
+ my $archive = Archive::Any->new($filename);
+ my $dir = tempdir();
+ $archive->extract($dir);
+ my @results;
+ find({ wanted => sub { return unless -f $_;
+ push @results, $self->upload_file($r, $_, $_) },
+ no_chdir => 1}, $dir);
+ rmtree($dir);
+ return @results;
+}
+
+sub upload_raw {
+ my ($self, $r, $filename, $offered_name) = @_;
+ my $jpg = tmpnam().".jpg";
+ system("dcraw -c $filename | convert - $jpg");
+ $filename =~ /\.(.*)$/;
+ my $format = $1;
+ # 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;
+}
+
+sub upload_jpeg {
+ my ($self, $r, $filename, $offered_name) = @_;
my $photo = $self->create({
uploader => $r->user,
uploaded => Time::Piece->new(),
- title => ($r->params->{title} || $upload{filename})
+ title => ($r->{params}{title} || basename($offered_name)),
+ hit_count => 0,
+ rating => 0,
+ rated => 0,
});
-
- # Dump content
- if (!open OUT, ">". $photo->path("file")) {
- die "Can't write ".$photo->path("file")." because $!";
+ if (!copy($filename, $photo->path("file"))) {
+ warn "Couldn't copy photo to ".$photo->path("file").": $!";
+ $photo->delete(); die;
}
- # XXX Check it's a JPEG, etc.
- # XXX Unzip ZIP file
- print OUT $upload{content};
- close OUT;
- my ($x, $y) = dim(image_info($photo->path));
+ my ($x, $y, undef) = imgsize($photo->path);
$photo->x($x); $photo->y($y);
# Rotate?
- $photo->unrotate();
+ $photo->unrotate();
+ if (!$photo->title){
+ $photo->title($photo->title_exif || basename($filename));
+ }
$photo->make_thumb;
- $photo->add_tags($r->{params}{tags});
+ my $tags = $r->{params}{tags}.join " ", map { qq{"$_"} } $photo->tags_exif;
+ $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}) });
+ $photo->add_to_system_tags({system_tag => Memories::SystemTag->find_or_create({name =>$tag}) });
+ return $photo;
+}
- # Set it up to go again
- $r->objects([$photo]);
- $r->template("view");
- $r->message("Thanks for the upload! ".
- ($r->{params}{tags} ? ""
- : "Don't forget to <a href=\"?".$r->config->uri_base."photo/view/".$photo->id."?active=tagedit\">tag your photo</a>"
- )
- );
+sub approx_rating {
+ my $self = shift;
+ $self->rated or return 0;
+ int($self->rating/$self->rated*10)/10;
+}
+
+sub add_rating :Exported {
+ my ($self, $r) = @_;
+ my $photo = $r->{objects}[0];
+ my $delta = $r->{params}{rating};
+ if ($delta <= 0 or $delta > 5) { return; } # Scammer
+ # XXX Race
+ $photo->rating($photo->rating() + $delta);
+ $photo->rated($photo->rated() + 1);
+ $r->output(""); # Only used by ajax
}
sub view :Exported {
my ($self, $r) = @_;
+ my $photo = $r->{objects}[0];
+ $photo->hit_count($photo->hit_count()+1);
if ($r->{session}{last_search}) {
- my $photo = $r->{objects}[0];
# This is slightly inefficient
my @search = split/,/, $r->{session}{last_search};
my $found = -1;
}
}
sub upload :Exported {}
+sub exif :Exported {}
+sub comment :Exported {}
+sub tagedit :Exported {}
+sub similar :Exported {}
+sub sized :Exported {}
+sub delete :Exported {
+ my ($self, $r, $photo) = @_;
+ if ($r) {
+ if ($photo and $photo->uploader == $r->user) {
+ $photo->delete;
+ $r->message("Photo deleted!");
+ }
+ $r->template("frontpage");
+ } else { $self->SUPER::delete() }
+}
use Class::DBI::Plugin::Pager;
use Class::DBI::Plugin::AbstractCount;
-sub recent :Exported {
- my ($self, $r) = @_;
+sub view_paged_ordered {
+ my ($self, $r, $how) = @_;
my $page = $r->params->{page} || 1;
my $pager = $self->pager(
per_page => Memories->config->{photos_per_page},
page => $page,
syntax => PAGER_SYNTAX,
- order_by => "uploaded desc"
+ order_by => $how
);
$r->objects([$pager->retrieve_all ]);
$r->{template_args}{pager} = $pager;
$r->last_search;
+ $r->template("paged"); # Set the what using the action name
}
sub add_comment :Exported {
my ($self, $r, $photo) = @_;
$r->template("view");
+ if ($r->params->{content} =~ /\S/) {
$r->objects->[0]->add_to_comments({
name => $r->params->{name},
content => $r->params->{content}
});
+ }
}
-sub format {
- "jpg" # For now
-}
-
use Cache::MemoryCache;
-use Image::Info qw(dim image_info);
use Image::ExifTool;
my $cache = new Cache::MemoryCache( { 'namespace' => 'MemoriesInfo' });
$info;
}
+my %banned_tags = map { $_ => 1 }
+ qw( CodedCharacterSet ApplicationRecordVersion );
+
sub _exif_info {
my $exifTool = new Image::ExifTool;
- $exifTool->Options(Group0 => ['EXIF', 'MakerNotes', 'Composite']);
- my $info = $exifTool->ImageInfo(shift->path);
+ $exifTool->Options(Group0 => ['IPTC', 'EXIF', 'XMP', 'MakerNotes', 'Composite']);
+ my $info = $exifTool->ImageInfo(shift->path(0,0,1));
my $hash = {};
foreach my $tag ($exifTool->GetFoundTags('Group0')) {
+ next if $banned_tags{$tag};
my $group = $exifTool->GetGroup($tag);
my $val = $info->{$tag};
next if ref $val eq 'SCALAR';
- next if $val =~ /^[0\s]*$/;
+ next if $val =~ /^[0\s]*$/ or $val =~ /^nil$/;
$hash->{$group}->{$exifTool->GetDescription($tag)} = $val;
}
return $hash;
}
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;
}
}
}
-use Text::Balanced qw(extract_multiple extract_quotelike);
sub edit_tags :Exported {
my ($self, $r) = @_;
my $photo = $r->objects->[0];
my %params = %{$r->params};
+ my $exifTool = new Image::ExifTool;
for (keys %params) {
next unless /delete_(\d+)/;
my $tagging = Memories::Tagging->retrieve($1) or next;
next unless $tagging->photo->id == $photo->id;
+ $exifTool->SetNewValue(Keywords => $1, DelValue => 1);
$tagging->delete;
}
+ $exifTool->WriteInfo($photo->path);
$photo->add_tags($params{newtags});
$r->template("view");
}
sub add_tags {
my ($photo, $tagstring) = @_;
+ my $exifTool = new Image::ExifTool;
- for my $tag (map { s/^"|"$//g; $_} extract_multiple(lc $tagstring, [ \&extract_quotelike, qr/([^\s]+)/ ], undef,1)) {
- $photo->add_to_tags({tag => Memories::Tag->find_or_create({name =>$tag}) })
+ for my $tag (Tagtools->separate_tags($tagstring)) {
+ $photo->add_to_tags({tag => Memories::Tag->find_or_create({name =>$tag}) });
+ $exifTool->SetNewValue(Keywords => $tag, AddValue => 1);
}
+ $exifTool->WriteInfo($photo->path);
+}
+
+# Work out some common properties from a set of potential photo metadata
+# tags
+sub _grovel_metadata {
+ my ($self, @tags) = @_;
+ my %md = map {%$_} values %{$self->exif_info};
+ for (@tags) {
+ if ($md{$_} and $md{$_} =~/[^ 0:]/) { return $md{$_} }
+ }
+ return;
}
sub shot {
- my $self = shift;
- my $exif = $self->exif_info->{EXIF};
- my ($dt) =
- grep {$_ and /[^ 0:]/}
- ($exif->{ 'Shooting Date/Time' },
- $exif->{ 'Date/Time Of Digitization' },
- $exif->{ 'Date/Time Of Last Modification' });
- if (!$dt) { return $self->uploaded }
- return Time::Piece->strptime($dt, "%Y:%m:%d %T") || $self->uploaded;
+ my $self = shift;
+ my $dt = $self->_grovel_metadata(
+ 'Shooting Date/Time',
+ 'Date/Time Of Digitization',
+ 'Date/Time Of Last Modification'
+ );
+ if (!$dt) { return $self->uploaded }
+ return Time::Piece->strptime($dt, "%Y:%m:%d %T") || $self->uploaded;
+}
+
+sub description {
+ shift->_grovel_metadata(
+ 'Description', 'Image Description', 'Caption-Abstract'
+ );
+}
+
+sub title_exif { shift->_grovel_metadata( 'Headline', 'Title'); }
+sub license { shift->_grovel_metadata( 'Rights Usage Terms', 'Usage Terms' ) }
+sub copyright { shift->_grovel_metadata( 'Rights', 'Copyright', 'Copyright Notice') }
+
+# This one's slightly different since we want everything we can get...
+sub tags_exif {
+ my $self = shift;
+ my %md = map {%$_} values %{$self->exif_info};
+ my %tags =
+ map { s/\s+/-/g; lc $_ => 1 }
+ map { split /\s*,\s*/, $md{$_}}
+ grep {$md{$_} and $md{$_} =~/[^ 0:]/}
+ (qw(Keywords Subject City State Location Country Province-State),
+ 'Intellectual Genre',
+ 'Country-Primary Location Name'
+ );
+ return keys %tags;
}
1;
projects / memories.git / blobdiff