word edit: -area option crops thumbnails with relative offsets

[sheet.git] / writer.plp

diff --git a/writer.plp b/writer.plp
index f954ba05563e9627c128f2bf9d3a7d881eade753..7280142226a1c30dd19ddeb734e9825b02636f0e 100644 (file)
--- a/writer.plp
+++ b/writer.plp
@@ -106,9 +106,10 @@ my $db = eval {
 } or Abort('Database error', 501, $@);
 
 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 => ['<span style="color:green">★</span>', 'esperanto'],
+       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}", 'русский'],
 );
 my @wordcols = pairkeys
 my %wordcol = (
@@ -125,11 +126,11 @@ my %wordcol = (
        ],
        cover   => {-label => 'Highlighted', type => 'checkbox'},
        grade   => {-label => 'Order', type => 'number'},
-       form    => 'Title',
-       alt     => 'Synonyms',
-       wptitle => 'Wikipedia',
-       source  => 'Image',
-       thumb   => 'Convert options',
+       form    => {-label => 'Title'},
+       alt     => {-label => 'Synonyms'},
+       wptitle => {-label => 'Wikipedia'},
+       source  => {-label => 'Image'},
+       thumb   => {-label => 'Convert options'},
 );
 my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
@@ -147,6 +148,19 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
        $row = {%post{keys %wordcol}};
        $_ = length ? $_ : undef for values %{$row};
 
+       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 => '*');
                my $query = $find ? $db->update(word => $row, $find, \%res) :
@@ -195,6 +209,19 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
                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',
@@ -277,7 +304,7 @@ package Shiar_Sheet::FormRow {
        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 "data/word/en/$row->{form}.jpg"  if $col eq 'thumb';
                return;
        }
 }