X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/5b166c668eeba6da9e7d73e25e7fd4faeecd1db1..e26741ab236cbfaa89aa82d121c224137801a63b:/writer.plp?ds=sidebyside diff --git a/writer.plp b/writer.plp index e9f0f8d..b5f5032 100644 --- a/writer.plp +++ b/writer.plp @@ -5,121 +5,122 @@ Html({ version => '1.0', nocache => 1, raw => <<'EOT', - - - + + EOT }); use List::Util qw( pairs pairkeys ); +use Shiar_Sheet::FormRow; my $db = eval { - my @dbinfo = ( - 'DBI:Pg:dbname=sheet;host=localhost', 'sheetadmin', 'fairuse', - ) or die "database not configured\n"; - require DBIx::Simple; - DBIx::Simple->new(@dbinfo[0..2], { - RaiseError => 1, - pg_enable_utf8 => 1, - }); + require Shiar_Sheet::DB; + Shiar_Sheet::DB->connect; } or Abort('Database error', 501, $@); -my @wordcols = ( - lang => 'Language', - cat => 'Category', - form => 'Translation', - alt => 'Synonyms', - wptitle => 'Wikipedia', - source => 'Image URL', - thumb => 'Convert options', - prio => 'Level', - ref => 'Reference', +my $user = eval { + my $rootpath = ($ENV{REQUEST_URI} // '/writer') =~ s{(?new( + -name => 'login', + -value => '', + -path => $rootpath, + -expires => 'now', + )->as_string)) { + delete $cookie{login}; + die "Logged out as requested\n"; + } + Alert("Failed to log out", "Login cookie could not be removed."); + } + + my $cookiedata = $cookie{login} or return; + my ($name, $key) = split /[:\v]/, DecodeURI($cookiedata); + my %rowmatch = (username => $name, pass => $key); + my $found = $db->select(login => '*', \%rowmatch)->hash + or die "Invalid user or password\n"; + + eval { + require CGI::Cookie; + my $httpcookie = CGI::Cookie->new( + -name => 'login', + -value => join(':', @{$found}{qw( username pass )}), + -path => $rootpath, + ) or die "prepared object is empty\n"; + AddCookie($httpcookie->as_string); + } or Abort(["Unable to create login cookie", $@], 403); + + return $found; +} or do { + say '
delete." + ); + } + else { + $db->delete(word => $find); + Alert("Entry removed"); + } + next; + } eval { my %res = (returning => '*'); + $row->{creator} = $user->{id} unless $find; + $row->{updated} = ['now()']; my $query = $find ? $db->update(word => $row, $find, \%res) : $db->insert(word => $row, \%res); $row = $query->hash; @@ -144,44 +169,82 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ next; }; - my $imgpath = "data/word/org/$row->{id}.jpg"; - if (($row->{source} // '') ne ($replace->{source} // '')) { + eval { + while (my ($lang, $val) = each %post) { + my $field = $lang; + $lang =~ s/^trans-// or next; + $val = parseinput($val) or next; + my %subrow = ( + ref => $row->{id}, + lang => $lang, + form => $val, + prio => undef, + ); + $subrow{wptitle} = $1 if $subrow{form} =~ s/\h*\[(.*)\]$//; # [Link] shorthand + $subrow{alt} = [split m{/}, $1] if $subrow{form} =~ s{/(\S.*)}{}; # /alternates shorthand + $db->insert(word => \%subrow); + delete $fields{$field}; + } + return 1; + } or Alert('Error creating translation entries', $@); + + my $imgpath = $wordcol{source}->{-src}->($row); + my $reimage = eval { + ($row->{source} // '') ne ($replace->{source} // '') or return; # copy changed remote url to local file unlink $imgpath if -e $imgpath; - if (my $download = $row->{source}) { - require LWP::UserAgent; - my $ua = LWP::UserAgent->new; - $ua->agent('/'); - my $status = $ua->mirror($download, $imgpath); - $status->is_success or Alert([ - "Source image not found", - "Download from
$downloadfailed: ".$status->status_line, - ]); - } - } - elsif ($row->{thumb} ~~ $replace->{thumb}) { - # image and conversion unaltered - $imgpath = undef; - } + my $download = $row->{source} or return 1; + require LWP::UserAgent; + my $ua = LWP::UserAgent->new; + $ua->agent('/'); + my $status = $ua->mirror($download, $imgpath); + $status->is_success + or die "Download from
$downloadfailed: ".$status->status_line."\n"; + }; + !$@ or Alert(["Source image not found", $@]); - my $thumbpath = "data/word/eng/$row->{form}.jpg"; - if ($imgpath) { + $reimage ||= $row->{thumb} ~~ $replace->{thumb}; # different convert + $reimage ||= $row->{cover} ~~ $replace->{cover}; # resize + $reimage++ if $fields{rethumb}; # force refresh + + if ($reimage) { + my $thumbpath = $wordcol{thumb}->{-src}->($row); if (-e $imgpath) { + my $xyres = $row->{cover} ? '600x400' : '300x200'; my @cmds = @{ $row->{thumb} // [] }; + if (my ($cmdarg) = grep { $cmds[$_] eq '-area' } 0 .. $#cmds) { + # replace option by permillage crop + my @dim = map { $_ / 1000 } split /\D/, $cmds[$cmdarg + 1]; + splice @cmds, $cmdarg, 2, ( + -set => 'option:distort:viewport' => sprintf( + '%%[fx:w*%s]x%%[fx:h*%s]+%%[fx:w*%s]+%%[fx:h*%s]', + ($dim[2] || 1) - $dim[0], # width = x2 - x1 + ($dim[3] || 1) - $dim[1], # height = y2 - y1 + @dim[0, 1] # offset = x1,y1 + ), + -distort => SRT => 0, # noop transform to apply viewport + ); + } @cmds = ( 'convert', + $imgpath, -delete => '1--1', -background => 'white', - -gravity => @cmds ? 'northwest' : 'center', + -gravity => defined $row->{thumb} ? 'northwest' : 'center', @cmds, - -resize => '300x200^', -extent => '300x200', + -resize => "$xyres^", -extent => $xyres, '-strip', -quality => '60%', -interlace => 'plane', - $imgpath => $thumbpath + $thumbpath ); - my $status = system @cmds; - $status == 0 or Alert([ + eval { + require IPC::Run; + my $output; + IPC::Run::run(\@cmds, '<' => \undef, '>&' => \$output) + or die $output || + ($? & 127 ? "signal $?" : "error code ".($? >> 8))."\n"; + } or Alert([ "Thumbnail image not generated", - "Failed to convert source image, error code ".($status >> 8), - ], "@cmds"); + "Failed to convert source image.", + ], "@cmds\n$@"); } else { unlink $thumbpath; @@ -189,33 +252,66 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ } }} else { - $row->{prio} //= 1; + $row->{lang} //= $user->{editlang}->[0]; $row->{$_} = $get{$_} for keys %get; + $row->{prio} = defined $row->{ref} ? undef : 1 unless exists $row->{prio}; } my $title = $row->{id} ? "entry #$row->{id}" : 'new entry'; +bless $row, 'Shiar_Sheet::FormRow'; :>