X-Git-Url: http://git.shiar.nl/minime.git/blobdiff_plain/ec2421cd86c78acdeae1c06144a31d5119a2d9e1..03d4d658770c714f864100e2f1423d0a6a92e98c:/termimg

diff --git a/termimg b/termimg
index bec4a4b..bb66467 100755
--- a/termimg
+++ b/termimg
@@ -8,24 +8,58 @@ my @info = eval {
 	return (
 		" $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->{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(' ',
+			$exif->{Make} // (), $exif->{Model} // (),
+			$exif->{FOV} ? "(FOV $exif->{FOV})" : (),
+		) || ()),
+		(map " sw $_", $exif->{Software} // $exif->{Application} // ()),
+		(map " > $_", $exif->{'Description-nl'} // ()),
+		$exif->{Warning} ? " ! $exif->{Warning}" : (),
 	);
 } or warn $@;
 
+eval {
+	require Digest::MD5;
+	open my $bin, '<', $file;
+	binmode $bin;
+	my $md5 = Digest::MD5->new->addfile($bin);
+	push @info, ' # '.$md5->b64digest;
+} or warn $@;
+
 open my $pgm, '-|', convert => (
 	-compress => 'none',
 	'+distort' => SRT => '0,0 1,.56 0',
 	-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;