bitlair/revbank
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'oepl'

Browse source
This commit is contained in:
Juerd Waalboer 2025-01-15 21:32:06 +01:00
commit 69fa5af0d1
1 changed files with 18 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
contrib/openepaperlink.pl
View file

@ -65,16 +65,16 @@ sub draw ($product, $hwtype, $force) {
return undef; return undef;
} }
sub get_hwtype($mac) { sub get_dbitem($mac) {
my $response = $ua->get("$ap/get_db?mac=$mac"); my $response = $ua->get("$ap/get_db?mac=$mac");
my $hash = eval { $json->decode($response->content) } || { tags => [] }; my $hash = eval { $json->decode($response->content) } || { tags => [] };
my $tags = $hash->{tags}; my $tags = $hash->{tags};
if (@$tags != 1) { if (@$tags != 1) {
my $status = $response->status_line; my $status = $response->status_line;
warn "Can't get hwtype for $mac (HTTP $status); new tag not ready yet?\n"; warn "Can't get info for $mac (HTTP $status); new tag not ready yet?\n";
return undef; return {};
} }
return $tags->[0]->{hwType}; return $tags->[0];
} }
sub comma($str) { sub comma($str) {
@ -355,6 +355,11 @@ $products->{_NOTFOUND_} = {
tag_price => "999.99", tag_price => "999.99",
}; };
my $fix = @ARGV && $ARGV[0] eq 'fix';
shift if $fix;
my %fns;
for my $line (@lines) { for my $line (@lines) {
my ($mac, $product_id, $hwtype) = split " ", $line; my ($mac, $product_id, $hwtype) = split " ", $line;
$mac and $mac =~ /^[0-F]{12,16}$/ or next; $mac and $mac =~ /^[0-F]{12,16}$/ or next;
@ -363,8 +368,15 @@ for my $line (@lines) {
my $product = $products->{$product_id} || $products->{_NOTFOUND_}; my $product = $products->{$product_id} || $products->{_NOTFOUND_};
$hwtype ||= $new_hwtype{$mac} = get_hwtype($mac) || next; my $needs_fixing = 0;
my $fn = draw($product, $hwtype, !!@ARGV) or next; if ($fix or not $hwtype) {
my $dbitem = get_dbitem($mac);
next if not %$dbitem;
$hwtype ||= $new_hwtype{$mac} = $dbitem->{hwType};
$needs_fixing = $dbitem->{hash} =~ /^0+$/;
}
my $fn = $fns{$product} ||= draw($product, $hwtype, $needs_fixing || !!@ARGV) or next;
print "Uploading image for $mac ($product->{description}).\n"; print "Uploading image for $mac ($product->{description}).\n";
post "imgupload" => [ mac => $mac, lut => 1, alias => $product->{description}, file => $fn ]; post "imgupload" => [ mac => $mac, lut => 1, alias => $product->{description}, file => $fn ];