X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/085af86d8674e9cfdc8fd596d118168e3fc82d95..83a0dfa9c88eac62cab4dded6664e5f133ab8d37:/writer.plp
diff --git a/writer.plp b/writer.plp
index 24c5599..9d67520 100644
--- a/writer.plp
+++ b/writer.plp
@@ -6,27 +6,79 @@ Html({
nocache => 1,
raw => <<'EOT',
@@ -38,16 +90,29 @@ document.addEventListener('DOMContentLoaded', () => {
wpbutton.append('Copy');
wpbutton.onclick = () => {
let wptitle = wpinput.value || document.getElementById('form').value;
- let wppage = 'https://en.wikipedia.org/w/api.php?action=parse&format=json&origin=*&prop=text&page='+wptitle;
+ 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(/]+/g);
- imginput.value = wpimages[0].match(/\ssrc="([^"]+)"/)[1]
- .replace(/^(?=\/\/)/, 'https:')
- .replace(/\/thumb(\/.+)\/[^\/]+$/, '$1');
+ let wpimages = json.parse.text['*'].match(/]+>/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;
};
@@ -70,87 +135,148 @@ my $db = eval {
} or Abort('Database error', 501, $@);
my @wordcols = (
+ lang => 'Language',
+ cat => 'Category',
form => 'Translation',
+ alt => 'Synonyms',
wptitle => 'Wikipedia',
- ref => 'Reference',
- cat => 'Category',
- lang => 'Language',
source => 'Image URL',
thumb => 'Convert options',
+ prio => 'Level',
+ ref => 'Reference',
);
my ($find) = map {{id => $_}} $fields{id} || $Request || ();
my $row;
+if ($find) {
+ $row = $db->select(word => '*', $find)->hash
+ or Abort("Word not found", 404);
+}
+
if (exists $get{copy}) {
- $row = {%fields{ 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 }};
$_ = length ? $_ : undef for values %{$row};
+
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 (my $download = $row->{source} and !-e $imgpath) {
- 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,
- ]);
+ 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 $download
failed: ".$status->status_line,
+ ]);
+ }
+ }
+ elsif ($row->{thumb} ~~ $replace->{thumb}) {
+ # image and conversion unaltered
+ $imgpath = undef;
}
my $thumbpath = "data/word/eng/$row->{form}.jpg";
- if (-e $imgpath) {
- my @cmds = @{ $row->{thumb} // [] };
- unshift @cmds, -gravity => @cmds ? 'northwest' : 'center';
- unshift @cmds, 'convert';
- push @cmds, -resize => '300x200^', -extent => '300x200';
- push @cmds, '-strip', -quality => '60%', -interlace => 'plane';
- push @cmds, $imgpath, $thumbpath;
- my $status = system @cmds;
- $status == 0 or Alert([
- "Thumbnail image not generated",
- "Failed to convert source image, error code ".($status >> 8),
- ], "@cmds");
+ if ($imgpath) {
+ if (-e $imgpath) {
+ my @cmds = @{ $row->{thumb} // [] };
+ @cmds = (
+ 'convert',
+ -delete => '1--1', -background => 'white',
+ -gravity => @cmds ? 'northwest' : 'center',
+ @cmds,
+ -resize => '300x200^', -extent => '300x200',
+ '-strip', -quality => '60%', -interlace => 'plane',
+ $imgpath => $thumbpath
+ );
+ 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;
+ }
}
-}
-elsif ($find) {
- $row = $db->select(word => '*', $find)->hash
- or Abort("Word not found", 404);
+}}
+else {
+ $row->{prio} //= 1;
+ $row->{$_} = $get{$_} for keys %get;
}
my $title = $row->{id} ? "entry #$row->{id}" : 'new entry';
:>