X-Git-Url: http://git.shiar.nl/minime.git/blobdiff_plain/6d76792dfc219fde9289d0792ea813cb31aaf511..e90b36e8f91418105503e74e74bd4b9ecfa4c358:/termimg

diff --git a/termimg b/termimg
index 20fda70..a79ecf6 100755
--- a/termimg
+++ b/termimg
@@ -37,12 +37,13 @@ my @info = eval {
 	);
 } or warn $@;
 
+my $filesize = (stat $file)[7];
 eval {
 	require Digest::MD5;
 	open my $bin, '<', $file;
 	binmode $bin;
-	my $md5 = Digest::MD5->new->addfile($bin);
-	push @info, ' # '.$md5->b64digest;
+	my $md5 = Digest::MD5->new->addfile($bin)->b64digest;
+	push @info, " # $md5 ($filesize)";
 } or warn $@;
 
 open my $pgm, '-|', convert => (
@@ -51,14 +52,15 @@ open my $pgm, '-|', convert => (
 	-thumbnail => $size || '66x23',
 	$file => 'pgm:-'
 ) or die $!;
-<$pgm> eq "P2\n" or do {
-	say for @info;
-	exit 1;
-};
-<$pgm>; <$pgm>;  # ignore depth, dimensions
 
-my @ch = split //, " .:coO@";
-while (<$pgm>) {
-	print $ch[ $_ * @ch >> 8 ] for /\d+/g;
-	print $info[$. - 4], $/;
+if (<$pgm> eq "P2\n") {
+	my ($width, $height) = split ' ', <$pgm>;
+	<$pgm>;  # ignore depth
+	my @ch = split //, " .:coO@";
+	while (<$pgm>) {
+		print $ch[ $_ * @ch >> 8 ] for /\d+/g;
+		say shift @info;
+	}
+	substr $_, 0, 0, ' ' x $width for @info;
 }
+say for @info;