X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/e26741ab236cbfaa89aa82d121c224137801a63b..e41485bf89a7d29b3732f49596ec8b460f51c2ef:/writer.plp?ds=inline
diff --git a/writer.plp b/writer.plp
index b5f5032..c6d5898 100644
--- a/writer.plp
+++ b/writer.plp
@@ -105,7 +105,7 @@ my %wordcol = (
thumb => {-label => 'Convert options', -multiple => 1, -src => sub {
return "data/word/en/$_[0]->{id}.jpg";
}},
- story => {-label => 'Story', type => 'textarea'},
+ story => {-label => 'Story', type => 'textarea', hidden => 'hidden'},
);
if (my $search = $fields{q}) {
@@ -188,67 +188,24 @@ elsif (defined $post{form}) {{
return 1;
} or Alert('Error creating translation entries', $@);
- my $imgpath = $wordcol{source}->{-src}->($row);
+ require Shiar_Sheet::ImagePrep;
+ my $image = Shiar_Sheet::ImagePrep->new($wordcol{source}->{-src}->($row));
my $reimage = eval {
($row->{source} // '') ne ($replace->{source} // '') or return;
- # copy changed remote url to local file
- unlink $imgpath if -e $imgpath;
- my $download = $row->{source} or return 1;
- require LWP::UserAgent;
- my $ua = LWP::UserAgent->new;
- $ua->agent('/');
- my $status = $ua->mirror($download, $imgpath);
- $status->is_success
- or die "Download from $download
failed: ".$status->status_line."\n";
+ $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) {
- my $thumbpath = $wordcol{thumb}->{-src}->($row);
- 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',
- $imgpath,
- -delete => '1--1', -background => 'white',
- -gravity => defined $row->{thumb} ? 'northwest' : 'center',
- @cmds,
- -resize => "$xyres^", -extent => $xyres,
- '-strip', -quality => '60%', -interlace => 'plane',
- $thumbpath
- );
- eval {
- require IPC::Run;
- my $output;
- IPC::Run::run(\@cmds, '<' => \undef, '>&' => \$output)
- or die $output ||
- ($? & 127 ? "signal $?" : "error code ".($? >> 8))."\n";
- } or Alert([
- "Thumbnail image not generated",
- "Failed to convert source image.",
- ], "@cmds\n$@");
- }
- else {
- unlink $thumbpath;
- }
+ eval {
+ $image->convert($wordcol{thumb}->{-src}->($row), $row->{thumb});
+ } or do {
+ my ($warn, @details) = ref $@ ? @{$@} : $@;
+ Alert([ "Thumbnail image not generated", $warn ], @details);
+ };
}
}}
else {
@@ -271,6 +228,7 @@ bless $row, 'Shiar_Sheet::FormRow';
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 '
', $col, $title; printf '';