X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/24d7164ce1fd20686e5091d6446b3408a1c71c73..2f88d6b9e4bf65c539f2ea9a361f3c34f2011928:/writer.plp?ds=inline
diff --git a/writer.plp b/writer.plp
index 11754e8..7280142 100644
--- a/writer.plp
+++ b/writer.plp
@@ -6,27 +6,48 @@ Html({
nocache => 1,
raw => <<'EOT',
-
+
EOT
});
@@ -107,14 +105,32 @@ my $db = eval {
});
} or Abort('Database error', 501, $@);
-my @wordcols = (
- form => 'Translation',
- wptitle => 'Wikipedia',
- ref => 'Reference',
- cat => 'Category',
- lang => 'Language',
- source => 'Image URL',
- thumb => 'Convert options',
+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'},
+ wptitle => {-label => 'Wikipedia'},
+ source => {-label => 'Image'},
+ thumb => {-label => 'Convert options'},
);
my ($find) = map {{id => $_}} $fields{id} || $Request || ();
@@ -125,91 +141,218 @@ if ($find) {
}
if (exists $get{copy}) {
- $row = {%{$row}{ qw(lang cat) }};
+ $row = {%{$row}{ qw(prio lang cat) }};
}
-elsif ($ENV{REQUEST_METHOD} eq 'POST') {
+elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
my $replace = $row;
- $row = {%post{ pairkeys @wordcols }};
+ $row = {%post{keys %wordcol}};
$_ = length ? $_ : undef for values %{$row};
+ 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 => '*');
my $query = $find ? $db->update(word => $row, $find, \%res) :
$db->insert(word => $row, \%res);
$row = $query->hash;
- } or Alert("Entry could not be saved", $@);
+ } or do {
+ Alert("Entry could not be saved", $@);
+ 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 => $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", $@]);
- 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
+
+ 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;
}
}
-}
+}}
else {
+ $row->{prio} //= 1;
$row->{$_} = $get{$_} for keys %get;
}
my $title = $row->{id} ? "entry #$row->{id}" : 'new entry';
+
+package Shiar_Sheet::FormRow {
+ sub input {
+ my ($row, $col, $attr) = @_;
+ my $val = $row->{$col} // '';
+ $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
+ 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} // ()),
+ sprintf('',
+ $col, PLP::Functions::EscapeHTML($val), $html
+ ),
+ (map {
+ sprintf '',
+ $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';
:>