X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Memories%2FPhoto.pm;h=771c3a6ba3f6e619ed704b1d9f783394426b161d;hb=92f8c80c61d9b1f90c0cd25e79710fc8e7963f4c;hp=4279dc97c0eb4c622ec365390d97dd424938ae3e;hpb=0ac6758a593e0e8ebad7af6aba3c3512d4d8280f;p=memories.git diff --git a/Memories/Photo.pm b/Memories/Photo.pm index 4279dc9..771c3a6 100644 --- a/Memories/Photo.pm +++ b/Memories/Photo.pm @@ -54,6 +54,7 @@ sub do_upload :Exported { } $photo->make_thumb; + $r->{params}{tags} ||= join " ", map { qq{"$_"} } $photo->tags_exif; $photo->add_tags($r->{params}{tags}); $photo->add_to_imageseek_library; Memories->zap_cache(); @@ -72,6 +73,23 @@ sub do_upload :Exported { ); } +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]; @@ -92,6 +110,10 @@ sub view :Exported { } } sub upload :Exported {} +sub exif :Exported {} +sub comment :Exported {} +sub tagedit :Exported {} +sub similar :Exported {} use Class::DBI::Plugin::Pager; use Class::DBI::Plugin::AbstractCount; @@ -318,4 +340,19 @@ sub description { 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), + 'Transmission Reference', 'Intellectual Genre', + 'Country-Primary Location Name' + ); + return keys %tags; +} 1;