X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/e985205d2c7b0347c44ad23f4635dae22687713d..87d94e5fa2a28dac9f26632cc25a29fe088cb1e2:/writer.plp?ds=inline
diff --git a/writer.plp b/writer.plp
index 59bacac..288891a 100644
--- a/writer.plp
+++ b/writer.plp
@@ -25,7 +25,72 @@ dd > img {
max-width: 300px;
display: block;
}
+dd input ~ button {
+ margin-left: -5em;
+}
+
+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;
+}
+
+section {
+ position: absolute;
+ top: 7ex;
+ right: 1em;
+}
+section > ul {
+ margin-top: 1ex;
+}
+section > ul strong, section form {
+ line-height: 2;
+}
+
+
EOT
});
@@ -44,65 +109,93 @@ my $db = eval {
my @wordcols = (
form => 'Translation',
+ wptitle => 'Wikipedia',
ref => 'Reference',
cat => 'Category',
lang => 'Language',
source => 'Image URL',
thumb => 'Convert options',
- wptitle => 'Wikipedia',
);
-my $find = $Request ? {id => $Request} : undef;
+my ($find) = map {{id => $_}} $fields{id} || $Request || ();
my $row;
-if ($ENV{REQUEST_METHOD} eq 'POST') {
+if ($find) {
+ $row = $db->select(word => '*', $find)->hash
+ or Abort("Word not found", 404);
+}
+
+if (exists $get{copy}) {
+ $row = {%{$row}{ qw(lang cat) }};
+}
+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;
+ }
}
-
- $row = {map {$_ => $row->{$_}} qw(lang cat)} if not $Request;
-}
-elsif ($find) {
- $row = $db->select(word => '*', $find)->hash
- or Abort("Word not found", 404);
+}}
+else {
+ $row->{$_} = $get{$_} for keys %get;
}
-my $title = $row ? "entry #$row->{id}" : 'new entry';
+my $title = $row->{id} ? "entry #$row->{id}" : 'new entry';
:>