version => '1.0',
nocache => 1,
raw => <<'EOT',
-<style>
-dl {
- display: inline-grid;
- grid: auto-flow / min-content repeat(10, auto);
-}
-
-form > ul {
- display: table;
- border-spacing: 0 2px;
-}
-form > ul li {
- display: table-row;
-}
-form > ul li > * {
- display: table-cell;
- padding-right: .5em;
-}
-form > ul li > label {
- /* th */
- text-align: right;
-}
-form > ul li > label + * {
- /* td */
- width: 32em;
-}
-
-input:not([type]) {
- box-sizing: border-box;
- width: 100%;
- padding: .4rem;
- font-family: monospace;
-}
-select {
- padding: .3rem .2rem; /* TODO: input */
-}
-form > ul li img {
- max-width: 300px;
-}
-
-ul.popup {
- display: flex;
- flex-wrap: wrap;
- align-items: end;
- position: fixed;
- left: 0;
- top: 0;
- margin: auto;
- max-height: 90%;
- max-width: 90%;
- overflow: auto;
- background: rgba(0, 0, 0, .8);
- border: 1px solid #CCC;
-}
-
-h1 {
- margin-bottom: 1ex;
-}
-.inline {
- display: inline-flex;
- align-items: start;
- margin: 0 -1ex; /* inner gap */
-}
-.inline > * {
- margin: 0 1ex;
-}
-.inline .inline {
- display: flex;
-}
-
-#nav {
- -margin-left: 1em; /* flex gap */
-}
-#nav > ul,
-#nav > ul strong,
-#nav form {
- margin: 1ex 0;
- display: inline-block;
-}
-</style>
-
-<script>
-document.addEventListener('DOMContentLoaded', () => {
- var wpinput = document.getElementById('wptitle');
- var wpbutton = wpinput.parentNode.appendChild(document.createElement('button'));
- wpbutton.type = 'button';
- wpbutton.append('Copy');
- wpbutton.onclick = () => {
- let wptitle = wpinput.value || document.getElementById('form').value;
- let wplang = document.getElementById('lang').value.substr(0, 2); // crude iso-639-3→2
- let wpapi = `https://${wplang}.wikipedia.org/w/api.php`;
- let wppage = wpapi+'?action=parse&format=json&origin=*&prop=text&page='+wptitle;
- fetch(wppage).then(res => res.json()).then(json => {
- if (json.error) throw `error returned: ${json.error.info}`;
- wpinput.value = json.parse.title;
- let imginput = document.getElementById('source');
- if (imginput.value) return;
- let wpimages = json.parse.text['*'].match(/<img\s[^>]+>/g);
- let wpselect = wpinput.parentNode.appendChild(document.createElement('ul'));
- wpselect.className = 'popup';
- wpimages.forEach(img => {
- let selectitem = wpselect.appendChild(document.createElement('li'));
- selectitem.insertAdjacentHTML('beforeend', img);
- selectitem.onclick = e => {
- let imgsrc = e.target.src
- .replace(/^(?=\/\/)/, 'https:')
- .replace(/\/thumb(\/.+)\/[^\/]+$/, '$1');
- imginput.value = imgsrc;
- wpselect.remove();
- return false;
- };
- });
- }).catch(error => alert(error));
- return false;
- };
-});
-</script>
+<link rel="stylesheet" type="text/css" media="all" href="/editor.css" />
+<script src="/writer.js"></script>
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',
- cover => undef, # included with prio
- ref => 'Reference',
+my $user = eval {
+ my $rootpath = ($ENV{REQUEST_URI} // '/writer') =~ s{(?<!^)/.+}{}r;
+ if (defined $post{username}) {
+ $cookie{login} = EncodeURI(join ':', @post{qw( username pass )});
+ }
+ elsif (exists $fields{logout}) {
+ require CGI::Cookie;
+ if (AddCookie(CGI::Cookie->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 '<h1>Login to edit words</h1>';
+ Alert('Access denied', $@) if $@;
+ say '<form action="?" method="post" class="inline"><ul>';
+ my $loginform = bless {%post}, 'Shiar_Sheet::FormRow';
+ say '<li>', $loginform->input(@{$_}), '</li>' for pairs (
+ username => {-label => 'User name'},
+ pass => {-label => 'Password', type => 'password'},
+ );
+ say '<li><input type="submit" value="Login" /></li>';
+ say '</ul></form>';
+ 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 => ['<span style="color:green">★</span>', 'esperanto'],
+ ru => ["\N{REGIONAL INDICATOR SYMBOL LETTER R}\N{REGIONAL INDICATOR SYMBOL LETTER U}", 'русский'],
+ zh => ["\N{REGIONAL INDICATOR SYMBOL LETTER C}\N{REGIONAL INDICATOR SYMBOL LETTER N}", '中文'],
+ la => ["\N{PUSHPIN}", 'latin'],
+);
+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', -src => sub {
+ return "data/word/org/$_[0]->{id}.jpg";
+ }},
+ thumb => {-label => 'Convert options', -multiple => 1, -src => sub {
+ return "data/word/en/$_[0]->{id}.jpg";
+ }},
+ story => {-label => 'Story', type => 'textarea', hidden => 'hidden'},
);
-my @prioenum = qw( essential basic common distinctive rare invisible );
-my ($find) = map {{id => $_}} $fields{id} || $Request || ();
+if (my $search = $fields{q}) {
+ my %filter = (form => {ilike => '%'.$search.'%'});
+ my $results = $db->select(word => '*', \%filter);
+ say '<h1>Search</h1><ul>';
+ printf("<li><small>%s</small> %s %s</li>\n",
+ $_->{id}, showlink($_->{form}, "/writer/$_->{id}"),
+ sprintf('<img src="/%s" style="height:3ex; width:auto" />', $wordcol{thumb}->{-src}->($_)) x defined $_->{thumb}
+ ) for $results->hashes;
+ say "</ul>\n";
+ exit;
+}
+
+my ($find) = map {{id => $_}} $fields{id} || $Request || ();
my $row;
if ($find) {
$row = $db->select(word => '*', $find)->hash
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 <em>Reference</em> to <q>delete</q>."
+ );
+ }
+ 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;
next;
};
- my $imgpath = "data/word/org/$row->{id}.jpg";
- if (($row->{source} // '') ne ($replace->{source} // '')) {
- # 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 <q>$download</q> failed: ".$status->status_line,
- ]);
- }
- }
- elsif ($row->{thumb} ~~ $replace->{thumb}) {
- # image and conversion unaltered
- $imgpath = undef;
- }
-
- my $thumbpath = "data/word/eng/$row->{form}.jpg";
- if ($imgpath) {
- if (-e $imgpath) {
- my $xyres = $row->{cover} ? '600x400' : '300x200';
- my @cmds = @{ $row->{thumb} // [] };
- @cmds = (
- 'convert',
- -delete => '1--1', -background => 'white',
- -gravity => @cmds ? 'northwest' : 'center',
- @cmds,
- -resize => "$xyres^", -extent => $xyres,
- '-strip', -quality => '60%', -interlace => 'plane',
- $imgpath => $thumbpath
+ 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,
);
- my $status = system @cmds;
- $status == 0 or Alert([
- "Thumbnail image not generated",
- "Failed to convert source image, error code ".($status >> 8),
- ], "@cmds");
- }
- else {
- unlink $thumbpath;
+ $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', $@);
+
+ require Shiar_Sheet::ImagePrep;
+ my $image = Shiar_Sheet::ImagePrep->new($wordcol{source}->{-src}->($row));
+ my $reimage = eval {
+ ($row->{source} // '') ne ($replace->{source} // '') or return;
+ $image->download($row->{source});
+ };
+ !$@ 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
+ if ($reimage) {
+ eval {
+ $image->convert($wordcol{thumb}->{-src}->($row), $row->{thumb});
+ } or do {
+ my ($warn, @details) = ref $@ ? @{$@} : $@;
+ Alert([ "Thumbnail image not generated", $warn ], @details);
+ };
}
}}
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 <small>#$row->{id}</small>" : 'new entry';
+bless $row, 'Shiar_Sheet::FormRow';
:>
<h1>Words <:= $title :></h1>
<input id="id" name="id" value="<:= $row->{id} // '' :>" type="hidden" />
<ul>
<:
-
-for my $colinfo (pairs @wordcols) {
- my ($col, $title) = @{$colinfo};
- defined $title or next;
- my $val = $row->{$col} // '';
- $val = '{'.join(',', map {s/,/\\,/gr} @{$val}).'}' if ref $val eq 'ARRAY';
+for my $col (@wordcols) {
+ my $info = $wordcol{$col} or next;
+ my ($attr, @span) = ref $info eq 'ARRAY' ? @{$info} : $info;
+ next if delete $attr->{hidden} and not $row->{$col};
+ my $title = ref $attr ? delete $attr->{-label} : $attr;
printf '<li><label for="%s">%s</label><p>', $col, $title;
printf '<span class=inline>';
- if ($col eq 'prio') {
- printf '<select id="%s" name="%1$s">', $col;
- printf('<option value="%s"%s>%s</option>',
- $_, $row->{$col} eq $_ && ' selected', $prioenum[$_]
- ) for 0 .. $#prioenum;
- print '</select>';
+ print $row->input($col => $attr);
+ if (my $imgsrc = $attr->{-src}) {
+ printf('<img id="%spreview" src="/%s" alt="%s"%s />',
+ $col, $_, $row->{form}, $col eq 'source' && ' hidden'
+ ) for grep { -e } $imgsrc->($row);
+ }
+ print $row->input($_ => delete $wordcol{$_}) for @span;
+ print '</span>';
+ say '</p></li>';
+}
+
+if (not $row->{ref}) {
+ printf '<li><label for="%s">%s</label><div><ul class="inline" id="%1$s">',
+ 'trans', 'Translations';
+ my @children = !$row->{id} ? () :
+ $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 };
+ }
+ my %existing = map { $_->{lang} => 1 } $row, @children;
+ $existing{$_} or push @children, { lang => $_ } for @{$user->{editlang}};
+
+ for my $ref (@children) {
printf(
- join('',
- '<label>',
- '<input id="%1$s" name="%1$s" value="0" type="hidden" />',
- '<input id="%s" name="%1$s" value="1" type="checkbox"%s>',
- ' %s</label>',
- ),
- 'cover', !!$row->{cover} && ' checked', 'Highlighted'
+ '<li><label for="%s" title="%3$s">%s </label>',
+ "trans-$ref->{lang}", @{$lang{ $ref->{lang} }}, # flag, name
+ );
+ printf(
+ $ref->{id} ? '<a id="%s" href="%s">%s</a></li>' :
+ '<input id="%s" name="%1$s" value="%3$s" />',
+ "trans-$ref->{lang}", "/writer/$ref->{id}", Entity($ref->{form} // ''),
);
}
- else {
- printf '<input id="%s" name="%1$s" value="%s" />', $col, Entity($val);
- -e and printf '<img src="/%s" alt="%s" />', $_, $row->{form} for
- $col eq 'source' ? "data/word/org/$row->{id}.jpg" :
- $col eq 'thumb' ? "data/word/eng/$row->{form}.jpg" :
- ();
- }
- print '</span>';
- say '</p></li>';
+ say '</ul></div></li>';
}
:>
</ul>
<:
say '<ul>';
-my $parents = $db->select(word => '*', {id => $row->{cat}});
+my $parents = $db->select(word => '*', [{id => $row->{cat}}, {id => $row->{ref}}]);
while (my $ref = $parents->hash) {
printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});
}
-say "<li><strong>$row->{form}</strong></li>";
-my $children = $db->select(word => '*', {cat => $row->{id}});
+say "<li><strong>$_</strong></li>" for Entity($row->{form});
+my $children = $db->select(word => '*', {cat => $row->{id}, ref => undef}, 'grade, id');
while (my $ref = $children->hash) {
printf '<li><a href="/writer/%d">%s</a></li>', $ref->{id}, Entity($ref->{form});
}
git.shiar.nl / sheet.git / blobdiff