WIP Much rework for new upload arrangements and new name

[ypp-sc-tools.main.git] / yarrg / Commods.pm

diff --git a/yarrg/Commods.pm b/yarrg/Commods.pm
index 955446f402f48719943af31844cc17e9742649a1..9b190c4b3a88d5236cc1e9ff9f41058a12118be2 100644 (file)
--- a/yarrg/Commods.pm
+++ b/yarrg/Commods.pm
@@ -32,7 +32,8 @@ BEGIN {
     our ($VERSION, @ISA, @EXPORT, @EXPORT_OK, %EXPORT_TAGS);
     $VERSION     = 1.00;
     @ISA         = qw(Exporter);
-    @EXPORT      = qw(&parse_masters &parse_masters_ocean
+    @EXPORT      = qw(&parse_info1 &rsync_master
+                     &parse_info_serverside &parse_info_serverside_ocean
                      %oceans %commods %clients %routes %route_mysteries
                      &parse_pctb_commodmap %pctb_commodmap @pctb_commodmap
                      &get_our_version &check_tsv_line
@@ -58,7 +59,7 @@ 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_master_master1 ($$) {
+sub parse_info1 ($$) {
     my ($mmfn,$src)= @_;
     my $mm= new IO::File $mmfn, 'r' or die "$mmfn $!";
     my @ctx= ();
@@ -131,14 +132,37 @@ sub parse_master_master1 ($$) {
            my $arch= $ocean->{$an};
            push @allislands, sort keys %$arch;
        }
-       parse_master_map_route_islands($on, \@allislands, $routes);
+       parse_info_maproutes($on, \@allislands, $routes);
        foreach my $route (values %$routes) {
-           parse_master_map_route_islands($on, \@allislands, $route);
+           parse_info_maproutes($on, \@allislands, $route);
        }
     }
 }
 
-sub parse_master_map_route_islands ($$$) {
+sub parse_info_clientside () {
+    my $yarrg= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
+    return unless $yarrg;
+    my $master= fetch_with_rsync('info');
+    parse_info1($master,'s');
+    parse_info1('_local-info.txt','s');
+}
+
+sub fetch_with_rsync ($) {
+    my ($stem) = @_;
+
+    my $rsync= $ENV{'YPPSC_YARRG_RSYNC'};
+    $rsync= 'rsync' if !defined $rsync;
+
+    my $local= "_master-$stem.txt";
+    my $src= $ENV{'YPPSC_YARRG_DICT_UPDATE'};
+    if ($src) {
+       my $remote= "$src/master-$stem.txt";
+       $!=0; system 'rsync','-Lt','--',$remote,$local;
+       die "$? $!" if $! or $?;
+    }
+}
+
+sub parse_info_maproutes ($$$) {
     my ($on, $allislands, $routemap) = @_;;
     foreach my $k (sort keys %$routemap) {
        my @ok= grep { index($_,$k) >= 0 } @$allislands;
@@ -153,14 +177,13 @@ sub parse_master_map_route_islands ($$$) {
     }
 }
 
-sub parse_masters () {
-    parse_master_master1('master-master.txt','s');
+sub parse_info_serverside () {
+    parse_info1('master-info.txt','s');
 }
-sub parse_masters_ocean ($) {
+sub parse_info_serverside_ocean ($) {
     my ($oceanname) = @_;
-    parse_master_master1('master-master.txt','s');
     die "unknown ocean $oceanname ?" unless exists $oceans{$oceanname};
-    parse_master_master1("ocean-".(lc $oceanname).".txt",'s');
+    parse_info1("ocean-".(lc $oceanname).".txt",'s');
 }
 
 sub parse_pctb_commodmap () {