X-Git-Url: https://git.decadent.org.uk/gitweb/?a=blobdiff_plain;f=Memories%2FPhoto.pm;h=960810d59ab8fcf6414489c4fa35b430492d2496;hb=7f2c0b18cfff36d5a9d0f93e9cb4102d6a931768;hp=a0c3f1bbc1d664a980454538029bcca78116f325;hpb=9349742f0a812cee11d74955bd5d26facd69f8d8;p=memories.git

diff --git a/Memories/Photo.pm b/Memories/Photo.pm
index a0c3f1b..960810d 100644
--- a/Memories/Photo.pm
+++ b/Memories/Photo.pm
@@ -30,7 +30,7 @@ sub do_upload :Exported {
     my $photo = $self->create({
         uploader => $r->user,
         uploaded => Time::Piece->new(),
-        title => ($r->params->{title} || $upload{filename})
+        title => $r->params->{title}
     });
 
     # Dump content
@@ -45,7 +45,10 @@ sub do_upload :Exported {
     $photo->x($x); $photo->y($y);
 
     # Rotate?
-    $photo->unrotate();
+    $photo->unrotate(); 
+    if (!$photo->title){ 
+        $photo->title($photo->title_exif || $upload{filename});
+    }
 
     $photo->make_thumb;
     $photo->add_tags($r->{params}{tags});
@@ -179,7 +182,7 @@ my %banned_tags = map { $_ => 1 }
 
 sub _exif_info {
     my $exifTool = new Image::ExifTool;
-    $exifTool->Options(Group0 => ['IPTC', 'EXIF', 'MakerNotes', 'Composite']);
+    $exifTool->Options(Group0 => ['IPTC', 'EXIF', 'XMP', 'MakerNotes', 'Composite']);
     my $info = $exifTool->ImageInfo(shift->path);
     my $hash = {};
     foreach my $tag ($exifTool->GetFoundTags('Group0')) {
@@ -280,15 +283,35 @@ sub add_tags {
     }
 }
 
+# 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') }
 1;