word/edit: sub signatures in ImagePrep methods

diff --git a/Shiar_Sheet/ImagePrep.pm b/Shiar_Sheet/ImagePrep.pm
index 08a97285c956aef4f547f3a3883bfcf55ef1650f..2bd4cd9e2448add5354e8ec000635350a96120c5 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';
 
-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,8 +31,7 @@ sub dimensions {
        return split /\s/, $xy, 3;
 }
 
-sub generate {
-       my ($imgpath, $thumbpath, $cmds) = @_;
+sub generate ($imgpath, $thumbpath, $cmds) {
        if (not -e $$imgpath) {
                return !-e $thumbpath || unlink $thumbpath;
        }
@@ -45,8 +42,7 @@ sub generate {
        );
 }
 
-sub convert {
-       my ($imgpath, $thumbpath, $cmds, $xyres) = @_;
+sub convert ($imgpath, $thumbpath, $cmds, $xyres) {
        #my ($w, $h) = $imgpath->dimensions;
        #my $aspect = 3/2; # $xyres
        my @cmds = @{$cmds};
@@ -79,6 +75,10 @@ sub convert {
                $thumbpath
        );
 
+       $imgpath->runcommand(@cmds);
+}
+
+sub runcommand ($, @cmds) {
        require IPC::Run;
        my $output;
        IPC::Run::run(\@cmds, '<' => \undef, '>&' => \$output) or die [