attempt to fix TrueSkill update from api_game_result.php

Author: McLeopold

manager/add_maps_to_database.py

@@ -1,4 +1,4 @@
-#!/usr/bin/python
+#!/usr/bin/env python
 from __future__ import print_function
 import MySQLdb
 from server_info import server_info
@@ -103,9 +103,6 @@ def reset_submissions(status):
     conn.commit()
 
 def main():
-    reset_submissions()
-    
-if __name__ == '__main__':
     parser = argparse.ArgumentParser()
     parser.add_argument("-g", "--game_id", type=int,
                         help="game_id to update")
@@ -125,4 +122,8 @@ def main():
     elif args.reset:
         reset_submissions(args.reset)
     else:
-        parser.print_usage()
+        parser.print_usage()
+
+if __name__ == '__main__':
+    main()
+

manager/manager.py

@@ -9,6 +9,7 @@ $server_info = array(
     "mailer_name" => "AI Contest",
     "mailer_password" => "",
     "submissions_open" => True,
+    "repo_path" => "{repo_dir}",
     "uploads_path" => "{upload_dir}",
     "maps_path" => "{map_dir}",
     "replay_path" => "{replay_dir}",

setup/server_info.php.template

@@ -125,7 +125,7 @@ def setup_website(opts):
         si_template = si_file.read()
     si_contents = si_template.format(upload_dir=opts.upload_dir,
             map_dir=opts.map_dir, replay_dir=opts.replay_dir,
-            log_dir=opts.log_dir,
+            log_dir=opts.log_dir, repo_dir=opts.repo_dir,
             database_user=opts.database_user,
             database_password=opts.database_password,
             database_name=opts.database_name,

setup/server_setup.py

@@ -82,20 +82,22 @@
         // create pathname to replay file
         $replay_dir = $server_info["replay_path"] . "/" . strval((int) ($game_id / 1000000)) . "/" . strval((int) (($game_id / 1000) % 1000));
         if (!file_exists($replay_dir)) {
-            api_log($replay_dir);
+            api_log("Replay dir: " . $replay_dir);
             mkdir($replay_dir, 0775, true);
         }
         $replay_filename = $replay_dir . "/" . $game_id . ".replay";
-        api_log($replay_filename);
+        api_log("Replay file: " . $replay_filename);
         try {
-            api_log(getcwd());
+            api_log("Cwd: " . getcwd());
             $replay_file = fopen($replay_filename, 'w') or api_log(json_encode(error_get_last()));
             fwrite($replay_file, json_encode($gamedata));
             fclose($replay_file);
             echo json_encode(array( "hash" => $json_hash ));
             // mysql_query("COMMIT;");
             // update trueskill
-            exec(sprintf("python ../manager/manager.py -g %s", $game_id));
+            $cmd = "python " . $server_info["repo_path"] . "/manager/manager.py -g " . $game_id;
+            api_log("TrueSkill update cmd: " . $cmd);
+            exec($cmd);
             // put game id in memcache for front page
             if ($memcache) {
                 $memcache->set('last_game_id', $game_id);