distinguish (mostly) transparent pixels

[minime.git] / termimg

diff --git a/termimg b/termimg
index d51790613d64346bc58439aab97beae6c80a544e..3dd0fa48aa11715ba46d9f63a6d8675b7a20ec93 100755 (executable)
--- 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',
+               Exclude => 'System:*',
+       });
        die "exiftool: $exif->{Error}\n" if $exif->{Error};
        return (
                $exif->{MIMEType},
@@ -16,18 +20,20 @@ my @info = eval {
                        $exif->{SVGVersion} // $exif->{PDFVersion} // (),
                ),
                $exif->{ColorType} ? "$exif->{BitDepth}bpp $exif->{ColorType}" : (),
-               sprintf('exif x%d', scalar %{$exif}),
+               sprintf('exif (%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})" : (),
@@ -49,10 +55,18 @@ 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',
+       -level => '-1%',
+       -channel => 'A', -threshold => '50%',
+       -background => 'black',
+       -layers => 'flatten',
+       -compress => 'none',
+       'pgm:-'
 ) or die $!;
 
 if (<$pgm> eq "P2\n") {
@@ -60,7 +74,7 @@ if (<$pgm> eq "P2\n") {
        <$pgm>;  # ignore depth
        my @ch = split //, " .:oO@";
        while (<$pgm>) {
-               print $ch[ $_ * @ch >> 8 ] for /\d+/g;
+               print !$_ ? '/' : $ch[ $_ * @ch >> 8 ] for /\d+/g;
                print ' ', shift @info if @info;
                print $/;
        }