X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?p=ypp-sc-tools.db-live.git;a=blobdiff_plain;f=yarrg%2FCommods.pm;h=91781126d319a32c5f0a5d15f3ec499c82af1fbb;hp=4d988db4ae7e28b854eac40330b9ecd4d84ebfbe;hb=2aa3a575e41e6c9ed3b58e822dde0cf73502012b;hpb=811c58e420d7664366980127cd139b1494baef98 diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm index 4d988db..9178112 100644 --- a/yarrg/Commods.pm +++ b/yarrg/Commods.pm @@ -22,8 +22,10 @@ package Commods; use IO::File; +use IO::Pipe; use HTTP::Request::Common (); use POSIX; +use LWP::UserAgent; use strict; use warnings; @@ -35,25 +37,56 @@ BEGIN { @ISA = qw(Exporter); @EXPORT = qw(&parse_info_clientside &fetch_with_rsync &parse_info_serverside &parse_info_serverside_ocean - %oceans %commods %clients %routes %route_mysteries + %oceans %commods %clients %commodclasses + %vessels %shotname2damage &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap - &get_our_version &check_tsv_line + &get_our_version &check_tsv_line &errsan &pipethrough_prep &pipethrough_run &pipethrough_run_along &pipethrough_run_finish - &pipethrough_run_gzip + &pipethrough_run_gzip &http_useragent &version_core + &http_useragent_string_map &cgipostform &yarrgpostform &cgi_get_caller - &set_ctype_utf8 $masterinfoversion); + &set_ctype_utf8 $masterinfoversion + &source_tarball); %EXPORT_TAGS = ( ); @EXPORT_OK = qw(); } -our $masterinfoversion= 2; # version we understand +our $masterinfoversion= 2; # version we understand. +# +# To extend the source-info.txt format: +# +# * Commods.pm:parse_info1 +# add code to parse new version +# +# * source-info.txt +# add new information +# +# If new data should NOT be in master-info.txt too: +# +# * update-master-info:process_some_info +# check that code for converting source-info to master-info +# removes the extra info; add code to remove it if necessary +# +# * db-idempotent-populate +# if database schema is extended, add code to copy data +# +# If new data DOES need to be in master-info.txt too: +# +# * Commods.pm:$masterinfoversion +# increment +# +# * update-master-info:process_some_info +# add code to convert new version to old, by removing +# extra info conditionally depending on version our %oceans; # eg $oceans{'Midnight'}{'Ruby'}{'Eta Island'}= $sources; our %clients; # eg $clients{'ypp-sc-tools'}= [ qw(last-page) ]; -our %routes; # eg $routes{'Midnight'}{'Orca'}{'Tinga'}= $sources NB abbrevs! -our %route_mysteries; # eg $route_mysteries{'Midnight'}{'Norse'}= 3 +our %vessels; # eg $vessels{'War Brig'}{Shot}='medium' + # $vessels{'War Brig'}{Volume}= 81000 + # $vessels{'War Brig'}{Mass}= 54000 +our %shotname2damage; # eg $shotname2damage{'medium'}= 3; # $sources = 's[l]b'; # 's' = Special Circumstances; 'l' = local ; B = with Bleach @@ -61,19 +94,27 @@ our %commods; # eg $commods{'Fine black cloth'}{Srcs}= $sources; # eg $commods{'Fine black cloth'}{Mass}= 700 [g] # eg $commods{'Fine black cloth'}{Volume}= 1000 [ml] +# eg $commods{'Fine black cloth'}{Ordval}= 203921 our (%pctb_commodmap,@pctb_commodmap); my %colours; # eg $colours{'c'}{'black'}= $sources my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth' +my %colour_ordvals; # $colour_ordvals{'c'}{'green'}= '30'; +our %commodclasses; # $commodclasses{'dye'}= '3'; + # IMPORTANT # when extending the format of source-info in a non-backward # compatible way, be sure to update update-master-info too. -sub parse_info1 ($$) { - my ($mmfn,$src)= @_; - my $mm= new IO::File $mmfn, 'r' or die "$mmfn $!"; +sub parse_info1 ($$$) { + my ($mmfn,$src,$enoentok)= @_; + my $mm= new IO::File $mmfn, 'r'; + if (!$mm) { + return if $enoentok && $!==&ENOENT; + die "$mmfn $!"; + } my @ctx= (); while (<$mm>) { next if m/^\s*\#/; @@ -81,11 +122,24 @@ sub parse_info1 ($$) { s/\s+$//; if (m/^\%(\w+)$/) { my $colourkind= $1; - @ctx= (sub { $colours{$colourkind}{lc $_} .= $src; }); + @ctx= (sub { + m/^(\S[^\t@]*\S)(?:\t+\@(\d+\+?))?$/ or die "$_ ?"; + my ($colour,$order)=($1,$2); + $colours{$colourkind}{$colour} .= $src; + if (defined $order) { + $order =~ s/^(\d+)\+$/ $1 + $. * 10 /e; + $colour_ordvals{$colourkind}{$colour}= $order; + } + }); } elsif (m/^commods$/) { @ctx= (sub { push @rawcm, lc $_; }); } elsif (m/^nocommods$/) { @ctx= (sub { push @nocm, lc $_; }); + } elsif (m/^commodclasses$/) { + @ctx= (sub { + die unless m/^\*([_a-z]+)$/; + $commodclasses{$1}= scalar keys %commodclasses; + }); } elsif (m/^ocean (\w+)$/) { my $ocean= $1; keys %{ $oceans{$ocean} }; @@ -98,11 +152,24 @@ sub parse_info1 ($$) { $oceans{$ocean}{$arch}{$_} .= $src; }; }); - } elsif (m/^routes (\w+)$/) { - my $ocean= $1; + } elsif (m/^vessels$/) { + @ctx= (sub { + return if m/^[-+|]+$/; + m/^ \| \s* ([A-Z][a-z\ ]+[a-z]) \s* + \| \s* (small|medium|large) \s* + \| \s* ([1-9][0-9,]+) \s* + \| \s* ([1-9][0-9,]+) \s* + \| $/x + or die; + my $name= $1; + my $v= { Shot => $2, Volume => $3, Mass => $4 }; + foreach my $vm (qw(Volume Mass)) { $v->{$vm} =~ s/,//g; } + $vessels{$name}= $v; + }); + } elsif (m/^shot$/) { @ctx= (sub { - m/^(\S[^\t]*\S),\s*(\S[^\t]*\S),\s*([1-9][0-9]{0,2})$/ or die; - $routes{$ocean}{$1}{$2}= $3; + m/^ ([a-z]+) \s+ (\d+) $/x or die; + $shotname2damage{$1}= $2; }); } elsif (m/^client (\S+.*\S)$/) { my $client= $1; @@ -127,65 +194,63 @@ sub parse_info1 ($$) { %commods= (); my $ca; + my $lnoix=0; $ca= sub { - my ($s,$ss) = @_; -#print "ca($s)\n"; + my ($s,$ss,$ordbase) = @_; +#print STDERR "ca($s,,".(defined $ordbase ? $ordbase : '?').")\n"; if ($s !~ m/\%(\w+)/) { my ($name, $props) = $s =~ - /^(\S[^\t]*\S)(?:\t+(\S[^\t]*\S))?$/ + /^(\S[^\t]*\S)(?:\t+(\S.*\S))?$/ or die "bad commodspec $s"; return if grep { $name eq $_ } @nocm; my $ucname= ucfirst $name; $commods{$ucname}{Srcs} .= $ss; my $c= $commods{$ucname}; $c->{Volume}= 1000; + my ($ordval, $ordclassval); foreach my $prop (defined $props ? split /\s+/, $props : ()) { if ($prop =~ m/^([1-9]\d*)(k?)g$/) { $c->{Mass}= $1 * ($2 ? 1000 : 1); - } elsif ($prop =~m/^([1-9]\d*)l$/) { + } elsif ($prop =~ m/^([1-9]\d*)l$/) { $c->{Volume}= $1 * 1000; + } elsif ($prop =~ m/^\*([_a-z]+)$/) { + $c->{Class}= $1; + die "$1" unless exists $commodclasses{$1}; + $ordclassval= 1e7 + $commodclasses{$1} * 1e7; + } elsif ($prop =~ m/^\@(\d+\+?)$/) { + $ordval= $1; + $ordval =~ s/^(\d+)\+$/ $1 + $lnoix * 10 /e; } else { die "unknown property $prop for $ucname"; } } + $c->{ClassOrdval}= $ordclassval; + if (defined $ordbase && defined $ordval && defined $ordclassval) { + my $ordvalout= $ordbase + $ordval + $ordclassval; + $c->{Ordval}= $ordvalout; +#print STDERR "ordval $ordvalout $name OV=$ordval OB=$ordbase OCV=$ordclassval\n"; + } else { +#print STDERR "ordval NONE $name\n"; + } return; } die "unknown $&" unless defined $colours{$1}; my ($lhs,$pctlet,$rhs)= ($`,$1,$'); foreach my $c (keys %{ $colours{$pctlet} }) { - &$ca($lhs.$c.$rhs, $ss .'%'. $colours{$pctlet}{$c}); + my $ordcolour= $colour_ordvals{$pctlet}{$c}; + &$ca($lhs.$c.$rhs, + $ss .'%'. $colours{$pctlet}{$c}, + defined($ordbase) && defined($ordcolour) + ? $ordbase+$ordcolour : undef); } }; - foreach (@rawcm) { &$ca($_,$src); } - - foreach my $on (keys %routes) { - my $routes= $routes{$on}; - my $ocean= $oceans{$on}; - die unless defined $ocean; - - my @allislands; - foreach my $an (sort keys %$ocean) { - my $arch= $ocean->{$an}; - push @allislands, sort keys %$arch; - } - parse_info_maproutes($on, \@allislands, $routes); - foreach my $route (values %$routes) { - parse_info_maproutes($on, \@allislands, $route); - } - } + foreach (@rawcm) { $lnoix++; &$ca($_,$src,0); } } sub parse_info_clientside () { - my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'}; - return unless $yarrg; my $master= fetch_with_rsync("info-v$masterinfoversion"); - parse_info1($master,'s'); - my $local= '_local-info.txt'; - if (stat $local) { - parse_info1($local,'s'); - } else { - die "$local $!" unless $! == &ENOENT; - } + parse_info1($master,'s',1); + parse_info1('_local-info.txt','s',1); } sub fetch_with_rsync ($) { @@ -204,28 +269,14 @@ sub fetch_with_rsync ($) { return $local; } -sub parse_info_maproutes ($$$) { - my ($on, $allislands, $routemap) = @_;; - foreach my $k (sort keys %$routemap) { - my @ok= grep { index($_,$k) >= 0 } @$allislands; - die "ambiguous $k" if @ok>1; - if (!@ok) { - $route_mysteries{$on}{$k}++; - delete $routemap->{$k}; - } elsif ($ok[0] ne $k) { - $routemap->{$ok[0]}= $routemap->{$k}; - delete $routemap->{$k}; - } - } -} - sub parse_info_serverside () { - parse_info1('source-info.txt','s'); + parse_info1('source-info.txt','s',0); + parse_info1('tree-info.txt','t',1); } sub parse_info_serverside_ocean ($) { my ($oceanname) = @_; die "unknown ocean $oceanname ?" unless exists $oceans{$oceanname}; - parse_info1("_ocean-".(lc $oceanname).".txt",'s'); + parse_info1("_ocean-".(lc $oceanname).".txt", 's',0); } sub parse_pctb_commodmap () { @@ -250,7 +301,14 @@ sub get_our_version ($$) { my ($aref,$prefix) = @_; $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg'; $aref->{"${prefix}fixes"}= 'lastpage checkpager'; + $aref->{"${prefix}version"}= version_core(); + return $aref; + # clientname "ypp-sc-tools" + # clientversion 2.1-g2e06a26 [from git-describe --tags HEAD] + # clientfixes "lastpage" [space separated list] +} +sub version_core () { my $version= ` if type -p git-describe >/dev/null 2>&1; then gd=git-describe @@ -260,11 +318,7 @@ sub get_our_version ($$) { \$gd --tags HEAD || echo 0unknown `; $? and die $?; chomp($version); - $aref->{"${prefix}version"}= $version; - return $aref; - # clientname "ypp-sc-tools" - # clientversion 2.1-g2e06a26 [from git-describe --tags HEAD] - # clientfixes "lastpage" [space separated list] + return $version; } sub pipethrough_prep () { @@ -353,6 +407,12 @@ sub cgipostform ($$$) { our %check_tsv_done; +sub errsan ($) { + my ($value) = @_; + $value =~ s/[^-+\'. A-Za-z0-9]/ sprintf "\\x%02x",ord $& /ge; + return "\"$value\""; +} + sub check_tsv_line ($$) { my ($l, $bad_data_callback) = @_; my $bad_data= sub { &$bad_data_callback("bad data: line $.: $_[0]"); }; @@ -366,15 +426,19 @@ sub check_tsv_line ($$) { !keys %commods or defined $commods{$commod} or - &$bad_data("unknown commodity \`$commod'"); + &$bad_data("unknown commodity ".errsan($commod)); - $stall =~ m/^\p{IsUpper}|^[0-9]/ or &$bad_data("stall not capitalised"); - !exists $check_tsv_done{$commod,$stall} or &$bad_data("repeated data"); + $stall =~ m/^\p{IsUpper}|^[0-9]/ or + &$bad_data("stall not capitalised ".errsan($stall)); + !exists $check_tsv_done{$commod,$stall} or + &$bad_data("repeated data ".errsan($commod).",".errsan($stall)); $check_tsv_done{$commod,$stall}= 1; foreach my $i (2..5) { my $f= $v[$i]; - $f =~ m/^(|0|[1-9][0-9]{0,5}|\>1000)$/ or &$bad_data("bad field $i"); - ($i % 2) or ($f !~ m/\>/) or &$bad_data("> in field $i price"); + $f =~ m/^(|0|[1-9][0-9]{0,5}|\>1000)$/ or + &$bad_data("bad field $i ".errsan($f)); + ($i % 2) or ($f !~ m/\>/) or + &$bad_data("> in field $i price ".errsan($f)); } foreach my $i (2,4) { @@ -404,4 +468,56 @@ sub set_ctype_utf8 () { setlocale(LC_CTYPE, "en.UTF-8"); } +sub http_useragent_string_map ($$) { + my ($caller_lib_agent, $reason_style_or_caller) = @_; + $caller_lib_agent =~ y/A-Za-z/N-ZA-Mn-za-m/; + $caller_lib_agent =~ s/\s/_/g; + my $version= version_core(); + return "yarrg/$version ($reason_style_or_caller)". + " $caller_lib_agent". + " (http://yarrg.chiark.net/intro)"; +} + +sub http_useragent ($) { + my ($who) = @_; + my $ua= LWP::UserAgent->new; + my $base= $ua->_agent(); + $ua->agent(http_useragent_string_map($base, $who)); + return $ua; +} + +sub source_tarball ($$) { + my ($sourcebasedir,$spitoutfn) = @_; + + my $pipe= new IO::Pipe or die $!; + my $pid= fork(); defined $pid or die $!; + if (!$pid) { + $ENV{'YPPSC_YARRG_SRCBASE'}= $sourcebasedir; + $pipe->writer(); + exec '/bin/sh','-c',' + cd -P "$YPPSC_YARRG_SRCBASE" + ( + git-ls-files -z; + git-ls-files -z --others --exclude-from=.gitignore; + if test -d .git; then find .git -print0; fi + ) | ( + cpio -Hustar -o --quiet -0 -R 1000:1000 || \ + cpio -Hustar -o --quiet -0 + ) | gzip + '; + die $!; + } + $pipe->reader(); + + my ($d, $l); + while ($l= read $pipe, $d, 65536) { + $spitoutfn->($d); + } + waitpid $pid,0; + defined $l or die "read pipe $!"; + $pipe->error and die "pipe error $!"; + close $pipe; + # deliberately ignore errors +} + 1;