dieren: generate images using common ImagePrep module

[sheet.git] / Shiar_Sheet / ImagePrep.pm

diff --git a/Shiar_Sheet/ImagePrep.pm b/Shiar_Sheet/ImagePrep.pm
index 08a97285c956aef4f547f3a3883bfcf55ef1650f..328cb4f361b3bd69387cf7fe80edd45ffd639eed 100644 (file)
--- a/Shiar_Sheet/ImagePrep.pm
+++ b/Shiar_Sheet/ImagePrep.pm
@@ -1,20 +1,19 @@
 package Shiar_Sheet::ImagePrep;
 
-use 5.014;
+use 5.020;
 use warnings;
+use experimental 'signatures';
 
-our $VERSION = '1.02';
+our $VERSION = '1.03';
 
-sub new {
-       my ($class, $target) = @_;
+sub new ($class, $target) {
        bless \$target, $class;
 }
 
-sub download {
+sub download ($target, $download) {
        # copy changed remote url to local file
-       my $target = shift;
        unlink $$target if -e $$target;
-       my $download = shift or return 1;
+       defined $download or return 1;
        require LWP::UserAgent;
        my $ua = LWP::UserAgent->new;
        $ua->agent('/');
@@ -23,8 +22,7 @@ sub download {
                or die "Download from <q>$download</q> failed: ".$status->status_line."\n";
 }
 
-sub dimensions {
-       my ($imgpath) = @_;
+sub dimensions ($imgpath) {
        require IPC::Run;
        IPC::Run::run(
                [identify => -format => '%w %h', $$imgpath],
@@ -33,20 +31,19 @@ sub dimensions {
        return split /\s/, $xy, 3;
 }
 
-sub generate {
-       my ($imgpath, $thumbpath, $cmds) = @_;
+sub generate ($imgpath, $thumbpath, $opt) {
        if (not -e $$imgpath) {
                return !-e $thumbpath || unlink $thumbpath;
        }
-       $cmds //= [];
-       $imgpath->convert($thumbpath, $cmds, '300x200') and # low-res cover
+       my @cmds = @{$opt->{convert} // []};
+       unshift @cmds, -area => $_ for $opt->{crop32} || ();
+       $imgpath->convert($thumbpath, \@cmds, '300x200') and # low-res cover
        $imgpath->convert($thumbpath =~ s/\.jpg$/.webp/r,
-               [@{$cmds}, -quality => 40], '600x400' # higher dpi tradeoff
+               [@cmds, -quality => 40], '600x400' # higher dpi tradeoff
        );
 }
 
-sub convert {
-       my ($imgpath, $thumbpath, $cmds, $xyres) = @_;
+sub convert ($imgpath, $thumbpath, $cmds, $xyres = 0) {
        #my ($w, $h) = $imgpath->dimensions;
        #my $aspect = 3/2; # $xyres
        my @cmds = @{$cmds};
@@ -75,10 +72,14 @@ sub convert {
                '-strip', -quality => '60%', -interlace => 'plane',
                -gravity => defined $cmds ? 'northwest' : 'center',
                @cmds,
-               -resize => "$xyres^", -extent => $xyres,
+               $xyres ? (-resize => "$xyres^", -extent => $xyres) : (),
                $thumbpath
        );
 
+       $imgpath->runcommand(@cmds);
+}
+
+sub runcommand ($, @cmds) {
        require IPC::Run;
        my $output;
        IPC::Run::run(\@cmds, '<' => \undef, '>&' => \$output) or die [