+# 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 <ijackson@chiark.greenend.org.uk>
+#
+# 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.
+#
+# 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.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program. If not, see <http://www.gnu.org/licenses/>.
+#
+# 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.
package Commods;
use IO::File;
@ISA = qw(Exporter);
@EXPORT = qw(&parse_masters %oceans %commods %clients
&parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
- &get_our_version
+ &get_our_version &check_tsv_line
&pipethrough_prep &pipethrough_run
+ &pipethrough_run_along &pipethrough_run_finish
&pipethrough_run_gzip
&cgipostform);
%EXPORT_TAGS = ( );
my ($aref,$prefix) = @_;
$aref->{"${prefix}name"}= 'ypp-sc-tools yarrg';
$aref->{"${prefix}fixes"}= 'lastpage';
- $aref->{"${prefix}version"}= `git-describe --tags HEAD`; $? and die $?;
+
+ my $version= `git-describe --tags HEAD`; $? and die $?;
+ chomp($version);
+ $aref->{"${prefix}version"}= $version;
return $aref;
}
my $tf= IO::File::new_tmpfile() or die $!;
return $tf;
}
-
-sub pipethrough_run ($$$@) {
+
+sub pipethrough_run_along ($$$@) {
my ($tf, $childprep, $cmd, @a) = @_;
$tf->flush or die $!;
$tf->seek(0,0) or die $!;
- my $child= open GZ, "-|"; defined $child or die $!;
+ my $fh= new IO::File;
+ my $child= $fh->open("-|"); defined $child or die $!;
if (!$child) {
open STDIN, "<&", $tf;
&$childprep() if defined $childprep;
exec $cmd @a; die $!;
}
+ return $fh;
+}
+sub pipethrough_run_finish ($) {
+ my ($fh)= @_;
+ $fh->error and die $!;
+ close $fh or die "$! $?"; die $? if $?;
+}
+
+sub pipethrough_run ($$$@) {
+ my ($tf, $childprep, $cmd, @a) = @_;
+ my $pt= pipethrough_run_along($tf,$childprep,$cmd,@a);
my $r;
- { undef $/; $!=0; $r= <GZ>; }
+ { undef $/; $!=0; $r= <$pt>; }
defined $r or die $!;
- close GZ or die "$! $?"; die $? if $?;
+ pipethrough_run_finish($pt);
return $r;
}
sub pipethrough_run_gzip ($) {
sub cgipostform ($$$) {
my ($ua, $url, $form) = @_;
- my $req= HTTP::Request::Common::POST($url,
+ my $req= HTTP::Request::Common::POST($url,
Content => $form,
Content_Type => 'form-data');
if ($url =~ m,^\.?/,) {
}
#system 'printenv >&2';
}, "$url", "$url");
+ $out =~ s/\r\n/\n/g;
$out =~ m,^Content-Type: text/plain.*\n\n, or die "$out ?";
return $';
} else {
}
}
+our %check_tsv_done;
+
+sub check_tsv_line ($$) {
+ my ($l, $bad_data_callback) = @_;
+ my $bad_data= sub { &$bad_data_callback("bad data: line $.: $_[0]"); };
+
+ chomp($l) or &$bad_data('missing end-of-line');
+
+ $l !~ m/\P{IsPrint}/ or &$bad_data('nonprinting char(s)');
+ $l !~ m/\\/ or &$bad_data('data contains backslashes');
+ my @v= split /\t/, $l, -1;
+ @v==6 or &$bad_data('wrong number of fields');
+ my ($commod,$stall) = @v;
+
+ !keys %commods or
+ defined $commods{$commod} or
+ &$bad_data("unknown commodity \`$commod'");
+
+ $stall =~ m/^\p{IsUpper}|^[0-9]/ or &$bad_data("stall not capitalised");
+ !exists $check_tsv_done{$commod,$stall} or &$bad_data("repeated data");
+ $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");
+ }
+ return @v;
+}
+
1;