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

diff --git a/termimg b/termimg
index 20fda70..ef57cd3 100755
--- a/termimg
+++ b/termimg
@@ -4,61 +4,77 @@ my ($file, $size) = @ARGV;
 
 my @info = eval {
 	require Image::ExifTool;
-	my $exif = Image::ExifTool->new->ImageInfo($file);
+	my $exif = Image::ExifTool->new->ImageInfo($file, {
+		CoordFormat => '%.5f',
+		DateFormat => '%Y-%m-%d %H:%M:%S',
+	});
+	die "exiftool: $exif->{Error}\n" if $exif->{Error};
 	return (
-		" $exif->{MIMEType}",
-		$exif->{ImageSize} ? " $exif->{ImageSize} ($exif->{Megapixels}MP)" : (),
-		join(' ', '',
+		$exif->{MIMEType},
+		$exif->{ImageSize} ? "$exif->{ImageSize} ($exif->{Megapixels}MP)" : (),
+		join(' ',
 			$exif->{YCbCrSubSampling} // (),
 			$exif->{Interlace} // (),
 			$exif->{Compression} // $exif->{FileType},
 			$exif->{SVGVersion} // $exif->{PDFVersion} // (),
 		),
-		$exif->{ColorType} ? " $exif->{BitDepth}bpp $exif->{ColorType}" : (),
-		sprintf(' exif x%d', scalar %{$exif}),
-		$exif->{Thumb} ? " thumb $exif->{ThumbnailLength}B" : (),
-		(map " @ $_",
+		$exif->{ColorType} ? "$exif->{BitDepth}bpp $exif->{ColorType}" : (),
+		sprintf('exif x%d', scalar %{$exif}),
+		$exif->{Thumb} ? "thumb $exif->{ThumbnailLength}B" : (),
+		(map "@ $_",
+			$exif->{DateTimeOriginal} //
 			$exif->{DateCreated} //
 			$exif->{CircaDateCreated} //
 			$exif->{ModifyDate} //
 			$exif->{ZipModifyDate} //
 			(),
 		),
-		$exif->{GPSPosition} ?  " $exif->{GPSPosition}" =~ s/ deg/./gr :
-		$exif->{Location} ? " $exif->{Location}" : (),
-		$exif->{GPSAltitude} ? " $exif->{GPSAltitude}" : (),
-		(map " hw $_", join(' ',
+		join(', ',
+			$exif->{GPSPosition} // $exif->{Location} // (),
+			$exif->{GPSAltitude} // (),
+		),
+		(map "hw $_", join(' ',
 			$exif->{Make} // (), $exif->{Model} // (),
 			$exif->{FOV} ? "(FOV $exif->{FOV})" : (),
 		) || ()),
-		(map " sw $_", $exif->{Software} // $exif->{Application} // ()),
-		(map " > $_", $exif->{'Description-nl'} // ()),
-		$exif->{Warning} ? " ! $exif->{Warning}" : (),
+		(map "sw $_", $exif->{Software} // $exif->{Application} // ()),
+		(map "> $_", $exif->{'Description-nl'} // ()),
+		$exif->{Warning} ? "! $exif->{Warning}" : (),
 	);
-} or warn $@;
+};
+warn $@ if $@;
 
+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 => (
-	-compress => 'none',
+	$file =>
+	-delete => '1--1',
 	'+distort' => SRT => '0,0 1,.56 0',
-	-thumbnail => $size || '66x23',
-	$file => 'pgm:-'
+	-thumbnail => $size || '40x12',
+	-colorspace => 'gray',
+	'-normalize',
+	-background => 'black',
+	-layers => 'flatten',
+	-compress => 'none',
+	'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 //, " .:oO@";
+	while (<$pgm>) {
+		print $ch[ $_ * @ch >> 8 ] for /\d+/g;
+		print ' ', shift @info if @info;
+		print $/;
+	}
+	substr $_, 0, 0, ' ' x ($width + 1) for @info;
 }
+say for @info;