git.shiar.nl
/
minime.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
distinguish (mostly) transparent pixels
[minime.git]
/
termimg
diff --git
a/termimg
b/termimg
index b7fa9340fb6ac20d49c7180721f99d02ba7b7c81..3dd0fa48aa11715ba46d9f63a6d8675b7a20ec93 100755
(executable)
--- a/
termimg
+++ b/
termimg
@@
-4,7
+4,12
@@
my ($file, $size) = @ARGV;
my @info = eval {
require Image::ExifTool;
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},
$exif->{ImageSize} ? "$exif->{ImageSize} ($exif->{Megapixels}MP)" : (),
return (
$exif->{MIMEType},
$exif->{ImageSize} ? "$exif->{ImageSize} ($exif->{Megapixels}MP)" : (),
@@
-15,18
+20,20
@@
my @info = eval {
$exif->{SVGVersion} // $exif->{PDFVersion} // (),
),
$exif->{ColorType} ? "$exif->{BitDepth}bpp $exif->{ColorType}" : (),
$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->{Thumb} ? "thumb $exif->{ThumbnailLength}B" : (),
(map "@ $_",
+ $exif->{DateTimeOriginal} //
$exif->{DateCreated} //
$exif->{CircaDateCreated} //
$exif->{ModifyDate} //
$exif->{ZipModifyDate} //
(),
),
$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})" : (),
(map "hw $_", join(' ',
$exif->{Make} // (), $exif->{Model} // (),
$exif->{FOV} ? "(FOV $exif->{FOV})" : (),
@@
-35,7
+42,8
@@
my @info = eval {
(map "> $_", $exif->{'Description-nl'} // ()),
$exif->{Warning} ? "! $exif->{Warning}" : (),
);
(map "> $_", $exif->{'Description-nl'} // ()),
$exif->{Warning} ? "! $exif->{Warning}" : (),
);
-} or warn $@;
+};
+warn $@ if $@;
my $filesize = (stat $file)[7];
eval {
my $filesize = (stat $file)[7];
eval {
@@
-47,18
+55,26
@@
eval {
} or warn $@;
open my $pgm, '-|', convert => (
} or warn $@;
open my $pgm, '-|', convert => (
- -compress => 'none',
+ $file =>
+ -delete => '1--1',
'+distort' => SRT => '0,0 1,.56 0',
'+distort' => SRT => '0,0 1,.56 0',
- -thumbnail => $size || '66x23',
- $file => 'pgm:-'
+ -thumbnail => $size || '40x12',
+ -colorspace => 'gray',
+ '-normalize',
+ -level => '-1%',
+ -channel => 'A', -threshold => '50%',
+ -background => 'black',
+ -layers => 'flatten',
+ -compress => 'none',
+ 'pgm:-'
) or die $!;
if (<$pgm> eq "P2\n") {
my ($width, $height) = split ' ', <$pgm>;
<$pgm>; # ignore depth
) or die $!;
if (<$pgm> eq "P2\n") {
my ($width, $height) = split ' ', <$pgm>;
<$pgm>; # ignore depth
- my @ch = split //, " .:
c
oO@";
+ my @ch = split //, " .:oO@";
while (<$pgm>) {
while (<$pgm>) {
- print $ch[ $_ * @ch >> 8 ] for /\d+/g;
+ print
!$_ ? '/' :
$ch[ $_ * @ch >> 8 ] for /\d+/g;
print ' ', shift @info if @info;
print $/;
}
print ' ', shift @info if @info;
print $/;
}