X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Memories%2FPhoto.pm;h=5a9b91e56aa133ea4cda60c948a12a6d7e7a9bba;hb=006c40622b5547fcbb693fb37e2216e1d0e7bb6e;hp=960810d59ab8fcf6414489c4fa35b430492d2496;hpb=af01b9b60fb8342adaca76f30bc9f9209d6bc326;p=memories.git

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index 960810d..5a9b91e 100644
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -2,19 +2,36 @@ package Memories::Photo;
 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));
 __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",
+     interesting => INTERESTINGNESS_ALGORITHM
+);
+
+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",
@@ -30,7 +47,10 @@ sub do_upload :Exported {
     my $photo = $self->create({
         uploader => $r->user,
         uploaded => Time::Piece->new(),
-        title => $r->params->{title}
+        title => $r->params->{title},
+        hit_count => 0,
+        rating => 0,
+        rated => 0, # Oh, the potential for divide by zero errors...
     });
 
     # Dump content
@@ -51,6 +71,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();
@@ -69,10 +90,28 @@ 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];
+    $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;
@@ -88,22 +127,27 @@ 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;
 
-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 {
@@ -260,7 +304,6 @@ sub scale {
     }
 }
 
-use Text::Balanced qw(extract_multiple extract_quotelike);
 sub edit_tags :Exported {
     my ($self, $r) = @_;
     my $photo = $r->objects->[0];
@@ -278,7 +321,7 @@ sub edit_tags :Exported {
 sub add_tags {
     my ($photo, $tagstring) = @_;
 
-    for my $tag (map { s/^"|"$//g; $_} extract_multiple(lc $tagstring, [ \&extract_quotelike, qr/([^\s]+)/ ], undef,1)) {
+    for my $tag (Tagtools->separate_tags($tagstring)) {
         $photo->add_to_tags({tag => Memories::Tag->find_or_create({name =>$tag}) })
     }
 }
@@ -314,4 +357,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;