From bbe0ff81b02145e47763af9031a39b57a54a6102 Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Wed, 2 Aug 2017 17:29:04 +0300 Subject: [PATCH 1/2] Image sizes were moved to config. Skip sizes which more than original image size. --- application.conf.example | 7 +++++++ fotostore.pl | 29 +++++++++++++++++++++-------- 2 files changed, 28 insertions(+), 8 deletions(-) diff --git a/application.conf.example b/application.conf.example index 078d6e5..17851f6 100644 --- a/application.conf.example +++ b/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, + }, } \ No newline at end of file diff --git a/fotostore.pl b/fotostore.pl index 203f0a1..98c3621 100755 --- a/fotostore.pl +++ b/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,18 @@ 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 +58,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; }, @@ -112,7 +115,7 @@ post '/register' => ( authenticated => 0 ) => sub { $self->redirect_to('/'); } else { - $self->render( text => 'Login failed :(' ); + $self->render( template => 'error', message => 'Login failed :(' ); } } else { @@ -132,6 +135,7 @@ 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); @@ -150,7 +154,10 @@ get '/get_images' => ( authenticated => 1 ) => sub { 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 +165,6 @@ get '/get_images' => ( authenticated => 1 ) => sub { push(@$images, $img_hash); } - # Render return $self->render( json => $images ); }; @@ -226,7 +232,14 @@ 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( -- 2.43.0 From bac83221aab1bc3dc3623808aa19c21621748a52 Mon Sep 17 00:00:00 2001 From: Denis Fedoseev Date: Wed, 2 Aug 2017 17:30:44 +0300 Subject: [PATCH 2/2] tidy --- fotostore.pl | 94 +++++++++++++++++++++++++++++++++------------------- 1 file changed, 59 insertions(+), 35 deletions(-) diff --git a/fotostore.pl b/fotostore.pl index 98c3621..e2c7abe 100755 --- a/fotostore.pl +++ b/fotostore.pl @@ -34,7 +34,9 @@ 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 @scale_width = + map { $scales_map->{$_} == 1 ? $_ : undef } + sort { $a <=> $b } keys(%$scales_map); my $sha = Digest::SHA->new('sha256'); @@ -89,26 +91,30 @@ get '/register' => ( authenticated => 0 ) => sub { }; post '/register' => ( authenticated => 0 ) => sub { - my $self = shift; - my $username = $self->req->param('username'); - my $password = $self->req->param('password'); + my $self = shift; + my $username = $self->req->param('username'); + my $password = $self->req->param('password'); my $fullname = $self->req->param('fullname'); - my $invite = $self->req->param('invite'); + my $invite = $self->req->param('invite'); + + if ( $invite eq $config->{'invite_code'} ) { - 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!'); - return 0; + if ( $user->{'user_id'} > 0 ) { + $self->render( + template => 'error', + message => 'Username already taken!' + ); + return 0; } - if ($fullname eq '') { + if ( $fullname eq '' ) { $fullname = $username; } my $digest = $sha->add($password); - $db->add_user($username, $digest->hexdigest(), $fullname); + $db->add_user( $username, $digest->hexdigest(), $fullname ); #Authenticate user after add if ( $self->authenticate( $username, $password ) ) { @@ -118,10 +124,11 @@ post '/register' => ( authenticated => 0 ) => sub { $self->render( template => 'error', message => 'Login failed :(' ); } - } else { - $self->render(template => 'error', message => 'invalid invite code'); } -}; + else { + $self->render( template => 'error', message => 'invalid invite code' ); + } +}; # Display top page get '/' => sub { @@ -135,35 +142,50 @@ get '/get_images' => ( authenticated => 1 ) => sub { my $self = shift; my $current_user = $self->current_user; - my $user_id = $current_user->{'user_id'}; + 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 $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 @images = map { $_->{'file_name'} } @$files_list; my $images = []; for my $img_item (@$files_list) { - my $file = $img_item->{'file_name'}; + 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->{'thumbnail_url'} = File::Spec->catfile( '/', $IMAGE_BASE, $current_user->{'user_id'}, $thumbs_size, $file ); + $img_hash->{'original_url'} = + 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) { - 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 )}) ; + 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; - push(@$images, $img_hash); - } + push( @$images, $img_hash ); + } # Render return $self->render( json => $images ); @@ -177,7 +199,7 @@ post '/upload' => ( authenticated => 1 ) => sub { # Uploaded image(Mojo::Upload object) my $image = $self->req->upload('image'); - my $user = $self->current_user(); + my $user = $self->current_user(); my $user_id = $user->{'user_id'}; $self->app->log->debug( "user:" . Dumper($user) ); @@ -211,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); @@ -235,19 +258,20 @@ post '/upload' => ( authenticated => 1 ) => sub { my $original_width = $imager->getwidth(); for my $scale (@scale_width) { + #Skip sizes which more than original image - if ($scale >= $original_width) { + if ( $scale >= $original_width ) { next; } my $scaled = $imager->scale( xpixels => $scale ); - $scaled->write( - file => File::Spec->catfile( get_path($user_id, $scale), $filename ) ) + $scaled->write( file => + File::Spec->catfile( get_path( $user_id, $scale ), $filename ) ) or die $scaled->errstr; } - if ( !$db->add_file( $user->{'user_id'}, $filename, $image->filename) ) { + if ( !$db->add_file( $user->{'user_id'}, $filename, $image->filename ) ) { #TODO: Send error msg } @@ -278,9 +302,9 @@ sub create_hash { } sub get_path { - my ($user_id, $size) = @_; + my ( $user_id, $size ) = @_; my $path = File::Spec->catfile( $IMAGE_DIR, $user_id, $size ); - unless (-d $path) { + unless ( -d $path ) { mkpath $path or die "Cannot create directory: $path"; } return $path; -- 2.43.0