beu/TrackManiaControl
1
0
Fork 0
Code Issues 10 Pull Requests Releases Wiki Activity

finished updatecommand

Browse Source
This commit is contained in:
kremsy 2014-01-15 20:40:14 +01:00 committed by Steffen Schröder
parent 7fa6a0beda
commit ffe3e0d2ef
4 changed files with 76 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
application/core/ManiaExchange/ManiaExchangeManager.php
View File

@ -89,16 +89,25 @@ class ManiaExchangeManager {
$saveMapStatement->close();
}
/**
* Unset Map by Mx Id
*
* @param $mxId
*/
public function unsetMap($mxId) {
unset($this->mxIdUidVector[$mxId]);
}
/**
* Fetch Map Information from Mania Exchange
*
* @param null $map
*/
public function fetchManiaExchangeMapInformations($map = null) {
if(!$map){
if(!$map) {
//Fetch Informations for whole Maplist
$maps = $this->maniaControl->mapManager->getMaps();
}else{
$maps = $this->maniaControl->mapManager->getMaps();
} else {
//Fetch Information for a single map
$maps[] = $map;
}

4
application/core/Manialinks/IconManager.php
View File

@ -108,7 +108,7 @@ class IconManager implements CallbackListener {
*
* @param string $login
*/
private function preloadIcons($login = false) {
public function preloadIcons($login = false) {
$maniaLink = new ManiaLink(self::PRELOAD_MLID);
$frame = new Frame();
$maniaLink->add($frame);
@ -125,4 +125,4 @@ class IconManager implements CallbackListener {
$manialinkText = $maniaLink->render()->saveXML();
$this->maniaControl->manialinkManager->sendManialink($manialinkText, $login);
}
}
}

1
application/core/Maps/Map.php
View File

@ -69,6 +69,7 @@ class Map {
* @return bool
*/
public function updateAvailable() {
if($this->mx != null && ($this->lastUpdate < strtotime($this->mx->updated) || $this->uid != $this->mx->uid)) {
return true;
} else {

75
application/core/Maps/MapManager.php
View File

@ -138,6 +138,32 @@ class MapManager implements CallbackListener {
return true;
}
/**
* Updates the Timestamp of a map
*
* @param $map
* @return bool
*/
private function updateMapTimestamp($uid) {
$mysqli = $this->maniaControl->database->mysqli;
$mapQuery = "UPDATE `" . self::TABLE_MAPS . "` SET mxid = 0, changed = NOW() WHERE 'uid' = ?";
$mapStatement = $mysqli->prepare($mapQuery);
if($mysqli->error) {
trigger_error($mysqli->error);
return false;
}
$mapStatement->bind_param('s', $uid);
$mapStatement->execute();
if($mapStatement->error) {
trigger_error($mapStatement->error);
$mapStatement->close();
return false;
}
$mapStatement->close();
return true;
}
/**
* Updates a Map from Mania Exchange
*
@ -146,8 +172,7 @@ class MapManager implements CallbackListener {
* @param $uid
*/
public function updateMap(Player $admin, $uid) {
return;
//TODO not finished yet
$this->updateMapTimestamp($uid);
$mapsDirectory = $this->maniaControl->server->getMapsDirectory();
if(!$this->maniaControl->server->checkAccess($mapsDirectory)) {
@ -158,8 +183,8 @@ class MapManager implements CallbackListener {
$map = $this->maps[$uid];
/** @var Map $map */
$mxId = $map->mx->id;
$this->removeMap($admin, $uid, true);
$this->addMapFromMx($mxId, $admin->login);
$this->removeMap($admin, $uid, true, false);
$this->addMapFromMx($mxId, $admin->login, true);
}
/**
@ -168,10 +193,15 @@ class MapManager implements CallbackListener {
* @param \ManiaControl\Players\Player $admin
* @param string $uid
* @param bool $eraseFile
* @param bool $message
*/
public function removeMap(Player $admin, $uid, $eraseFile = false) { //TODO erasefile?
public function removeMap(Player $admin, $uid, $eraseFile = false, $message = true) { //TODO erasefile?
$map = $this->maps[$uid];
//Unset the Map everywhere
$this->mapQueue->removeFromMapQueue($admin->login, $map->uid);
$this->mxManager->unsetMap($map->mx->id);
// Remove map
if(!$this->maniaControl->client->query('RemoveMap', $map->fileName)) {
trigger_error("Couldn't remove current map. " . $this->maniaControl->getClientErrorText());
@ -179,9 +209,13 @@ class MapManager implements CallbackListener {
return;
}
$message = '$<' . $admin->nickname . '$> removed $<' . $map->name . '$>!';
$this->maniaControl->chat->sendSuccess($message);
$this->maniaControl->log($message, true);
//Show Message
if($message) {
$message = '$<' . $admin->nickname . '$> removed $<' . $map->name . '$>!';
$this->maniaControl->chat->sendSuccess($message);
$this->maniaControl->log($message, true);
}
unset($this->maps[$uid]);
}
@ -429,10 +463,11 @@ class MapManager implements CallbackListener {
/**
* Adds a Map from Mania Exchange
*
* @param $mapId
* @param $login
* @param $mapId
* @param $login
* @param bool $update
*/
public function addMapFromMx($mapId, $login) {
public function addMapFromMx($mapId, $login, $update = false) {
// Check if ManiaControl can even write to the maps dir
if(!$this->maniaControl->client->query('GetMapsDirectory')) {
trigger_error("Couldn't get map directory. " . $this->maniaControl->getClientErrorText());
@ -515,15 +550,27 @@ class MapManager implements CallbackListener {
$this->maniaControl->chat->sendError("Couldn't add map to match settings!", $login);
return;
}
$this->maniaControl->chat->sendSuccess('Map $<' . $mapInfo->name . '$> added!');
$this->updateFullMapList();
//Update Mx MapInfo
$this->maniaControl->mapManager->mxManager->updateMapObjectsWithManiaExchangeIds($mxMapInfos);
// Queue requested Map
$this->maniaControl->mapManager->mapQueue->addMapToMapQueue($login, $mapInfo->uid);
//Update last updated time
$map = $this->maps[$mapInfo->uid];
/** @var Map $map */
$map->lastUpdate = time();
$player = $this->maniaControl->playerManager->getPlayer($login);
if(!$update) {
//Message
$this->maniaControl->chat->sendSuccess('$<' . $player->nickname . '$> added $<' . $mapInfo->name . '$>!');
// Queue requested Map
$this->maniaControl->mapManager->mapQueue->addMapToMapQueue($login, $mapInfo->uid);
} else {
$this->maniaControl->chat->sendSuccess('$<' . $player->nickname . '$> updated $<' . $mapInfo->name . '$>!');
}
}
// TODO: add local map by filename
}