X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/77eb26995a1185e50b2b275f058264857bed9cc7..d91598a4f20dc03e12905d7c15e63bfa16116529:/writer.plp diff --git a/writer.plp b/writer.plp index 275909b..d716754 100644 --- a/writer.plp +++ b/writer.plp @@ -6,27 +6,49 @@ Html({ nocache => 1, raw => <<'EOT', - + EOT }); @@ -106,16 +112,34 @@ my $db = eval { pg_enable_utf8 => 1, }); } or Abort('Database error', 501, $@); +$db->abstract->{array_datatypes}++; -my @wordcols = ( - lang => 'Language', - cat => 'Category', - form => 'Translation', - wptitle => 'Wikipedia', - source => 'Image URL', - thumb => 'Convert options', - prio => 'Level', - ref => 'Reference', +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}", 'русский'], +); +my @wordcols = pairkeys +my %wordcol = ( + lang => {-label => 'Language', -select => { + map { $_ => "@{$lang{$_}}" } keys %lang + }}, + cat => [{-label => 'Category'}, 'ref'], + ref => {-label => 'Reference'}, + prio => [ + {-label => 'Level', -select => [qw( + essential basic common distinctive rare invisible + )]}, + '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 || (); @@ -129,9 +153,31 @@ if (exists $get{copy}) { $row = {%{$row}{ qw(prio lang cat) }}; } elsif ($ENV{REQUEST_METHOD} eq 'POST') {{ + 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 => '*'); @@ -143,44 +189,76 @@ 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; + $db->insert(word => { + ref => $row->{id}, + lang => $lang, + form => $_, + }) for parseinput($val); + 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; # 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 $download failed: ".$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 $download failed: ".$status->status_line."\n"; + }; + !$@ or Alert(["Source image not found", $@]); + + $reimage ||= $row->{thumb} ~~ $replace->{thumb}; # different convert + $reimage ||= $row->{cover} ~~ $replace->{cover}; # resize + $reimage++ if $fields{rethumb}; # force refresh - my $thumbpath = "data/word/eng/$row->{form}.jpg"; - if ($imgpath) { + my $thumbpath = Shiar_Sheet::FormRow::imagepath($row => 'thumb'); + if ($reimage) { 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', -delete => '1--1', -background => 'white', -gravity => @cmds ? 'northwest' : 'center', @cmds, - -resize => '300x200^', -extent => '300x200', + -resize => "$xyres^", -extent => $xyres, '-strip', -quality => '60%', -interlace => 'plane', $imgpath => $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; @@ -193,28 +271,112 @@ else { } my $title = $row->{id} ? "entry #$row->{id}" : 'new entry'; + +package Shiar_Sheet::FormRow { + use PLP::Functions 'EscapeHTML'; + + sub input { + my ($row, $col, $attr) = @_; + my $val = $row->{$col} // ''; + my $html = ''; + $html .= qq( $_="$attr->{$_}") for sort grep {!/^-/} keys %{$attr // {}}; + + if (my $options = $attr->{-select}) { + $options = { map {$_ => $options->[$_]} 0 .. $#{$options} } + if ref $options eq 'ARRAY'; + $options->{$val} //= "unknown ($val)"; # preserve current + return ( + sprintf('', + ); + } + elsif ($attr->{type} eq 'checkbox') { + $html .= ' checked' if $val; + return sprintf( + join('', + '', + ), $col, $html, $attr->{-label} + ); + } + else { + return ( + (map { + sprintf('', $col, $_) + } $attr->{-label} // ()), + ref $val ne 'ARRAY' ? () : '', + (map { + sprintf('', $col, EscapeHTML($_)) + } ref $val eq 'ARRAY' ? @{$val} : ()), + sprintf('', + $col, ref $val eq 'ARRAY' ? '' : EscapeHTML($val), $html + ), + ref $val ne 'ARRAY' ? () : '', + (map { + sprintf '%s', + $col, $_, $row->{form}, $col eq 'source' ? ' hidden' : ''; + } grep { -e } $row->imagepath($col)), + ); + } + } + + sub imagepath { + my ($row, $col) = @_; + return "data/word/org/$row->{id}.jpg" if $col eq 'source'; + return "data/word/en/$row->{form}.jpg" if $col eq 'thumb'; + return; + } +} +bless $row, 'Shiar_Sheet::FormRow'; :>

Words <:= $title :>

+
+
-
+
    <: +for my $col (@wordcols) { + my $info = $wordcol{$col} or next; + my ($attr, @span) = ref $info eq 'ARRAY' ? @{$info} : $info; + my $title = ref $attr ? delete $attr->{-label} : $attr; + printf '

  • ', $col, $title; + printf ''; + print $row->input($col => $attr); + print $row->input($_ => delete $wordcol{$_}) for @span; + print ''; + say '

    • '; +} -for my $col (pairs @wordcols) { - my $val = $row->{$col->key} // ''; - $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY'; - printf '
    ' - . '
    ', - $col->key, $col->value, Entity($val); - -e and printf ' %s', $_, $row->{form} for - $col->key eq 'source' ? "data/word/org/$row->{id}.jpg" : - $col->key eq 'thumb' ? "data/word/eng/$row->{form}.jpg" : - (); - say '
    '; +if ($row->{id} and not $row->{ref}) { + printf '
    • ', + 'trans', 'Translations'; + my @children = $db->select(word => '*', {ref => $row->{id}}, 'lang, id')->hashes; + while (my ($lang, $val) = each %fields) { + $lang =~ s/^trans-// or next; + push @children, { lang => $lang, form => $val }; + } + for my $ref (@children) { + printf( + '
    • ', + "trans-$ref->{lang}", @{$lang{ $ref->{lang} }}, # flag, name + ); + printf( + $ref->{id} ? '%s
      • ' : + '', + "trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form}), + ); + } + say '
    • '; } :> -
+

@@ -222,19 +384,19 @@ for my $col (pairs @wordcols) {

<: -$row->{id} or exit; +if ($row->{id}) { :> -
+ +<: +} +:> +