X-Git-Url: http://git.shiar.nl/minime.git/blobdiff_plain/b2b31fafeac21fe65d7e17dd15ffe5f0b224a68a..44da9ac5236010871ca1402111869c9ac9838a7b:/termimg?ds=sidebyside

diff --git a/termimg b/termimg
index 7eccb49..ef57cd3 100755
--- a/termimg
+++ b/termimg
@@ -4,7 +4,11 @@ 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)" : (),
@@ -18,15 +22,17 @@ my @info = eval {
 		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} : (),
+		join(', ',
+			$exif->{GPSPosition} // $exif->{Location} // (),
+			$exif->{GPSAltitude} // (),
+		),
 		(map "hw $_", join(' ',
 			$exif->{Make} // (), $exif->{Model} // (),
 			$exif->{FOV} ? "(FOV $exif->{FOV})" : (),
@@ -35,7 +41,8 @@ my @info = eval {
 		(map "> $_", $exif->{'Description-nl'} // ()),
 		$exif->{Warning} ? "! $exif->{Warning}" : (),
 	);
-} or warn $@;
+};
+warn $@ if $@;
 
 my $filesize = (stat $file)[7];
 eval {
@@ -47,10 +54,16 @@ eval {
 } or warn $@;
 
 open my $pgm, '-|', convert => (
-	-compress => 'none',
+	$file =>
+	-delete => '1--1',
 	'+distort' => SRT => '0,0 1,.56 0',
 	-thumbnail => $size || '40x12',
-	$file => 'pgm:-'
+	-colorspace => 'gray',
+	'-normalize',
+	-background => 'black',
+	-layers => 'flatten',
+	-compress => 'none',
+	'pgm:-'
 ) or die $!;
 
 if (<$pgm> eq "P2\n") {