use strict;
use warnings;
no warnings 'exiting';
+use local::lib;
use CGI;
use DBI;
use DBD::Pg qw(:pg_types);
-use LWP::Simple;
+
+use LWP::Simple qw/get $ua/;
+$ua->agent("Stupid user agent check is stupid");
use FindBin;
use lib "$FindBin::Bin/../lib";
});
my $oldscan = $dbh->prepare(q{SELECT scan_id FROM scans WHERE scan_id = LOWER(?) AND tick >= tick() - 168});
my $addScan = $dbh->prepare(q{INSERT INTO scans (scan_id,tick,uid) VALUES (LOWER(?),?,?)});
-my $parsedscan = $dbh->prepare(q{UPDATE scans SET tick = ?, type = ?, planet = ?, parsed = TRUE WHERE id = ?});
+my $parsedscan = $dbh->prepare(q{UPDATE scans SET tick = ?, type = ?, pid = ?, parsed = TRUE WHERE id = ?});
my $addpoints = $dbh->prepare(q{UPDATE users SET scan_points = scan_points + ? WHERE uid = ? });
my $delscan = $dbh->prepare(q{DELETE FROM scans WHERE id = ?});
$dbh->begin_work;
my $file = get("http://game.planetarion.com/showscan.pl?scan_grp=$group->{scan_id}");
- my $points = 0;
- while ($file =~ m/showscan.pl\?scan_id=(\w+)/g){
- unless ($dbh->selectrow_array($oldscan,undef,$1)){
- $addScan->execute($1,$group->{tick},$group->{uid});
- ++$points;
+ if ($file){
+ my $points = 0;
+ while ($file =~ m/showscan.pl\?scan_id=(\w+)/g){
+ unless ($dbh->selectrow_array($oldscan,undef,$1)){
+ $addScan->execute($1,$group->{tick},$group->{uid});
+ ++$points;
+ }
}
+ $addpoints->execute($points,$group->{uid});
+ $parsedscan->execute($group->{tick},'GROUP',undef,$group->{id});
}
- $addpoints->execute($points,$group->{uid});
- $parsedscan->execute($group->{tick},'GROUP',undef,$group->{id});
$dbh->commit;
}
WHERE NOT groupscan AND NOT parsed FOR UPDATE
});
my $findplanet = $dbh->prepare(q{SELECT planetid(?,?,?,?)});
-my $findoldplanet = $dbh->prepare(q{SELECT id FROM planet_stats WHERE x = $1 AND y = $2 AND z = $3 AND tick <= $4 ORDER BY tick DESC LIMIT 1});
+my $findoldplanet = $dbh->prepare(q{SELECT pid FROM planet_stats WHERE x = $1 AND y = $2 AND z = $3 AND tick <= $4 ORDER BY tick DESC LIMIT 1});
my $findcoords = $dbh->prepare(q{SELECT * FROM planetcoords(?,?)});
-my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,planet,tick,amount) VALUES(?,?,?,?,?) RETURNING fid});
+my $addfleet = $dbh->prepare(q{INSERT INTO fleets (name,mission,pid,tick,amount) VALUES(?,?,?,?,?) RETURNING fid});
my $fleetscan = $dbh->prepare(q{INSERT INTO fleet_scans (fid,id) VALUES(?,?)});
my $addintel = $dbh->prepare(q{INSERT INTO intel (name,mission,sender,target,tick,eta,back,amount,ingal,uid)
VALUES(?,?,?,?,?,?,?,?,?,-1) RETURNING id});
-my $intelscan = $dbh->prepare(q{INSERT INTO fleet_scans (intel,id) VALUES(?,?)});
+my $intelscan = $dbh->prepare(q{INSERT INTO intel_scans (intel,id) VALUES(?,?)});
my $addships = $dbh->prepare(q{INSERT INTO fleet_ships (fid,ship,amount) VALUES(?,?,?)});
my $addplanetscan = $dbh->prepare(q{INSERT INTO planet_scans
- (id,tick,planet,metal_roids,metal,crystal_roids,crystal,eonium_roids,eonium
+ (id,tick,pid,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});
+ my @values = ($scan->{id},$scan->{tick},$scan->{pid});
$file =~ s/(\d),(\d)/$1$2/g;
- while($file =~ m/"center">(Metal|Crystal|Eonium)\D+(\d+)\D+([\d,]+)/g){
+ while($file =~ m{"center">(Metal|Crystal|Eonium)</td>\D+(\d+)\D+([\d,]+)}g){
push @values,$2,$3;
}
if($file =~ m{Security\ Guards .+? "center">(\d+)</td>
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},$scan->{tick},$4);
+ my $id = addfleet($1,$2,$3,$scan->{pid},$scan->{tick},$4);
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
}
}
sub parse_unit {
my ($scan,$file) = @_;
- my $id = addfleet($scan->{type},'Full fleet',$file,$scan->{planet},$scan->{tick});
+ my $id = addfleet($scan->{type},'Full fleet',$file,$scan->{pid},$scan->{tick});
$fleetscan->execute($id,$scan->{id}) or die $dbh->errstr;
}
sub parse_jumpgate {
my ($scan,$file) = @_;
+ $file =~ s/,//g;
while ($file =~ m{(\d+):(\d+):(\d+)\D+(Attack|Defend|Return)</td><td class="left">([^<]*)\D+(\d+)\D+(\d+)}g){
my ($sender) = $dbh->selectrow_array($findplanet,undef,$1,$2,$3,$scan->{tick});
($sender) = $dbh->selectrow_array($findoldplanet,undef,$1,$2,$3,$scan->{tick})
if ((not defined $sender) && $4 eq 'Return');
- my $id = addintel($5,$4,$sender,$scan->{planet},$scan->{tick}+$6,$6
+ my $id = addintel($5,$4,$sender,$scan->{pid},$scan->{tick}+$6,$6
,undef,$7, $scan->{x} == $1 && $scan->{y} == $2);
$intelscan->execute($id,$scan->{id});
}
}
my $adddevscan = $dbh->prepare(q{INSERT INTO development_scans
- (id,tick,planet,light_fac,medium_fac,heavy_fac,amps,distorters
+ (id,tick,pid,light_fac,medium_fac,heavy_fac,amps,distorters
,metal_ref,crystal_ref,eonium_ref,reslabs,fincents,seccents
,travel,infra,hulls,waves,extraction,covert,mining,total)
VALUES(?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?,?)
next;
}
my ($planet) = $dbh->selectrow_array($findplanet,undef,$x,$y,$z,$tick);
- $scan->{planet} = $planet;
+ $scan->{pid} = $planet;
unless ($planet){
$dbh->pg_rollback_to('scans') or die "rollback didn't work";
if ( $x == 0 && $y == 0 && $z == 0 ){
my $text = $3;
my ($x,$y,$z) = $dbh->selectrow_array($findcoords,undef,$planet,$t);
die "No coords for: $planet tick $t" unless defined $x;
- if($news eq 'Launch' && $text =~ m/The (.*?) fleet has been launched, heading for (\d+):(\d+):(\d+), on a mission to (Attack|Defend). Arrival tick: (\d+)/g){
+ if($news eq 'Launch' && $text =~ m{The (.*?) fleet has been launched, heading for <a class="coords" href="galaxy.pl\?x=\d+&y=\d+">(\d+):(\d+):(\d+)</a>, on a mission to (Attack|Defend). Arrival tick: (\d+)}g){
my $eta = $6 - $t;
my $mission = $5;
my $back = $6 + $eta;
my $id = addintel($1,$mission,$planet,$target,$6
,$eta,$back,undef, ($x == $2 && $y == $3));
$intelscan->execute($id,$scan->{id});
- }elsif($news eq 'Incoming' && $text =~ m/We have detected an open jumpgate from (.*?), located at (\d+):(\d+):(\d+). The fleet will approach our system in tick (\d+) and appears to have roughly (\d+) ships/g){
+ }elsif($news eq 'Incoming' && $text =~ m{We have detected an open jumpgate from (.*?), located at <a class="coords" href="galaxy.pl\?x=\d+&y=\d+">(\d+):(\d+):(\d+)</a>. The fleet will approach our system in tick (\d+) and appears to have (\d+) visible ships}g){
my $eta = $5 - $t;
my $mission = '';
my $back = $5 + $eta;
#$dbh->rollback;
$dbh->commit;
-system 'killall','-USR1', 'irssi' if $parsedscans;
+system 'killall','-USR1', 'ndbot.pl' if $parsedscans;
sub addfleet {
my ($name,$mission,$ships,$sender,$tick,$amount) = @_;
my @ships;
my $total = 0;
+ $ships =~ s/,//g;
while(defined $ships && $ships =~ m{((?:[a-zA-Z]| )+)</td><td(?: class="right")?>(\d+)}sg){
$total += $2;
push @ships, [$1,$2];
projects / ndwebbie.git / blobdiff