word edit: -area option crops thumbnails with relative offsets

[sheet.git] / writer.plp

diff --git a/writer.plp b/writer.plp
index 0e1058221ad4dc984c28c03b77d3fa15e3109968..7280142226a1c30dd19ddeb734e9825b02636f0e 100644 (file)
--- a/writer.plp
+++ b/writer.plp
@@ -105,9 +105,17 @@ my $db = eval {
        });
 } or Abort('Database error', 501, $@);
 
+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}", 'русский'],
+);
 my @wordcols = pairkeys
 my %wordcol = (
-       lang    => 'Language',
+       lang    => {-label => 'Language', -select => {
+               map { $_ => "@{$lang{$_}}" } keys %lang
+       }},
        cat     => [{-label => 'Category'}, 'ref'],
        ref     => {-label => 'Reference'},
        prio    => [
@@ -118,16 +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',
-);
-my %langflag = (
-       nld => "\N{REGIONAL INDICATOR SYMBOL LETTER N}\N{REGIONAL INDICATOR SYMBOL LETTER L}",
-       eng => "\N{REGIONAL INDICATOR SYMBOL LETTER G}\N{REGIONAL INDICATOR SYMBOL LETTER B}",
-       epo => '<span style="color:green">★</span>',
+       form    => {-label => 'Title'},
+       alt     => {-label => 'Synonyms'},
+       wptitle => {-label => 'Wikipedia'},
+       source  => {-label => 'Image'},
+       thumb   => {-label => 'Convert options'},
 );
 my ($find) = map {{id => $_}} $fields{id} || $Request || ();
 
@@ -145,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) :
@@ -155,6 +171,20 @@ elsif ($ENV{REQUEST_METHOD} eq 'POST') {{
                next;
        };
 
+       eval {
+               while (my ($lang, $val) = each %post) {
+                       my $field = $lang;
+                       $lang =~ s/^trans-// or next;
+                       $db->insert(word => {
+                               ref   => $row->{id},
+                               lang  => $lang,
+                               form  => $val,
+                       });
+                       delete $fields{$field};
+               }
+               return 1;
+       } or Alert('Error creating translation entries', $@);
+
        my $imgpath = Shiar_Sheet::FormRow::imagepath($row, 'source');
        my $reimage = eval {
                ($row->{source} // '') ne ($replace->{source} // '') or return;
@@ -179,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',
@@ -220,11 +263,14 @@ package Shiar_Sheet::FormRow {
                $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('<select id="%s" name="%1$s">', $col),
                                (map { sprintf('<option value="%s"%s>%s</option>',
-                                       $_, $val eq $_ && ' selected', $options->[$_]
-                               ) } 0 .. $#{$options}),
+                                       $_, $val eq $_ && ' selected', $options->{$_}
+                               ) } sort keys %{$options}),
                                '</select>',
                        );
                }
@@ -258,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;
        }
 }
@@ -284,13 +330,24 @@ for my $col (@wordcols) {
        say '</p></li>';
 }
 
-if ($row->{id}) {
-       my $children = $db->select(word => '*', {ref => $row->{id}}, 'lang, id');
-       printf '<li><label>%s</label><div><ul class="inline">', 'Translations';
-       while (my $row = $children->hash) {
-               printf '<li><label for="%s">%s</label> <a id="%1$s" href="%s">%s</a></li>',
-                       "trans-$row->{lang}", $langflag{$row->{lang}},
-                       "/writer/$row->{id}", Entity($row->{form});
+if ($row->{id} and not $row->{ref}) {
+       printf '<li><label for="%s">%s</label><div><ul class="inline" id="%1$s">',
+               'trans', 'Translations';
+       my @children = $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 };
+       }
+       for my $ref (@children) {
+               printf(
+                       '<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}),
+               );
        }
        say '</ul></div></li>';
 }
@@ -310,12 +367,12 @@ if ($row->{id}) {
 
 <:
 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}}, 'grade, id');
+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});
 }