X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~yarrgweb/git?a=blobdiff_plain;f=yarrg%2FCommods.pm;h=e63126ace25bb25fa65006d4e028bc4c0154969b;hb=1f6f88af87868d6e059be154ed6b56dd9ea7ac6c;hp=59ad3e1384cf9dcab67d350a775a617ce9613ba6;hpb=938b4dd547bfc4d9538a5714b6f21ab3da50d8d1;p=ypp-sc-tools.db-test.git

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 59ad3e1..e63126a 100644
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -22,6 +22,7 @@
 
 package Commods;
 use IO::File;
+use IO::Pipe;
 use HTTP::Request::Common ();
 use POSIX;
 use LWP::UserAgent;
@@ -36,7 +37,8 @@ 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
+		      %vessels %shotname2damage
 		      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
 		      &get_our_version &check_tsv_line
 		      &pipethrough_prep &pipethrough_run
@@ -44,18 +46,47 @@ BEGIN {
 		      &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
 
@@ -104,11 +135,24 @@ sub parse_info1 ($$$) {
 		    $oceans{$ocean}{$arch}{$_} .= $src;
 		};
 	    });
-	} elsif (m/^routes (\w+)$/) {
-	    my $ocean= $1;
+	} elsif (m/^vessels$/) {
 	    @ctx= (sub {
-		m/^(\S[^\t]*\S),\s*(\S[^\t]*\S),\s*([1-9][0-9]{0,2})$/ or die;
-		$routes{$ocean}{$1}{$2}= $3;
+		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/^ ([a-z]+) \s+ (\d+) $/x or die;
+		$shotname2damage{$1}= $2;
 	    });
 	} elsif (m/^client (\S+.*\S)$/) {
 	    my $client= $1;
@@ -163,22 +207,6 @@ sub parse_info1 ($$$) {
 	}
     };
     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);
-	}
-    }
 }
 
 sub parse_info_clientside () {
@@ -203,23 +231,9 @@ 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',0);
+    parse_info1('tree-info.txt','t',1);
 }
 sub parse_info_serverside_ocean ($) {
     my ($oceanname) = @_;
@@ -424,4 +438,38 @@ sub http_useragent ($) {
     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;