Changeset 3177

Timestamp:

Mar 7, 2009, 8:22:06 PM (15 years ago)

Author:

ronosman

Message:

Features 914, 920, 921, 924 added ( sorry plg, it's a global commit ). Add an option to upload an already resized image. In that case, pLoader does not create any resized image and uploads original as a resized. Add properties to define custom preview ( option to not use exif preview and create a preview based on a preview ratio ).

Location:

extras/pLoader/trunk/src/Uploader

Files:

• Image.pm (modified) (1 diff)
• ImageList.pm (modified) (19 diffs)

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

@@ -37 +37 @@
         site_categories
         site_tags
+        preview_w
+        preview_h
     /
 );

extras/pLoader/trunk/src/Uploader/ImageList.pm

@@ -72 +72 @@
                 pwg
                 upload_high
+                wx_quality
+                th_quality
+                auto_rotate
+                interlace
+                create_resized
+                use_exif_preview
      /
 );
@@ -101 +107 @@
 }
 
-# Rotate exif preview if needed
-sub _rotate_image {
-    my ( $self, $file ) = @_;   
-
-}
 
 sub _set_exif_tag {
@@ -205 +206 @@
         $self->_set_current_image_filepaths();
 
-        my $create_gui_preview;        
-        # an exif preview is available. we try to use it
-        if(defined $info->{PreviewImage} ){
-            printf("use preview\n");
-            $self->_write_preview_image( $info->{PreviewImage} );
-            my $image = new Image::Magick;
-            eval {
-                $create_gui_preview = $image->ReadImage(
-                    $self->current_image->preview_file
-                );
-            };
-            unlink $self->current_image->preview_file if $create_gui_preview;
-        }else {
+        my $create_gui_preview;
+        if($self->use_exif_preview){        
+            # an exif preview is available. we try to use it
+            if(defined $info->{PreviewImage} ){
+                printf("use preview\n");
+                $self->_write_preview_image( $info->{PreviewImage} );
+                my $image = new Image::Magick;
+                eval {
+                        $create_gui_preview = $image->ReadImage(
+                        $self->current_image->preview_file
+                    );
+                };
+                unlink $self->current_image->preview_file if $create_gui_preview;
+            }
+            else {
+                $create_gui_preview = 1;
+            }
+        }
+        else {
             $create_gui_preview = 1;
         }
-        print $create_gui_preview, "\n";
+        print "create gui preview", $create_gui_preview, "\n";
         # have to create a preview file
         if($create_gui_preview) {
@@ -242 +249 @@
         $self->RotateImage(
             $self->current_image->preview_file,
-        );
+        ) if $self->auto_rotate;
 
         $self->_set_exif_tag(
@@ -248 +255 @@
             'Orientation',
             'Horizontal (normal)',
-        );
+        ) if $self->auto_rotate;
 
 
@@ -357 +364 @@
     return $rval if $status;
 
+    $self->current_image->preview_w(
+        $image->Get('width')
+    );
+    $self->current_image->preview_h(
+        $image->Get('height')
+    );
+
+
     $status = $image->Thumbnail(
         geometry=>sprintf("%s%s>", $size*$size, '@')
@@ -374 +389 @@
     );
 
-    $image->Set(quality=>100);
+    $image->Set(
+        quality=>$self->wx_quality
+    );
 
     $status = $image->Strip();
@@ -398 +415 @@
 sub CreateGUIPreview {
     my ( $self ) = @_;
-
+    printf("CreateGUIPreview %s\n", $self->current_image->preview_file );
     return 1 if( -e $self->current_image->preview_file );
     
@@ -410 +427 @@
     my $status = $image->Read(
         sprintf(
-            "'%s'",
+            "%s",
             $self->current_image->file,
         )
@@ -435 +452 @@
 
 
-    $image->Set(quality=>$self->quality);
+    $image->Set(quality=>$self->wx_quality);
 
 
@@ -460 +477 @@
     return $rval if( -e $self->current_image->site_resized_file );
 
-printf(
-    "Create resized %s\n",
-    $self->current_image->file,
-);     
+    printf(
+        "Create resized %s\n",
+        $self->current_image->file,
+    );     
 
     my $image = new Image::Magick;
@@ -513 +530 @@
     warn "$status" if $status ;
 
-    $status = $image->Set(interlace=>'Line');
+    $status = $image->Set(interlace=>$self->interlace);
     warn "$status" if $status ;
 
@@ -561 +578 @@
     warn "$status" if $status ;
 
-    $status = $image->Set(quality=>$self->quality);
+    $status = $image->Set(quality=>$self->th_quality);
     warn "$status" if $status ;
 
@@ -624 +641 @@
                 blur
                 quality
+                wx_quality
+                th_quality
                 prefix
                 author
@@ -643 +662 @@
                 default_name_prefix
                 upload_high
+                auto_rotate
+                interlace
+                create_resized
+                use_exif_preview
             /
         ] 
@@ -722 +745 @@
         croak "Upload cancelled." if $@ ;
 
-        eval {
-            if(!$self->CreateResized()){
-                printf("CreateResized failed %s. Use ResizeCallback\n", $@);
-                # use method provided by the caller
-                # source, target, type, ratio, width, $height
-                $self->ResizeCallback->(
-                    $self->current_image->file,
-                    $self->current_image->site_resized_file,
-                    $self->type,
-                    undef,
-                    $self->resize_w,
-                    $self->resize_h,
-                    $self->quality,
-                );
+        if( $self->create_resized ){
+            eval {
+                if(!$self->CreateResized()){
+                    printf("CreateResized failed %s. Use ResizeCallback\n", $@);
+                    # use method provided by the caller
+                    # source, target, type, ratio, width, $height
+                    $self->ResizeCallback->(
+                        $self->current_image->file,
+                        $self->current_image->site_resized_file,
+                        $self->type,
+                        undef,
+                        $self->resize_w,
+                        $self->resize_h,
+                        $self->quality,
+                    );
                 
-                $self->RotateImage(
-                    $self->current_image->site_resized_file,
-                );
-            }
-        };
-
-        $self->_set_exif_tag(
-            $self->current_image->site_resized_file,
-            'Orientation',
-            'Horizontal (normal)',
-        );
+                    $self->RotateImage(
+                        $self->current_image->site_resized_file,
+                    ) if $self->auto_rotate;
+                }
+            };
+            $self->_set_exif_tag(
+                $self->current_image->site_resized_file,
+                'Orientation',
+                'Horizontal (normal)',
+            ) if $self->auto_rotate;
+        }
+        # the original is at the right size, no need to create a resize
+        else {
+            $self->current_image->site_resized_file(
+                $self->current_image->file,
+            );
+        }
+
 
 
@@ -754 +785 @@
             $self->CreateHigh();
         }
-
-
-
 
         $msg = sprintf(
@@ -848 +876 @@
     
     # Valid for Rotate 180, Rotate 90 CW, Rotate 270 CW
-    if( $orientation =~ m/Rotate (\d+)/ ){
+    if( $self->auto_rotate and $orientation =~ m/Rotate (\d+)/ ){
 
         my ( $vol, $dir, $file ) = File::Spec->splitpath(
@@ -892 +920 @@
         );
 
-
         # Now all images that need to be rotated are done. Update exif
         $self->current_image->exif_metadata->{Orientation} = 'Horizontal (normal)';