X-Git-Url: http://git.shiar.nl/sheet.git/blobdiff_plain/1925e80c4086f51c024986a55f004c1403f55ab7..b8356cfbfb64e8103dadc2e96c1c62ee13a3f687:/Shiar_Sheet/ImagePrep.pm

diff --git a/Shiar_Sheet/ImagePrep.pm b/Shiar_Sheet/ImagePrep.pm
index 699d224..2bd4cd9 100644
--- 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.00';
+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,23 +22,44 @@ sub download {
 		or die "Download from <q>$download</q> failed: ".$status->status_line."\n";
 }
 
-sub convert {
-	my ($imgpath, $thumbpath, $cmds) = @_;
+sub dimensions ($imgpath) {
+	require IPC::Run;
+	IPC::Run::run(
+		[identify => -format => '%w %h', $$imgpath],
+		'<' => \undef, '>&' => \my $xy
+	) or die ["Image dimensions could not be determined.", $$imgpath];
+	return split /\s/, $xy, 3;
+}
+
+sub generate ($imgpath, $thumbpath, $cmds) {
 	if (not -e $$imgpath) {
-		return unlink $thumbpath;
+		return !-e $thumbpath || unlink $thumbpath;
 	}
+	$cmds //= [];
+	$imgpath->convert($thumbpath, $cmds, '300x200') and # low-res cover
+	$imgpath->convert($thumbpath =~ s/\.jpg$/.webp/r,
+		[@{$cmds}, -quality => 40], '600x400' # higher dpi tradeoff
+	);
+}
 
-	my $xyres = 0 ? '600x400' : '300x200'; # cover
-	my @cmds = @{ $cmds // [] };
+sub convert ($imgpath, $thumbpath, $cmds, $xyres) {
+	#my ($w, $h) = $imgpath->dimensions;
+	#my $aspect = 3/2; # $xyres
+	my @cmds = @{$cmds};
 	if (my ($cmdarg) = grep { $cmds[$_] eq '-area' } 0 .. $#cmds) {
 		# replace option by permillage crop
 		my @dim = map { $_ / 1000 } split /\D/, $cmds[$cmdarg + 1];
+		$dim[$_] ||= 1 for 2, 3; # optional end
+		push @dim, $dim[2 + $_] - $dim[$_] for 0, 1; # add width, height
 		splice @cmds, $cmdarg, 2, (
+			#crop="%[fx:floor(w*$ratio)]x%[fx:floor(h*$ratio)]"
+			#crop="$crop+%[fx:ceil((w-w*$ratio)/2)]+%[fx:ceil((h-h*$ratio)/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
+				'%%[fx:%s]x%%[fx:%s]+%%[fx:%s]+%%[fx:%s]',
+				"w*$dim[4]", "h*$dim[5]", # width x height
+				#"max(w*$dim[4], h*$dim[5]*$aspect)", # width
+				#"max(h*$dim[5], w*$dim[4]/$aspect)", # height
+				"w*$dim[0]", "h*$dim[1]", # x+y offset
 			),
 			-distort => SRT => 0, # noop transform to apply viewport
 		);
@@ -48,13 +68,17 @@ sub convert {
 		'convert',
 		$$imgpath,
 		-delete => '1--1', -background => 'white',
+		'-strip', -quality => '60%', -interlace => 'plane',
 		-gravity => defined $cmds ? 'northwest' : 'center',
 		@cmds,
 		-resize => "$xyres^", -extent => $xyres,
-		'-strip', -quality => '60%', -interlace => 'plane',
 		$thumbpath
 	);
 
+	$imgpath->runcommand(@cmds);
+}
+
+sub runcommand ($, @cmds) {
 	require IPC::Run;
 	my $output;
 	IPC::Run::run(\@cmds, '<' => \undef, '>&' => \$output) or die [