Changeset 6426 for extensions/pLoader/trunk/src/Uploader/Image.pm

Timestamp:

May 31, 2010, 9:35:46 AM (14 years ago)

Author:

ronosman

Message:

Bug 1710 fixed : pLoader lack of concurrency support causes data inconsistency.

File:

• extensions/pLoader/trunk/src/Uploader/Image.pm (modified) (2 diffs)

extensions/pLoader/trunk/src/Uploader/Image.pm

@@ -21 +21 @@
 use strict;
 use base qw/Uploader::Object/;
+use File::Spec;
+use Image::ExifTool qw(:Public);
+use Data::Dumper;
 
-__PACKAGE__->mk_accessors(
-    qw/
-        file
-        wx_thumb_file
-        site_high_file
-        site_name
-        site_resized_file
-        site_thumb_file
-        site_author
-        site_comment
-        site_original_filename
-        exif_metadata
-        add_rank
-        site_categories
-        site_tags
-        file_sum
-                width
-                height
-                privacy_level
-        caption
-    /
-);
+# we need a ref to data preferences to use with threads
+my @properties = qw/
+    file
+    wx_thumb_file
+    site_high_file
+    site_name
+    site_resized_file
+    site_thumb_file
+    site_author
+    site_comment
+    site_original_filename
+    exif_metadata
+    add_rank
+    site_categories
+    site_tags
+    image_id
+    width
+    height
+    privacy_level
+    caption
+    global_rank
+/;
+
+my $init_caption_from_pattern_cbk;
+
+__PACKAGE__->mk_accessors(@properties);
 
 sub Init {
     my ( $self ) = @_;
 
+
+    my $exif = $self->read_exif_metadata(
+        $self->file
+    );
+
+    $self->exif_metadata(
+        $self->select_exif_data($exif)
+    );
+
+        
+
+    $self->site_original_filename(
+        $self->original_filename
+    );
+
 }
+
+
+sub read_exif_metadata {
+    my ( $self, $file ) = @_;
+    
+    # read exif metadata
+    my $info;
+    eval {
+        $info = ImageInfo( $file );
+    };
+    $info = {} if($@);
+    
+    $info;
+}
+
 
 sub exif_tag {
     my ( $self, $tag ) = @_;
-        
+
     my $exif = $self->exif_metadata ;
     
-    $exif->{$tag};      
+    $exif->{$tag};
 }
+
 
 sub create_date {
@@ -64 +102 @@
    
     $self->{-create_date} ||= $exif->{CreateDate};
-        
+
     $self->{-create_date} = $date if defined $date;
 
-        $self->{-create_date};
+    $self->{-create_date};
 }
 
 
+sub select_exif_data {
+    my ( $self, $exif ) = @_;
+
+    return {
+        map {
+            $_ => $exif->{$_},
+        }
+        qw/
+            CreateDate
+            ImageWidth
+            ImageHeight
+            Orientation
+            DateTimeOriginal
+            ISO
+            ExposureTime
+            ApertureValue
+            FocalLength
+            Lens
+            Exposure
+            Make
+            Model
+        /
+    };    
+}
+
+
+sub original_filename {
+    my ( $self ) = @_;
+
+    my ( $vol, $dir, $filename ) = File::Spec->splitpath(
+        $self->file
+    );
+
+    $filename;
+}
+
+sub get_data {
+    my ( $self, $preferences, $destination_category, $add_rank ) = @_;
+
+    my $data = {
+        map { $_ => $self->$_ } @properties
+    };
+    $data->{preferences} = $preferences;
+    $data->{categories}  = $destination_category;
+    $data->{site_img_date_creation} = $self->create_date;
+    $data->{add_rank} = $add_rank;
+
+    return $data;
+}
 
 1;