X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=c1f08530cfb148733597f6db47a3730ed4f3210e;hb=2eff7489498cf9aab5a8ea7e6dae8334419ac3a6;hp=c6d8fca2e76f22cf6c1eb25014e551fe76d92513;hpb=436af6a696e3488f5d25e027553ec356da4cde01;p=ndwebbie.git
diff --git a/scripts/scans.pl b/scripts/scans.pl
index c6d8fca..c1f0853 100755
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -26,7 +26,10 @@ use CGI;
use DBI;
use DBD::Pg qw(:pg_types);
use LWP::Simple;
-use lib qw{/var/www/ndawn/lib/};
+
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
use ND::DB;
our $dbh = ND::DB::DB();
@@ -77,20 +80,48 @@ my $addplanetscan = $dbh->prepare(q{INSERT INTO planet_scans
(id,tick,planet,metal_roids,metal,crystal_roids,crystal,eonium_roids,eonium
,agents,guards,light,medium,heavy,hidden)
VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
-my $addstrucscan = $dbh->prepare(q{INSERT INTO structure_scans
+
+sub parse_planet {
+ my ($scan,$file) = @_;
+
+ my @values = ($scan->{id},$scan->{tick},$scan->{planet});
+ $file =~ s/(\d),(\d)/$1$2/g;
+
+ while($file =~ m/"center">(Metal|Crystal|Eonium)\D+(\d+)\D+([\d,]+)/g){
+ push @values,$2,$3;
+ }
+ if($file =~ m{Security\ Guards .+? "center">(\d+)
+ .+? "center">(\d+)}sx){
+ push @values,$1,$2;
+ }
+ if($file =~ m{| ([A-Z][a-z]+) | ([A-Z][a-z]+) | ([A-Z][a-z]+) | }){
+ push @values,$1,$2,$3;
+ }
+ if($file =~ m{([\d,]+)}){
+ push @values,$1;
+ }
+ $addplanetscan->execute(@values);
+}
+
+my $adddevscan = $dbh->prepare(q{INSERT INTO development_scans
(id,tick,planet,light_fac,medium_fac,heavy_fac,amps,distorters
- ,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,seccents,total)
- VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
+ ,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,seccents
+ ,travel,infra,hulls,waves,extraction,covert,mining,total)
+ VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
+ });
+
-my $addtechscan = $dbh->prepare(q{INSERT INTO tech_scans
- (id,tick,planet,travel,infra,hulls,waves,extraction,covert,mining)
- VALUES(?,?,?,?,?,?,?,?,?,?)});
+my %parsers = (
+ Planet => \&parse_planet,
+);
$dbh->begin_work or die 'No transaction';
$newscans->execute or die $dbh->errstr;
$dbh->pg_savepoint('scans') or die "No savepoint";
+my $parsedscans = 0;
+
while (my $scan = $newscans->fetchrow_hashref){
$dbh->pg_release('scans') or die "Couldn't save";
$dbh->pg_savepoint('scans') or die "Couldn't save";
@@ -103,6 +134,7 @@ while (my $scan = $newscans->fetchrow_hashref){
my $y = $3;
my $z = $4;
my $tick = $5;
+ $scan->{tick} = $5;
if($dbh->selectrow_array(q{SELECT * FROM scans WHERE scan_id = ? AND tick = ? AND id <> ?},undef,$scan->{scan_id},$tick,$scan->{id})){
$dbh->pg_rollback_to('scans') or die "rollback didn't work";
@@ -112,6 +144,7 @@ while (my $scan = $newscans->fetchrow_hashref){
next;
}
my ($planet) = $dbh->selectrow_array($findplanet,undef,$x,$y,$z,$tick);
+ $scan->{planet} = $planet;
unless ($planet){
$dbh->pg_rollback_to('scans') or die "rollback didn't work";
if ( $x == 0 && $y == 0 && $z == 0 ){
@@ -124,24 +157,8 @@ while (my $scan = $newscans->fetchrow_hashref){
if ($file =~ /(Note: [^<]*)/){
#TODO: something about planet being closed?
}
- if ($type eq 'Planet'){
- my @values = ($scan->{id},$tick,$planet);
- $file =~ s/(\d),(\d)/$1$2/g;
-
- while($file =~ m/"center">(Metal|Crystal|Eonium)\D+(\d+)\D+([\d,]+)/g){
- push @values,$2,$3;
- }
- if($file =~ m{Security\ Guards .+? "center">(\d+)
- .+? "center">(\d+)}sx){
- push @values,$1,$2;
- }
- if($file =~ m{([A-Z][a-z]+) | ([A-Z][a-z]+) | ([A-Z][a-z]+) | }){
- push @values,$1,$2,$3;
- }
- if($file =~ m{([\d,]+)}){
- push @values,$1;
- }
- $addplanetscan->execute(@values);
+ if (exists $parsers{$type}){
+ $parsers{$type}->($scan,$file);
}elsif ($type eq 'Jumpgate'){
#print "$file\n";
while ($file =~ m{(\d+):(\d+):(\d+)\D+(Attack|Defend|Return)([^<]*)\D+(\d+)\D+(\d+)}g){
@@ -184,21 +201,15 @@ while (my $scan = $newscans->fetchrow_hashref){
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
}
}
- } elsif($type eq 'Surface Analysis'){
+ } elsif($type eq 'Development'){
my @values = ($scan->{id},$tick,$planet);
my $total = 0;
while($file =~ m{((?:[a-zA-Z]| )+)(\d+)}sg){
push @values,$2;
- $total += $2;
+ $total += $2 if $#values <= 13;
}
push @values,$total;
- $addstrucscan->execute(@values);
- } elsif($type eq 'Technology Analysis'){
- my @values = ($scan->{id},$tick,$planet);
- while($file =~ m{((?:[a-zA-Z]| )+)(\d+)}sg){
- push @values,$2;
- }
- $addtechscan->execute(@values);
+ $adddevscan->execute(@values);
} elsif($type eq 'Unit' || $type eq 'Advanced Unit'){
my $id = addfleet($type,'Full fleet',$file,$planet,undef,$tick,undef,undef,undef);
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
@@ -207,11 +218,13 @@ while (my $scan = $newscans->fetchrow_hashref){
my $id = addfleet($1,$2,$3,$planet,undef,$tick,undef,undef,$4);
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
}
+ } elsif($type eq 'Landing'){
} else {
- print "Something wrong with scan $scan->{id} type $type at tick $tick http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}";
+ print "Something wrong with scan $scan->{id} type $type at tick $tick http://game.planetarion.com/showscan.pl?scan_id=$scan->{scan_id}\n";
}
$parsedscan->execute($tick,$type,$planet,$scan->{id}) or die $dbh->errstr;
#$dbh->rollback;
+ ++$parsedscans;
};
if ($@) {
warn $@;
@@ -226,6 +239,8 @@ while (my $scan = $newscans->fetchrow_hashref){
#$dbh->rollback;
$dbh->commit;
+system 'killall','-USR1', 'irssi' if $parsedscans;
+
sub addfleet {
my ($name,$mission,$ships,$sender,$target,$tick,$eta,$back,$amount,$ingal) = @_;
|