X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Fscans.pl;h=d16732c48eac91deec396a0633b551625badec0c;hb=505b74b435bd5a7bfa2fedb551354c9f8fc9609d;hp=818be591e37d8937162fa6b98f2e3f59631d1d7a;hpb=a4b209407c81ec7b71c9c7f8c4d57bb2f77256f4;p=ndwebbie.git

diff --git a/scripts/scans.pl b/scripts/scans.pl
index 818be59..d16732c 100755
--- a/scripts/scans.pl
+++ b/scripts/scans.pl
@@ -80,6 +80,40 @@ 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(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)});
+
+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+)</td>
+			.+? "center">(\d+)</td>}sx){
+		push @values,$1,$2;
+	}
+	if($file =~ m{<td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td>}){
+		push @values,$1,$2,$3;
+	}
+	if($file =~ m{<span class="superhighlight">([\d,]+)</span>}){
+		push @values,$1;
+	}
+	$addplanetscan->execute(@values);
+}
+
+sub parse_incoming {
+	my ($scan,$file) = @_;
+
+	while($file =~ m{class="left">Fleet:\s(.*?)</td><td\sclass="right">
+			Mission:\s(\w+)</td></tr>(.*?)Total\sShips:\s(\d+)}sxg){
+		my $id = addfleet($1,$2,$3,$scan->{planet},undef
+			,$scan->{tick},undef,undef,$4);
+		$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
+	}
+}
+
 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
@@ -87,10 +121,19 @@ my $adddevscan = $dbh->prepare(q{INSERT INTO development_scans
 	VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
 	});
 
+
+my %parsers = (
+	Planet => \&parse_planet,
+	Incoming => \&parse_incoming,
+);
+
+
 $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 +146,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 +156,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 +169,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+)</td>
-					.+? "center">(\d+)</td>}sx){
-				push @values,$1,$2;
-			}
-			if($file =~ m{<td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td><td class="center">([A-Z][a-z]+)</td>}){
-				push @values,$1,$2,$3;
-			}
-			if($file =~ m{<span class="superhighlight">([\d,]+)</span>}){
-				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)</td><td class="left">([^<]*)\D+(\d+)\D+(\d+)}g){
@@ -196,16 +225,13 @@ while (my $scan = $newscans->fetchrow_hashref){
 		} 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;
-		} elsif($type eq 'Incoming'){
-			while($file =~ m{class="left">Fleet: (.*?)</td><td class="left">Mission: (\w+)</td></tr>(.*?)Total Ships: (\d+)}sg){
-				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 $@;
@@ -220,6 +246,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) = @_;