X-Git-Url: http://git.shiar.nl/minime.git/blobdiff_plain/f4e24a4d3bf2aee9e0169007c32c4d0277570b4e..012b190991e70234b3dd58f3a98ed39a83b295a0:/termimg

diff --git a/termimg b/termimg
index b7fa934..baf6afd 100755
--- a/termimg
+++ b/termimg
@@ -4,7 +4,10 @@ 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',
+	});
+	die "exiftool: $exif->{Error}\n" if $exif->{Error};
 	return (
 		$exif->{MIMEType},
 		$exif->{ImageSize} ? "$exif->{ImageSize} ($exif->{Megapixels}MP)" : (),
@@ -24,9 +27,10 @@ my @info = eval {
 			$exif->{ZipModifyDate} //
 			(),
 		),
-		$exif->{GPSPosition} ?  $exif->{GPSPosition} =~ s/ deg/./gr :
-		$exif->{Location} ? $exif->{Location} : (),
-		$exif->{GPSAltitude} ? $exif->{GPSAltitude} : (),
+		join(', ',
+			$exif->{GPSPosition} // $exif->{Location} // (),
+			$exif->{GPSAltitude} // (),
+		),
 		(map "hw $_", join(' ',
 			$exif->{Make} // (), $exif->{Model} // (),
 			$exif->{FOV} ? "(FOV $exif->{FOV})" : (),
@@ -35,7 +39,8 @@ my @info = eval {
 		(map "> $_", $exif->{'Description-nl'} // ()),
 		$exif->{Warning} ? "! $exif->{Warning}" : (),
 	);
-} or warn $@;
+};
+warn $@ if $@;
 
 my $filesize = (stat $file)[7];
 eval {
@@ -47,16 +52,22 @@ eval {
 } 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 $!;
 
 if (<$pgm> eq "P2\n") {
 	my ($width, $height) = split ' ', <$pgm>;
 	<$pgm>;  # ignore depth
-	my @ch = split //, " .:coO@";
+	my @ch = split //, " .:oO@";
 	while (<$pgm>) {
 		print $ch[ $_ * @ch >> 8 ] for /\d+/g;
 		print ' ', shift @info if @info;