X-Git-Url: https://ruin.nu/git/?a=blobdiff_plain;f=scripts%2Ffetchdumps.pl;h=71c0c2b88c350c5eae4f48c88e309e885383d610;hb=f3cd955b85092ea418d9c1de90be49c9f598527f;hp=efd124afc154c7688472c4e6219dab2ecace08e0;hpb=c643b311c8f134a59625192b900aa28b3f12d4f1;p=ndwebbie.git

diff --git a/scripts/fetchdumps.pl b/scripts/fetchdumps.pl
index efd124a..71c0c2b 100755
--- a/scripts/fetchdumps.pl
+++ b/scripts/fetchdumps.pl
@@ -22,22 +22,20 @@ q{
 
 use strict;
 use warnings;
+use local::lib;
 use DBI;
 use DBD::Pg qw(:pg_types);
 
-use LWP::Simple;
+use LWP::Simple qw/head get $ua/;
+$ua->agent("Stupid user agent check is stupid");
+
+use FindBin;
+use lib "$FindBin::Bin/../lib";
+
+use ND::DB;
+
+our $dbh = ND::DB::DB();
 
-$0 =~ /(.*\/)[^\/]/;
-my $dir = $1;
-our $dbh;
-for my $file ("/home/whale/db.pl")
-{
-	unless (my $return = do $file){
-		warn "couldn't parse $file: $@" if $@;
-		warn "couldn't do $file: $!"    unless defined $return;
-		warn "couldn't run $file"       unless $return;
-	}
-}
 $dbh->do("SET CLIENT_ENCODING TO 'LATIN1';");
 
 my $insert = $dbh->prepare("INSERT INTO dumps(tick,type,modified,dump) VALUES(?,?,?,?)");
@@ -48,7 +46,7 @@ for my $type ("planet","alliance","galaxy"){
 	$select->execute($type,$head[2]);
 	unless ($select->fetchrow){
 		my $file = get("http://game.planetarion.com/botfiles/${type}_listing.txt");
-		if ($file =~ /Tick: (\d+)/){
+		if (defined $file && $file =~ /Tick: (\d+)/){
 			$updated = $1;
 			$insert->execute($1,$type,$head[2],$file);
 		}
@@ -57,9 +55,11 @@ for my $type ("planet","alliance","galaxy"){
 }
 
 if ($updated){
-	`${dir}parsedumps.pl $updated`;
-	`${dir}ndrank.pl`;
-	$dbh->do("UPDATE misc SET value = ? WHERE id = 'TICK'", undef, $updated);
+	system("$FindBin::Bin/parsetick.sh", $updated);
+	system("$FindBin::Bin/ndrank.pl");
+	$dbh->do(q{UPDATE misc SET value = ? WHERE id = 'TICK'}, undef, $updated);
+	system 'killall','-USR1', 'ndbot.pl';
+	local $dbh->{Warn} = 0;
 }