X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/26b42ef92dccbff26573149d6886958862455d81..e24a09c638a103745a9b7b7e557d3222de2d1275:/writer.plp diff --git a/writer.plp b/writer.plp index 15a9515..84dc4a8 100644 --- a/writer.plp +++ b/writer.plp @@ -5,89 +5,7 @@ Html({ version => '1.0', nocache => 1, raw => <<'EOT', - - + EOT }); @@ -95,37 +13,107 @@ EOT use List::Util qw( pairs pairkeys ); 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', - ref => undef, # included with cat - grade => undef, # " - prio => 'Level', - cover => undef, # included with prio - form => 'Title', - alt => 'Synonyms', - wptitle => 'Wikipedia', - source => 'Image', - thumb => 'Convert options', +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 '

Login to edit words

'; + Alert('Access denied', $@) if $@; + say '
'; + exit; +}; + +my %lang = ( + nl => ["\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", 'nederlands'], + en => ["\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", 'english'], + eo => ['★', 'esperanto'], + ru => ["\N{REGIONAL INDICATOR SYMBOL LETTER R}\N{REGIONAL INDICATOR SYMBOL LETTER U}", 'русский'], + la => ["\N{PUSHPIN}", 'latin'], ); -my @prioenum = qw( essential basic common distinctive rare invisible ); -my %langflag = ( - nld => "\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", - eng => "\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", - epo => '★', +my @wordcols = pairkeys +my %wordcol = ( + lang => {-label => 'Language', -select => { + map { $_ => "@{$lang{$_}}" } keys %lang + }}, + cat => [{-label => 'Category'}, 'ref'], + ref => {-label => 'Reference'}, + prio => [ + {-label => 'Level', -select => sub { + my ($row) = @_; + my @enum = qw[ essential basic common distinctive optional invisible ]; + return { + ('' => 'parent') x (defined $row->{ref}), + map { $_ => $enum[$_] } 0 .. $#enum + }; + }}, + 'cover', 'grade', + ], + cover => {-label => 'Highlighted', type => 'checkbox'}, + grade => {-label => 'Order', type => 'number'}, + form => {-label => 'Title'}, + alt => {-label => 'Synonyms', -multiple => 1}, + wptitle => {-label => 'Wikipedia'}, + source => {-label => 'Image'}, + thumb => {-label => 'Convert options', -multiple => 1}, ); -my ($find) = map {{id => $_}} $fields{id} || $Request || (); +if (my $search = $fields{q}) { + my %filter = (form => {ilike => '%'.$search.'%'}); + my $results = $db->select(word => '*', \%filter); + say '

Search

\n"; + exit; +} + +my ($find) = map {{id => $_}} $fields{id} || $Request || (); my $row; if ($find) { $row = $db->select(word => '*', $find)->hash @@ -135,13 +123,37 @@ if ($find) { if (exists $get{copy}) { $row = {%{$row}{ qw(prio lang cat) }}; } -elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ +elsif (defined $post{form}) {{ + sub parseinput { + return if not length $_[0]; + require Encode; + return Encode::decode_utf8($_[0]); + } + my $replace = $row; - $row = {%post{ pairkeys @wordcols }}; - $_ = length ? $_ : undef for values %{$row}; + $row = {map { $_ => + ref $wordcol{$_} eq 'HASH' && $wordcol{$_}->{-multiple} ? + [ map { parseinput($_) } $post{'@'.$_}->@* ] : + scalar parseinput($post{$_}) + } keys %wordcol}; + + if (!$row->{form}) { + if ($row->{ref} ne 'delete') { + Alert("Empty title", + "Confirm removal by setting Reference to 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; @@ -150,6 +162,25 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ next; }; + 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 = Shiar_Sheet::FormRow::imagepath($row, 'source'); my $reimage = eval { ($row->{source} // '') ne ($replace->{source} // '') or return; @@ -174,14 +205,28 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ 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 => "$xyres^", -extent => $xyres, '-strip', -quality => '60%', -interlace => 'plane', - $imgpath => $thumbpath + $thumbpath ); eval { require IPC::Run; @@ -200,44 +245,58 @@ 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'; package Shiar_Sheet::FormRow { + use PLP::Functions 'EscapeHTML'; + sub input { - my ($row, $col, $type, $label) = @_; + my ($row, $col, $attr) = @_; my $val = $row->{$col} // ''; - $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY'; - if (ref $type eq 'ARRAY') { + my $html = ''; + $html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}}; + + if (my $options = $attr->{-select}) { + $options = $options->(@_) if ref $options eq 'CODE'; + $options->{$val} //= "unknown ($val)"; # preserve current return ( sprintf('', ); } - elsif ($type eq 'checkbox') { + elsif ($attr->{type} eq 'checkbox') { + $html .= ' checked' if $val; return sprintf( join('', '', - ), $col, $type, !!$val && ' checked', $label + ), $col, $html, $attr->{-label} ); } else { - my $html = ''; - $html .= qq( $_="$type->{$_}") for sort keys %{$type // {}}; + my $multiple = ref $val eq 'ARRAY' || $attr->{-multiple}; return ( - $label ? sprintf('', $col, $label) : (), + (map { + sprintf('', $col, $_) + } $attr->{-label} // ()), + $multiple ? '' : (), + (map { + sprintf('', $col, EscapeHTML($_)) + } ref $val eq 'ARRAY' ? @{$val} : ()), sprintf('', - $col, PLP::Functions::EscapeHTML($val), $html + $col, $multiple ? '' : EscapeHTML($val), $html ), + $multiple ? '' : (), (map { sprintf '%s', $col, $_, $row->{form}, $col eq 'source' ? ' hidden' : ''; @@ -249,7 +308,7 @@ package Shiar_Sheet::FormRow { sub imagepath { my ($row, $col) = @_; return "data/word/org/$row->{id}.jpg" if $col eq 'source'; - return "data/word/eng/$row->{form}.jpg" if $col eq 'thumb'; + return "data/word/en/$row->{id}.jpg" if $col eq 'thumb'; return; } } @@ -263,31 +322,40 @@ bless $row, 'Shiar_Sheet::FormRow';