Merge pull request #6 from alpha6/check_scale_exists

Check scale exists

application.conf.example

@@ -1,4 +1,11 @@
 {
     db_file => 'sql/fotostore.db',
     invite_code => 'very_secure_invite_code',
+    thumbnails_size => 200,
+    image_scales => {
+        640 => 1,
+        800 => 1,
+        1024 => 1,
+        2048 => 1,
+    },
 }

fotostore.pl

@@ -17,7 +17,7 @@ use Digest::SHA;
 use FotoStore::DB;
 
 use Data::Dumper;
-$Data::Dumper::Maxdepth = 3;
+$Data::Dumper::Maxdepth = 2;
 
 my $config = plugin 'Config' => { file => 'application.conf' };
 
@@ -27,14 +27,20 @@ my $db = FotoStore::DB->new( $config->{'db_file'} );
 my $IMAGE_BASE = 'images';
 my $ORIG_DIR   = 'orig';
 
-my $thumbs_size = 200;
+# set allowed thumbnails scale and image scales
+my $thumbs_size = $config->{'thumbnails_size'};
 
-my @scale_width = ( $thumbs_size, 640, 800, 1024 );
+my $scales_map = $config->{'image_scales'};
+$scales_map->{$thumbs_size} = 1;
+
+#Sort and filter values for array of available scales
+my @scale_width =
+  map { $scales_map->{$_} == 1 ? $_ : undef }
+  sort { $a <=> $b } keys(%$scales_map);
 
 my $sha = Digest::SHA->new('sha256');
 
 # Directory to save image files
-# (app is Mojolicious object. static is MojoX::Dispatcher::Static object)
 my $IMAGE_DIR = File::Spec->catfile( getcwd(), 'public', $IMAGE_BASE );
 
 plugin 'authentication', {
@@ -54,7 +60,6 @@ plugin 'authentication', {
         my $digest = $sha->add($password);
 
         my $user_id = $db->check_user( $username, $digest->hexdigest() );
-        # $self->app->log->debug("user id: [$user_id]");
 
         return $user_id;
     },
@@ -93,10 +98,14 @@ post '/register' => ( authenticated => 0 ) => sub {
     my $invite   = $self->req->param('invite');
 
     if ( $invite eq $config->{'invite_code'} ) {
+
         #chek that username is not taken
         my $user = $db->get_user($username);
         if ( $user->{'user_id'} > 0 ) {
-            $self->render(template => 'error', message => 'Username already taken!');
+            $self->render(
+                template => 'error',
+                message  => 'Username already taken!'
+            );
             return 0;
         }
 
@@ -112,10 +121,11 @@ post '/register' => ( authenticated => 0 ) => sub {
             $self->redirect_to('/');
         }
         else {
-            $self->render( text => 'Login failed :(' );
+            $self->render( template => 'error', message => 'Login failed :(' );
         }
 
-    } else  {
+    }
+    else {
         $self->render( template => 'error', message => 'invalid invite code' );
     }
 };
@@ -132,10 +142,13 @@ get '/get_images' => ( authenticated => 1 ) => sub {
     my $self = shift;
 
     my $current_user = $self->current_user;
+    my $user_id      = $current_user->{'user_id'};
 
     my $files_list = $db->get_files( $current_user->{'user_id'}, 20 );
 
-    my $thumbs_dir = File::Spec->catfile( $IMAGE_DIR, $current_user->{'user_id'}, $thumbs_size );
+    my $thumbs_dir =
+      File::Spec->catfile( $IMAGE_DIR, $current_user->{'user_id'},
+        $thumbs_size );
 
     my @images = map { $_->{'file_name'} } @$files_list;
 
@@ -145,12 +158,28 @@ get '/get_images' => ( authenticated => 1 ) => sub {
         my $file     = $img_item->{'file_name'};
         my $img_hash = {};
         $img_hash->{'filename'} = $img_item->{'original_filename'};
-        $img_hash->{'original_url'} =  File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'}, $ORIG_DIR, $file );
+        $img_hash->{'original_url'} =
-        $img_hash->{'thumbnail_url'} =  File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'}, $thumbs_size, $file );
+          File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'},
+            $ORIG_DIR, $file );
+        $img_hash->{'thumbnail_url'} =
+          File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'},
+            $thumbs_size, $file );
 
         my @scaled = ();
         for my $scale (@scale_width) {
-            push(@scaled, {'size' => $scale, 'url' => File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'}, $scale, $file )}) ;
+            if ( -r File::Spec->catfile( get_path( $user_id, $scale ), $file ) )
+            {
+                push(
+                    @scaled,
+                    {
+                        'size' => $scale,
+                        'url'  => File::Spec->catfile(
+                            '/', $IMAGE_BASE, $user_id, $scale, $file
+                        )
+                    }
+                );
+            }
+
         }
 
         $img_hash->{'scales'} = \@scaled;
@@ -158,7 +187,6 @@ get '/get_images' => ( authenticated => 1 ) => sub {
         push( @$images, $img_hash );
     }
 
-
     # Render
     return $self->render( json => $images );
 };
@@ -205,7 +233,8 @@ post '/upload' => ( authenticated => 1 ) => sub {
 
     # Image file
     my $filename = sprintf( '%s.%s', create_hash( $image->slurp() ), $ext );
-    my $image_file = File::Spec->catfile( get_path($user_id, $ORIG_DIR), $filename );
+    my $image_file =
+      File::Spec->catfile( get_path( $user_id, $ORIG_DIR ), $filename );
 
     # Save to file
     $image->move_to($image_file);
@@ -226,11 +255,19 @@ post '/upload' => ( authenticated => 1 ) => sub {
         $imager = $imager->rotate( degrees => 90 );
     }
 
+    my $original_width = $imager->getwidth();
+
     for my $scale (@scale_width) {
+
+        #Skip sizes which more than original image
+        if ( $scale >= $original_width ) {
+            next;
+        }
+
         my $scaled = $imager->scale( xpixels => $scale );
 
-        $scaled->write(
+        $scaled->write( file =>
-            file => File::Spec->catfile( get_path($user_id, $scale), $filename ) )
+              File::Spec->catfile( get_path( $user_id, $scale ), $filename ) )
           or die $scaled->errstr;
     }