X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.web-live.git;a=blobdiff_plain;f=pctb%2Fdictionary-update-receiver;h=d088236b7429f2cb080b22624aa4949212ae7628;hp=078b9f8c312ffd300d6bbf205b743a672b7937f8;hb=34c9aa9031897dada3450d014de96d68a5834039;hpb=9739f45fc783a87f02d1f435cf04fde3899ad4c7 diff --git a/pctb/dictionary-update-receiver b/pctb/dictionary-update-receiver index 078b9f8..d088236 100755 --- a/pctb/dictionary-update-receiver +++ b/pctb/dictionary-update-receiver @@ -1,37 +1,54 @@ #!/usr/bin/perl -w # -# This script is invoked when the YPP SC PCTB client phones home to -# provide updated character set OCR data or updated screenshot pixmap -# interpretation (island name) data. +# This script is invoked when the YPP SC PCTB client talks to the +# dictionary server. See README.privacy. + +# This is part of ypp-sc-tools, a set of third-party tools for assisting +# players of Yohoho Puzzle Pirates. +# +# Copyright (C) 2009 Ian Jackson +# +# This program is free software: you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. # -# The client will also phone home anyway to fetch the latest parsedb -# before +# This program is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. # -# This allows me (the operator of the SC server) to: -# - review the choices made by the user -# - if they are correct, incorporate them in the next client version -# - if they are wrong, incorporate fixes of them, or contradictions of them, -# in +# You should have received a copy of the GNU General Public License +# along with this program. If not, see . +# +# Yohoho and Puzzle Pirates are probably trademarks of Three Rings and +# are used without permission. This program is not endorsed or +# sponsored by Three Rings. + -# The information reported -# The SC PCTB client does this so that +# upload testing runes: +# +# YPPSC_PCTB_DICT_UPDATE=./ YPPSC_PCTB_DICT_SUBMIT=./ ./ypp-commodities --ocean midnight --pirate aristarchus --find-island --same --raw-tsv >raw.tsv +# ./dictionary-manager --debug --approve-updates '' . . use strict (qw(vars)); use POSIX; -$CGI::POST_MAX= 65536; +$CGI::POST_MAX= 1024*1024; $CGI::DISABLE_UPLOADS= 1; use CGI qw/:standard -private_tempfiles/; use IO::Pipe; use IO::Handle; +my $aadepth=2; + #---------- pixmaps ---------- sub parseentryin__pixmap ($) { my ($entry_in) = @_; $entry_in =~ - m/^(\w+ \- \w[-+\'\"\#! 0-9a-z]*)\nP3\n([1-9]\d{1,3}) ([1-9]\d{1,3})\n255\n/s or die; + m/^(\S+ \- .*)\nP3\n([1-9]\d{1,3}) ([1-9]\d{1,3})\n255\n/s or die; my ($def,$w,$h)= ($1, $2+0, $3+0); my @d= grep { m/./ } split /\s+/, $'; @d == $w*$h*3 or die "$d[0]|$d[1]|...|$d[$#d-1]|$d[$#d] ?"; @@ -61,7 +78,7 @@ sub parseentryin__pixmap ($) { my $whole= pipeval($ppm, 'ppmtopgm', - 'pnmnorm -bpercent 40 -wpercent 20', + 'pnmnorm -bpercent 10 -wpercent 5', 'pgmtopbm -threshold', 'pnminvert', 'pbmtoascii'); @@ -75,42 +92,48 @@ sub parseentryin__pixmap ($) { sub parseentryin__char ($$) { my ($ei,$h) = @_; - $ei =~ m/^(Digit|Upper|Lower)\n((?:[-&\'A-F0-9a-f ]|\x20)+)\n/s or die; + $ei =~ m/^(Digit|Upper|Lower|Word)\n([^\n]+)\n/s or die; my ($ctx,$str)= ($1,$2); -#print STDERR ">$'<\n"; +print STDERR ">ctx=$ctx|str=$str|$'<\n"; my @d= grep { m/./ } split /\n/, $'; -#print STDERR ">@d<\n"; - die if $h>31; +print STDERR ">@d<\n"; + die if $h>100; die if @d>400; - my $maxval= (1<<$h)-1; - map { - m/^[0-9a-f]{1,8}$/ or die; - $_= hex $_; - die "$_ ?" if $_ > $maxval; - } @d; + my $w= @d; - my $ppm= "P2\n$w $h\n1\n"; - my $whole=''; - for (my $y=0; $y<$h; $y++) { - for (my $x=0; $x<$w; $x++) { - my $pix= !($d[$x] & (1<<$y)); - $ppm .= sprintf " %d", $pix; - $whole .= $pix ? ' ' : '<>'; - } - $ppm .= "\n"; - $whole .= "\n"; - } - map { $_= sprintf "%x", $_; } @d; + + my $maxval= (1<<$aadepth)-1; + die 'cannot do [^0...$maxval]!' if $maxval>9; + + my $pgm= "P2\n$h $w\n$maxval\n"; + map { # x, left to right + m/[^0-$maxval]/ and die "$_ ?"; + my $l= $_; + $l =~ s/./ $&/g; + $pgm .= "$l\n"; + } @d; + my $key= join ' ', $ctx, @d; -# my $whole= pipeval($ppm, -# "pnmscale 2", -# 'pgmtopbm -threshold', -# 'pbmtoascii'); + $pgm= pipeval($pgm, + "pnmflip -xy", + "pnmnoraw"); + + my $icon= pipeval($pgm, + "pnmscale -xysize 156 ".($h*4), + 'pgmtopbm -threshold', + 'pnminvert', + 'pbmtoascii -2x4'); - my $entry= "$ctx\n$str\n". join("\n", @d). "\n"; + my $whole= pipeval($pgm, + "pnmscale 4", + 'pgmtopbm -fs', + 'pnminvert', + 'pbmtoascii'); + + my $entry= "$ctx\n$str\n$key\n"; - return ($ctx,$str,$ppm,$key,$str, $w*2,'',$whole,$entry); + return ($ctx,$str,$pgm,$key,$str, $w*4,$icon,$whole,$entry); } #---------- useful stuff ---------- @@ -160,22 +183,36 @@ sub pipeval ($@) { #---------- determine properties of the submission ---------- +my $version= param('version'); +my $spec_aadepth= param('depth'); +if ($version ne '3' || $spec_aadepth ne $aadepth) { + print header('text/plain', + "403 YPP SC PCTB client is out of date". + " ($version, $spec_aadepth)"); + print "\nYour YPP SC client is out of date.\n"; + exit 0; +} + my $dict= param('dict'); my $entry_in= param('entry'); -defined $entry_in or die; +defined $entry_in or die Dump()." ?"; my $ocean= param('ocean'); my $pirate= param('pirate'); if (defined $ocean && defined $pirate) { $pirate= "$ocean - $pirate"; } else { - $pirate= $ENV{'REMOTE_ADDR'}; - my $fwdf= $ENV{'HTTP_X_FORWARDED_FOR'}; - if (defined $fwdf) { - $fwdf =~ s/\s//g; - $fwdf =~ s/[^0-9.,]/?/g; - $pirate= "$fwdf,$pirate"; - } + $pirate= ''; +} + +my $caller= $ENV{'REMOTE_ADDR'}; +$caller= 'LOCAL' unless defined $caller; + +my $fwdf= $ENV{'HTTP_X_FORWARDED_FOR'}; +if (defined $fwdf) { + $fwdf =~ s/\s//g; + $fwdf =~ s/[^0-9.,]/?/g; + $caller= "$fwdf,$pirate"; } my $kind; @@ -193,6 +230,18 @@ $dict= $&; my ($ctx,$def,$image,$key,$val, $width,$icon,$whole,$entry)= &{"parseentryin__$kind"}($entry_in, @xa); +my $du=$ENV{'YPPSC_DICTUPDATES'}; +chdir $du or die "$du $!" + if defined $du; + +my $instance= $du; +$instance =~ s,ypp-sc-tools,,ig; +$instance =~ s,ypp,,ig; +$instance =~ s,pctb,,ig; +$instance =~ s,/\W+/,/,g; +$instance =~ s,/+$,,; +$instance =~ s,^.*/,,; + #---------- compute the email to send ---------- my $whoami= `whoami`; $? and die $?; @@ -200,9 +249,10 @@ chomp $whoami; my $email= < $fn_t" or die "$fn_t $!"; (stat F) or die $!; my $fn_i= sprintf "_update.$$-%016x.rdy", (stat _)[1]; -print F "ypp-sc-tools dictionary update v1\n"; +print F "ypp-sc-tools dictionary update v3 depth=$aadepth\n"; -foreach my $v ($pirate,$dict,$ctx,$def,$image,$key,$val) { +foreach my $v ($pirate,$caller,$dict,$ctx,$def,$image,$key,$val) { printf F "%d\n", length($v) or die $!; print F $v,"\n" or die $!; } @@ -261,7 +307,7 @@ my @tm= localtime; my $tm= strftime "%Y-%m-%d %H:%M:%S %Z", @tm; open L, ">> _dict.log" or die $!; -my $ll= sprintf "%s %-6s %-31s %s", $tm, $dict, $pirate, $fn_i; +my $ll= sprintf "%s %-6s %-31s %-31s %s", $tm, $dict, $pirate, $caller, $fn_i; #---------- commit everything ---------- @@ -270,7 +316,7 @@ L->flush or die $!; if (eval { - open S, "|sendmail -odb -oee -oi -t" or die $!; + open S, "|/usr/lib/sendmail -odb -oee -oi -t" or die $!; print S $email or die $!; $!=0; $?=0; close S or die $!; $? and die $?; @@ -281,7 +327,8 @@ if (eval { print L "$ll stored\n" or die $!; } else { print L "$ll ERROR! $@\n" or die $!; + exit 1; } close L or die $!; -print header('text/plain'), "$fn_i\n" or die $!; +print header('text/plain'), "OK $fn_i\n" or die $!;