use command line helper
This commit is contained in:
parent
01a6b37c6d
commit
0f4281f415
@ -6,25 +6,29 @@ use ManiaControl\Callbacks\CallbackListener;
|
|||||||
use ManiaControl\Callbacks\CallbackManager;
|
use ManiaControl\Callbacks\CallbackManager;
|
||||||
use ManiaControl\ManiaControl;
|
use ManiaControl\ManiaControl;
|
||||||
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
|
use Maniaplanet\DedicatedServer\Xmlrpc\Exception;
|
||||||
|
use ManiaControl\CommandLineHelper;
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Class providing Access to the connected ManiaPlanet Server
|
* Class providing Access to the connected ManiaPlanet Server
|
||||||
*
|
*
|
||||||
* @author steeffeen & kremsy
|
* @author steeffeen & kremsy
|
||||||
* @copyright ManiaControl Copyright © 2014 ManiaControl Team
|
* @copyright ManiaControl Copyright © 2014 ManiaControl Team
|
||||||
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
|
* @license http://www.gnu.org/licenses/ GNU General Public License, Version 3
|
||||||
*/
|
*/
|
||||||
class Server implements CallbackListener {
|
class Server implements CallbackListener {
|
||||||
/*
|
/*
|
||||||
* Constants
|
* Constants
|
||||||
*/
|
*/
|
||||||
const TABLE_SERVERS = 'mc_servers';
|
const TABLE_SERVERS = 'mc_servers';
|
||||||
const CB_TEAM_MODE_CHANGED = 'ServerCallback.TeamModeChanged';
|
const CB_TEAM_MODE_CHANGED = 'ServerCallback.TeamModeChanged';
|
||||||
|
|
||||||
/*
|
/*
|
||||||
* Public Properties
|
* Public Properties
|
||||||
*/
|
*/
|
||||||
/** @var Config $config */
|
/**
|
||||||
|
*
|
||||||
|
* @var Config $config
|
||||||
|
*/
|
||||||
public $config = null;
|
public $config = null;
|
||||||
public $index = -1;
|
public $index = -1;
|
||||||
public $ip = null;
|
public $ip = null;
|
||||||
@ -53,7 +57,7 @@ class Server implements CallbackListener {
|
|||||||
$this->initTables();
|
$this->initTables();
|
||||||
|
|
||||||
$this->serverCommands = new ServerCommands($maniaControl);
|
$this->serverCommands = new ServerCommands($maniaControl);
|
||||||
$this->usageReporter = new UsageReporter($maniaControl);
|
$this->usageReporter = new UsageReporter($maniaControl);
|
||||||
$this->rankingManager = new RankingManager($maniaControl);
|
$this->rankingManager = new RankingManager($maniaControl);
|
||||||
|
|
||||||
// Register for callbacks
|
// Register for callbacks
|
||||||
@ -64,69 +68,68 @@ class Server implements CallbackListener {
|
|||||||
* Load the Server Configuration from the Config XML
|
* Load the Server Configuration from the Config XML
|
||||||
*/
|
*/
|
||||||
public function loadConfig() {
|
public function loadConfig() {
|
||||||
if (!$this->maniaControl->config) {
|
// Server id parameter
|
||||||
trigger_error('Error loading Server Config!', E_USER_ERROR);
|
$serverId = CommandLineHelper::getParameter('-id');
|
||||||
}
|
|
||||||
|
|
||||||
// Config id
|
|
||||||
$id = null;
|
|
||||||
global $argv;
|
|
||||||
foreach($argv as $arg) {
|
|
||||||
$parts = explode('=', $arg);
|
|
||||||
if (count($parts) < 2)
|
|
||||||
continue;
|
|
||||||
if ($parts[0] != '-id')
|
|
||||||
continue;
|
|
||||||
$id = $parts[1];
|
|
||||||
break;
|
|
||||||
}
|
|
||||||
|
|
||||||
// Xml server tag with given id
|
// Xml server tag with given id
|
||||||
$serverTag = null;
|
$serverTag = null;
|
||||||
if ($id) {
|
if ($serverId) {
|
||||||
$serverTags = $this->maniaControl->config->xpath("server[@id='{$id}']");
|
$serverTags = $this->maniaControl->config->xpath("server[@id='{$serverId}']");
|
||||||
if ($serverTags)
|
if ($serverTags) {
|
||||||
$serverTag = $serverTags[0];
|
$serverTag = $serverTags[0];
|
||||||
if (!$serverTag)
|
}
|
||||||
trigger_error("No Server configured with the ID '{$id}'!", E_USER_ERROR);
|
if (!$serverTag) {
|
||||||
} else {
|
trigger_error("No Server configured with the ID '{$serverId}'!", E_USER_ERROR);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else {
|
||||||
$serverTags = $this->maniaControl->config->xpath('server');
|
$serverTags = $this->maniaControl->config->xpath('server');
|
||||||
if ($serverTags)
|
if ($serverTags) {
|
||||||
$serverTag = $serverTags[0];
|
$serverTag = $serverTags[0];
|
||||||
if (!$serverTag)
|
}
|
||||||
|
if (!$serverTag) {
|
||||||
trigger_error('No Server configured!', E_USER_ERROR);
|
trigger_error('No Server configured!', E_USER_ERROR);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// Host
|
// Host
|
||||||
$host = $serverTag->xpath('host');
|
$host = $serverTag->xpath('host');
|
||||||
if ($host)
|
if ($host) {
|
||||||
$host = (string)$host[0];
|
$host = (string) $host[0];
|
||||||
if (!$host)
|
}
|
||||||
|
if (!$host) {
|
||||||
trigger_error("Invalid server configuration (host).", E_USER_ERROR);
|
trigger_error("Invalid server configuration (host).", E_USER_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
// Port
|
// Port
|
||||||
$port = $serverTag->xpath('port');
|
$port = $serverTag->xpath('port');
|
||||||
if ($port)
|
if ($port) {
|
||||||
$port = (string)$port[0];
|
$port = (string) $port[0];
|
||||||
if (!$port)
|
}
|
||||||
|
if (!$port) {
|
||||||
trigger_error("Invalid server configuration (port).", E_USER_ERROR);
|
trigger_error("Invalid server configuration (port).", E_USER_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
// Login
|
// Login
|
||||||
$login = $serverTag->xpath('login');
|
$login = $serverTag->xpath('login');
|
||||||
if ($login)
|
if ($login) {
|
||||||
$login = (string)$login[0];
|
$login = (string) $login[0];
|
||||||
if (!$login)
|
}
|
||||||
|
if (!$login) {
|
||||||
trigger_error("Invalid server configuration (login).", E_USER_ERROR);
|
trigger_error("Invalid server configuration (login).", E_USER_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
// Pass
|
// Password
|
||||||
$pass = $serverTag->xpath('pass');
|
$pass = $serverTag->xpath('pass');
|
||||||
if ($pass)
|
if ($pass) {
|
||||||
$pass = (string)$pass[0];
|
$pass = (string) $pass[0];
|
||||||
if (!$pass)
|
}
|
||||||
|
if (!$pass) {
|
||||||
trigger_error("Invalid server configuration (password).", E_USER_ERROR);
|
trigger_error("Invalid server configuration (password).", E_USER_ERROR);
|
||||||
|
}
|
||||||
|
|
||||||
// Create config object
|
// Create config object
|
||||||
$this->config = new Config($id, $host, $port, $login, $pass);
|
$this->config = new Config($serverId, $host, $port, $login, $pass);
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
@ -134,16 +137,16 @@ class Server implements CallbackListener {
|
|||||||
*/
|
*/
|
||||||
private function updateProperties() {
|
private function updateProperties() {
|
||||||
// System info
|
// System info
|
||||||
$systemInfo = $this->maniaControl->client->getSystemInfo();
|
$systemInfo = $this->maniaControl->client->getSystemInfo();
|
||||||
$this->ip = $systemInfo->publishedIp;
|
$this->ip = $systemInfo->publishedIp;
|
||||||
$this->port = $systemInfo->port;
|
$this->port = $systemInfo->port;
|
||||||
$this->p2pPort = $systemInfo->p2PPort;
|
$this->p2pPort = $systemInfo->p2PPort;
|
||||||
$this->login = $systemInfo->serverLogin;
|
$this->login = $systemInfo->serverLogin;
|
||||||
$this->titleId = $systemInfo->titleId;
|
$this->titleId = $systemInfo->titleId;
|
||||||
|
|
||||||
// Database index
|
// Database index
|
||||||
$mysqli = $this->maniaControl->database->mysqli;
|
$mysqli = $this->maniaControl->database->mysqli;
|
||||||
$query = "INSERT INTO `" . self::TABLE_SERVERS . "` (
|
$query = "INSERT INTO `" . self::TABLE_SERVERS . "` (
|
||||||
`login`
|
`login`
|
||||||
) VALUES (
|
) VALUES (
|
||||||
?
|
?
|
||||||
@ -171,8 +174,8 @@ class Server implements CallbackListener {
|
|||||||
* @return bool
|
* @return bool
|
||||||
*/
|
*/
|
||||||
private function initTables() {
|
private function initTables() {
|
||||||
$mysqli = $this->maniaControl->database->mysqli;
|
$mysqli = $this->maniaControl->database->mysqli;
|
||||||
$query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SERVERS . "` (
|
$query = "CREATE TABLE IF NOT EXISTS `" . self::TABLE_SERVERS . "` (
|
||||||
`index` int(11) NOT NULL AUTO_INCREMENT,
|
`index` int(11) NOT NULL AUTO_INCREMENT,
|
||||||
`login` varchar(100) NOT NULL,
|
`login` varchar(100) NOT NULL,
|
||||||
PRIMARY KEY (`index`),
|
PRIMARY KEY (`index`),
|
||||||
@ -199,7 +202,7 @@ class Server implements CallbackListener {
|
|||||||
*/
|
*/
|
||||||
public function getAllServers() {
|
public function getAllServers() {
|
||||||
$mysqli = $this->maniaControl->database->mysqli;
|
$mysqli = $this->maniaControl->database->mysqli;
|
||||||
$query = "SELECT * FROM `" . self::TABLE_SERVERS . "`";
|
$query = "SELECT * FROM `" . self::TABLE_SERVERS . "`";
|
||||||
$result = $mysqli->query($query);
|
$result = $mysqli->query($query);
|
||||||
if (!$result) {
|
if (!$result) {
|
||||||
trigger_error($mysqli->error);
|
trigger_error($mysqli->error);
|
||||||
@ -207,7 +210,7 @@ class Server implements CallbackListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
$servers = array();
|
$servers = array();
|
||||||
while($row = $result->fetch_object()) {
|
while ($row = $result->fetch_object()) {
|
||||||
array_push($servers, $row);
|
array_push($servers, $row);
|
||||||
}
|
}
|
||||||
$result->close();
|
$result->close();
|
||||||
@ -228,7 +231,7 @@ class Server implements CallbackListener {
|
|||||||
* @param bool $teamMode
|
* @param bool $teamMode
|
||||||
*/
|
*/
|
||||||
public function setTeamMode($teamMode = true) {
|
public function setTeamMode($teamMode = true) {
|
||||||
$oldStatus = $this->teamMode;
|
$oldStatus = $this->teamMode;
|
||||||
$this->teamMode = $teamMode;
|
$this->teamMode = $teamMode;
|
||||||
|
|
||||||
// Trigger callback
|
// Trigger callback
|
||||||
@ -297,17 +300,18 @@ class Server implements CallbackListener {
|
|||||||
* Fetch current Game Mode
|
* Fetch current Game Mode
|
||||||
*
|
*
|
||||||
* @param bool $stringValue
|
* @param bool $stringValue
|
||||||
* @param int $parseValue
|
* @param int $parseValue
|
||||||
* @return int | string
|
* @return int | string
|
||||||
*/
|
*/
|
||||||
public function getGameMode($stringValue = false, $parseValue = null) {
|
public function getGameMode($stringValue = false, $parseValue = null) {
|
||||||
if (is_int($parseValue)) {
|
if (is_int($parseValue)) {
|
||||||
$gameMode = $parseValue;
|
$gameMode = $parseValue;
|
||||||
} else {
|
}
|
||||||
|
else {
|
||||||
$gameMode = $this->maniaControl->client->getGameMode();
|
$gameMode = $this->maniaControl->client->getGameMode();
|
||||||
}
|
}
|
||||||
if ($stringValue) {
|
if ($stringValue) {
|
||||||
switch($gameMode) {
|
switch ($gameMode) {
|
||||||
case 0:
|
case 0:
|
||||||
return 'Script';
|
return 'Script';
|
||||||
case 1:
|
case 1:
|
||||||
@ -338,8 +342,9 @@ class Server implements CallbackListener {
|
|||||||
public function getValidationReplay($login) {
|
public function getValidationReplay($login) {
|
||||||
try {
|
try {
|
||||||
$replay = $this->maniaControl->client->getValidationReplay($login);
|
$replay = $this->maniaControl->client->getValidationReplay($login);
|
||||||
} catch(Exception $e) {
|
}
|
||||||
//TODO temp added 19.04.2014
|
catch (Exception $e) {
|
||||||
|
// TODO temp added 19.04.2014
|
||||||
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 330 Server.php" . $e->getMessage());
|
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 330 Server.php" . $e->getMessage());
|
||||||
|
|
||||||
trigger_error("Couldn't get validation replay of '{$login}'. " . $e->getMessage());
|
trigger_error("Couldn't get validation replay of '{$login}'. " . $e->getMessage());
|
||||||
@ -361,16 +366,17 @@ class Server implements CallbackListener {
|
|||||||
}
|
}
|
||||||
|
|
||||||
// Build file name
|
// Build file name
|
||||||
$map = $this->maniaControl->mapManager->getCurrentMap();
|
$map = $this->maniaControl->mapManager->getCurrentMap();
|
||||||
$gameMode = $this->getGameMode();
|
$gameMode = $this->getGameMode();
|
||||||
$time = time();
|
$time = time();
|
||||||
$fileName = "GhostReplays/Ghost.{$login}.{$gameMode}.{$time}.{$map->uid}.Replay.Gbx";
|
$fileName = "GhostReplays/Ghost.{$login}.{$gameMode}.{$time}.{$map->uid}.Replay.Gbx";
|
||||||
|
|
||||||
// Save ghost replay
|
// Save ghost replay
|
||||||
try {
|
try {
|
||||||
$this->maniaControl->client->saveBestGhostsReplay($login, $fileName);
|
$this->maniaControl->client->saveBestGhostsReplay($login, $fileName);
|
||||||
} catch(Exception $e) {
|
}
|
||||||
//TODO temp added 19.04.2014
|
catch (Exception $e) {
|
||||||
|
// TODO temp added 19.04.2014
|
||||||
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 360 Server.php" . $e->getMessage());
|
$this->maniaControl->errorHandler->triggerDebugNotice("Exception line 360 Server.php" . $e->getMessage());
|
||||||
|
|
||||||
trigger_error("Couldn't save ghost replay. " . $e->getMessage());
|
trigger_error("Couldn't save ghost replay. " . $e->getMessage());
|
||||||
@ -399,12 +405,12 @@ class Server implements CallbackListener {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
// Server not yet in given status - Wait for it...
|
// Server not yet in given status - Wait for it...
|
||||||
$waitBegin = time();
|
$waitBegin = time();
|
||||||
$maxWaitTime = 50;
|
$maxWaitTime = 50;
|
||||||
$lastStatus = $response->name;
|
$lastStatus = $response->name;
|
||||||
$this->maniaControl->log("Waiting for server to reach status {$statusCode}...");
|
$this->maniaControl->log("Waiting for server to reach status {$statusCode}...");
|
||||||
$this->maniaControl->log("Current Status: {$lastStatus}");
|
$this->maniaControl->log("Current Status: {$lastStatus}");
|
||||||
while($response->code !== 4) {
|
while ($response->code !== 4) {
|
||||||
sleep(1);
|
sleep(1);
|
||||||
$response = $this->maniaControl->client->getStatus();
|
$response = $this->maniaControl->client->getStatus();
|
||||||
if ($lastStatus !== $response->name) {
|
if ($lastStatus !== $response->name) {
|
||||||
|
Loading…
x
Reference in New Issue
Block a user