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

Made update to make sure not to timeout on MX request onInit

Browse Source
This commit is contained in:
Max Klaversma 2014-04-19 13:04:30 +02:00 committed by Steffen Schröder
parent 2603325d2a
commit 51f8fd8e22
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -79,6 +79,7 @@ class MapManager implements CallbackListener {
// Register for callbacks // Register for callbacks
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'handleOnInit'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_ONINIT, $this, 'handleOnInit');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_AFTERINIT, $this, 'handleAfterInit');
$this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MAPLISTMODIFIED, $this, 'mapsModified'); $this->maniaControl->callbackManager->registerCallbackListener(CallbackManager::CB_MP_MAPLISTMODIFIED, $this, 'mapsModified');
// Define Rights // Define Rights
@ -353,7 +354,7 @@ class MapManager implements CallbackListener {
$map = new Map($rpcMap); $map = new Map($rpcMap);
$this->saveMap($map); $this->saveMap($map);
$mapsDirectory = $this->maniaControl->server->getMapsDirectory(); /*$mapsDirectory = $this->maniaControl->server->getMapsDirectory();
if (is_readable($mapsDirectory . $map->fileName)) { if (is_readable($mapsDirectory . $map->fileName)) {
$mapFetcher = new \GBXChallMapFetcher(true); $mapFetcher = new \GBXChallMapFetcher(true);
$mapFetcher->processFile($mapsDirectory . $map->fileName); $mapFetcher->processFile($mapsDirectory . $map->fileName);
@ -361,7 +362,7 @@ class MapManager implements CallbackListener {
$map->authorEInfo = $mapFetcher->authorEInfo; $map->authorEInfo = $mapFetcher->authorEInfo;
$map->authorZone = $mapFetcher->authorZone; $map->authorZone = $mapFetcher->authorZone;
$map->comment = $mapFetcher->comment; $map->comment = $mapFetcher->comment;
} }*/
return $map; return $map;
} }
@ -369,9 +370,8 @@ class MapManager implements CallbackListener {
* Updates the full Map list, needed on Init, addMap and on ShuffleMaps * Updates the full Map list, needed on Init, addMap and on ShuffleMaps
*/ */
private function updateFullMapList() { private function updateFullMapList() {
$maps = $this->maniaControl->client->getMapList(100, 0); $maps = $this->maniaControl->client->getMapList(1000, 0);
$tempList = array(); $tempList = array();
foreach ($maps as $rpcMap) { foreach ($maps as $rpcMap) {
if (array_key_exists($rpcMap->uId, $this->maps)) { if (array_key_exists($rpcMap->uId, $this->maps)) {
// Map already exists, only update index // Map already exists, only update index
@ -432,13 +432,18 @@ class MapManager implements CallbackListener {
$this->updateFullMapList(); $this->updateFullMapList();
$this->fetchCurrentMap(); $this->fetchCurrentMap();
// Fetch Mx Infos
$this->mxManager->fetchManiaExchangeMapInformations();
// Restructure Maplist // Restructure Maplist
$this->restructureMapList(); $this->restructureMapList();
} }
/**
* Handle AfterInit callback
*/
public function handleAfterInit() {
// Fetch MX infos
$this->mxManager->fetchManiaExchangeMapInformations();
}
/** /**
* Get Current Map * Get Current Map
* *