package Commods;
use IO::File;
+use IO::Pipe;
use HTTP::Request::Common ();
use POSIX;
use LWP::UserAgent;
@ISA = qw(Exporter);
@EXPORT = qw(&parse_info_clientside &fetch_with_rsync
&parse_info_serverside &parse_info_serverside_ocean
- %oceans %commods %clients
+ %oceans %commods %clients %commodclasses
%vessels %shotname2damage
&parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
&get_our_version &check_tsv_line
&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();
%commods= ();
my $ca;
+ my $lnoix=0;
$ca= sub {
my ($s,$ss,$ordbase) = @_;
#print STDERR "ca($s,,".(defined $ordbase ? $ordbase : '?').")\n";
$c->{Class}= $1;
die "$1" unless exists $commodclasses{$1};
$ordclassval= 1e7 + $commodclasses{$1} * 1e7;
- } elsif ($prop =~ m/^\@(\d+)$/) {
+ } elsif ($prop =~ m/^\@(\d+\+?)$/) {
$ordval= $1;
+ $ordval =~ s/^(\d+)\+$/ $1 + $lnoix * 10 /e;
} else {
die "unknown property $prop for $ucname";
}
? $ordbase+$ordcolour : undef);
}
};
- foreach (@rawcm) { &$ca($_,$src,0); }
+ foreach (@rawcm) { $lnoix++; &$ca($_,$src,0); }
}
sub parse_info_clientside () {
sub parse_info_serverside () {
parse_info1('source-info.txt','s',0);
+ parse_info1('tree-info.txt','t',1);
}
sub parse_info_serverside_ocean ($) {
my ($oceanname) = @_;
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;