X-Git-Url: http://git.shiar.net/sheet.git/blobdiff_plain/3fc38b02aa93f276554b99bea300760660a1629f..4c2f24f94e9ce8918044815b7dc36922bf3bb70b:/tools/mkwordthumb?ds=inline

diff --git a/tools/mkwordthumb b/tools/mkwordthumb
index 6d1ac67..34c3b6a 100755
--- a/tools/mkwordthumb
+++ b/tools/mkwordthumb
@@ -1,11 +1,12 @@
 #!/usr/bin/env perl
 use 5.014;
 use warnings;
-use lib '.';
+use lib $0 =~ s{[^/]+$}{..}r; # project root
 use Shiar_Sheet::ImagePrep;
 use Shiar_Sheet::DB;
+use JSON ();
 
-our $VERSION = '1.00';
+our $VERSION = '1.01';
 
 my $db = Shiar_Sheet::DB->connect;
 my %filter = @ARGV ? (id => shift) : ();
@@ -14,6 +15,8 @@ my $query = $db->select(word => '*', \%filter);
 while (my $row = $query->hash) {
 	my $image = Shiar_Sheet::ImagePrep->new("data/word/org/$row->{id}.jpg");
 	eval {
-		$image->convert("data/word/en/$row->{id}.jpg", $row->{thumb});
+		my $meta = eval { JSON->new->decode($row->{image} // '{}') }
+			or die ["Invalid JSON metadata in image column.", $@];
+		$image->generate("data/word/32/$row->{id}.jpg", $meta->{convert});
 	} or warn "$row->{id}: @{$@}";
 }