X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2FCommods.pm;h=59ad3e1384cf9dcab67d350a775a617ce9613ba6;hb=a9da0efea5c7191be3fc150465c52c03a44b4765;hp=f17a8ed289d6b4d9567df4e99ab8963428e89d52;hpb=44285f9f7bdb6d7e21879b5bb85c7e71049ad0cb;p=ypp-sc-tools.db-test.git diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm index f17a8ed..59ad3e1 100644 --- a/yarrg/Commods.pm +++ b/yarrg/Commods.pm @@ -24,6 +24,7 @@ package Commods; use IO::File; use HTTP::Request::Common (); use POSIX; +use LWP::UserAgent; use strict; use warnings; @@ -40,14 +41,17 @@ BEGIN { &get_our_version &check_tsv_line &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); + &set_ctype_utf8 $masterinfoversion); %EXPORT_TAGS = ( ); @EXPORT_OK = qw(); } +our $masterinfoversion= 2; # version we understand + 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! @@ -63,11 +67,19 @@ our %commods; our (%pctb_commodmap,@pctb_commodmap); my %colours; # eg $colours{'c'}{'black'}= $sources -my @rawcm; # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth' - -sub parse_info1 ($$) { - my ($mmfn,$src)= @_; - my $mm= new IO::File $mmfn, 'r' or die "$mmfn $!"; +my (@rawcm, @nocm); # eg $rawcm[0]='fine rum'; $rawcm[1]='fine %c cloth' + +# 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,$enoentok)= @_; + my $mm= new IO::File $mmfn, 'r'; + if (!$mm) { + return if $enoentok && $!==&ENOENT; + die "$mmfn $!"; + } my @ctx= (); while (<$mm>) { next if m/^\s*\#/; @@ -78,12 +90,16 @@ sub parse_info1 ($$) { @ctx= (sub { $colours{$colourkind}{lc $_} .= $src; }); } elsif (m/^commods$/) { @ctx= (sub { push @rawcm, lc $_; }); + } elsif (m/^nocommods$/) { + @ctx= (sub { push @nocm, lc $_; }); } elsif (m/^ocean (\w+)$/) { my $ocean= $1; + keys %{ $oceans{$ocean} }; @ctx= (sub { $ocean or die; # ref to $ocean needed to work # around a perl bug my $arch= $_; + keys %{ $oceans{$ocean}{$arch} }; $ctx[1]= sub { $oceans{$ocean}{$arch}{$_} .= $src; }; @@ -120,10 +136,30 @@ sub parse_info1 ($$) { $ca= sub { my ($s,$ss) = @_; #print "ca($s)\n"; - if ($s !~ m/\%(\w+)/) { $commods{ucfirst $s}{Srcs} .= $ss; return; } + if ($s !~ m/\%(\w+)/) { + my ($name, $props) = $s =~ + /^(\S[^\t]*\S)(?:\t+(\S[^\t]*\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; + 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$/) { + $c->{Volume}= $1 * 1000; + } else { + die "unknown property $prop for $ucname"; + } + } + return; + } die "unknown $&" unless defined $colours{$1}; - foreach my $c (keys %{ $colours{$1} }) { - &$ca($`.$c.$', $ss .'%'. $colours{$1}{$c}); + my ($lhs,$pctlet,$rhs)= ($`,$1,$'); + foreach my $c (keys %{ $colours{$pctlet} }) { + &$ca($lhs.$c.$rhs, $ss .'%'. $colours{$pctlet}{$c}); } }; foreach (@rawcm) { &$ca($_,$src); } @@ -146,16 +182,9 @@ sub parse_info1 ($$) { } sub parse_info_clientside () { - my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'}; - return unless $yarrg; - my $master= fetch_with_rsync('info'); - parse_info1($master,'s'); - my $local= '_local-info.txt'; - if (stat $local) { - parse_info1($local,'s'); - } else { - die "$local $!" unless $! == &ENOENT; - } + my $master= fetch_with_rsync("info-v$masterinfoversion"); + parse_info1($master,'s',1); + parse_info1('_local-info.txt','s',1); } sub fetch_with_rsync ($) { @@ -190,12 +219,12 @@ sub parse_info_maproutes ($$$) { } sub parse_info_serverside () { - parse_info1('master-info.txt','s'); + parse_info1('source-info.txt','s',0); } 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 () { @@ -219,17 +248,27 @@ sub parse_pctb_commodmap () { sub get_our_version ($$) { my ($aref,$prefix) = @_; $aref->{"${prefix}name"}= 'ypp-sc-tools yarrg'; - $aref->{"${prefix}fixes"}= 'lastpage'; - - my $version= `git-describe --tags HEAD || echo 0unknown`; $? and die $?; - chomp($version); - $aref->{"${prefix}version"}= $version; + $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 + else + gd="git describe" + fi + \$gd --tags HEAD || echo 0unknown + `; $? and die $?; + chomp($version); + return $version; +} + sub pipethrough_prep () { my $tf= IO::File::new_tmpfile() or die $!; return $tf; @@ -237,6 +276,7 @@ sub pipethrough_prep () { sub pipethrough_run_along ($$$@) { my ($tf, $childprep, $cmd, @a) = @_; + $tf->error and die $!; $tf->flush or die $!; $tf->seek(0,0) or die $!; my $fh= new IO::File; @@ -366,4 +406,22 @@ 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; +} + 1;