X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/67e1fe9fae2e13f3d2d19b8f104f81956afe26e4..4cd7a16bb62318837752001e0d9a38b38bef3926:/writer.plp?ds=sidebyside
diff --git a/writer.plp b/writer.plp
index 5b81a20..ef377a0 100644
--- a/writer.plp
+++ b/writer.plp
@@ -15,33 +15,39 @@ form > ul {
display: table;
border-spacing: 0 2px;
}
-form > ul li {
+form > ul > li {
display: table-row;
}
-form > ul li > * {
+form > ul > li > * {
display: table-cell;
padding-right: .5em;
}
-form > ul li > label {
+form > ul > li > label {
/* th */
text-align: right;
}
-form > ul li > label + * {
+form > ul > li > label + * {
/* td */
width: 32em;
}
-input:not([type]) {
+input,select {
box-sizing: border-box;
- width: 100%;
+ flex-grow: 1;
+}
+input:not([type=submit]) {
padding: .4rem;
font-family: monospace;
}
+input[type=number] {
+ max-width: 7em;
+}
select {
padding: .3rem .2rem; /* TODO: input */
}
-form > ul li img {
- max-width: 300px;
+#thumbpreview {
+ width: 300px;
+ align-self: start;
}
ul.popup {
@@ -64,7 +70,7 @@ h1 {
}
.inline {
display: inline-flex;
- align-items: start;
+ align-items: baseline;
margin: 0 -1ex; /* inner gap */
}
.inline > * {
@@ -74,9 +80,6 @@ h1 {
display: flex;
}
-#nav {
- -margin-left: 1em; /* flex gap */
-}
#nav > ul,
#nav > ul strong,
#nav form {
@@ -85,42 +88,7 @@ h1 {
}
-
+
EOT
});
@@ -137,19 +105,32 @@ my $db = eval {
});
} or Abort('Database error', 501, $@);
-my @wordcols = (
- lang => 'Language',
- cat => 'Category',
- form => 'Translation',
+my %lang = (
+ nld => ["\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}", 'dutch'],
+ eng => ["\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}", 'english'],
+ epo => ['â
', 'esperanto'],
+);
+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 => 'Title',
alt => 'Synonyms',
wptitle => 'Wikipedia',
- source => 'Image URL',
+ source => 'Image',
thumb => 'Convert options',
- prio => 'Level',
- cover => undef, # included with prio
- ref => 'Reference',
);
-my @prioenum = qw( essential basic common distinctive rare invisible );
my ($find) = map {{id => $_}} $fields{id} || $Request || ();
my $row;
@@ -163,7 +144,7 @@ if (exists $get{copy}) {
}
elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
my $replace = $row;
- $row = {%post{ pairkeys @wordcols }};
+ $row = {%post{keys %wordcol}};
$_ = length ? $_ : undef for values %{$row};
eval {
@@ -176,28 +157,27 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
next;
};
- my $imgpath = "data/word/org/$row->{id}.jpg";
- if (($row->{source} // '') ne ($replace->{source} // '')) {
+ 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} // [] };
@@ -210,11 +190,16 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
'-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;
@@ -227,6 +212,62 @@ else {
}
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/eng/$row->{form}.jpg" if $col eq 'thumb';
+ return;
+ }
+}
+bless $row, 'Shiar_Sheet::FormRow';
:>
', $col, $title; printf ''; - if ($col eq 'prio') { - printf ''; + print $row->input($col => $attr); + print $row->input($_ => delete $wordcol{$_}) for @span; + print ''; + say '