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

Merge pull request #5 from jonthekiller/jonthekiller-patch-7

Browse Source 
Performance improvments
This commit is contained in:
jonthekiller 2020-08-02 18:26:54 +02:00 committed by GitHub
commit 4d6d2b49a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 70 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

82
plugins/MCTeam/LocalRecordsPlugin.php
View File

@ -43,7 +43,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
* Constants * Constants
*/ */
const ID = 7; const ID = 7;
const VERSION = 0.82; const VERSION = 0.83;
const NAME = 'Local Records Plugin'; const NAME = 'Local Records Plugin';
const AUTHOR = 'MCTeam'; const AUTHOR = 'MCTeam';
const MLID_RECORDS = 'ml_local_records'; const MLID_RECORDS = 'ml_local_records';
@ -78,6 +78,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
private $updateManialink = false; private $updateManialink = false;
private $checkpoints = array(); private $checkpoints = array();
private $scriptName = 'TimeAttack'; private $scriptName = 'TimeAttack';
private $mapranking = array();
/** /**
* @see \ManiaControl\Plugins\Plugin::prepare() * @see \ManiaControl\Plugins\Plugin::prepare()
@ -160,7 +161,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
$this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_MULTILAP_SAVE_SINGLE, false); $this->maniaControl->getSettingManager()->initSetting($this, self::SETTING_MULTILAP_SAVE_SINGLE, false);
// Callbacks // Callbacks
$this->maniaControl->getTimerManager()->registerTimerListening($this, 'handle1Second', 1000); $this->maniaControl->getTimerManager()->registerTimerListening($this, 'handle2Seconds', 2000);
$this->maniaControl->getTimerManager()->registerTimerListening($this, 'handle1Minute', 60000); $this->maniaControl->getTimerManager()->registerTimerListening($this, 'handle1Minute', 60000);
$this->maniaControl->getCallbackManager()->registerCallbackListener(Callbacks::AFTERINIT, $this, 'handleAfterInit'); $this->maniaControl->getCallbackManager()->registerCallbackListener(Callbacks::AFTERINIT, $this, 'handleAfterInit');
@ -226,21 +227,23 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
* @internal * @internal
*/ */
public function handleAfterInit() { public function handleAfterInit() {
$this->updateMapRanking();
$this->updateManialink = true; $this->updateManialink = true;
} }
/** /**
* Handle 1 Second Callback * Handle 2 Seconds Callback
* *
* @internal * @internal
*/ */
public function handle1Second() { public function handle2Seconds() {
if (!$this->updateManialink) { if (!$this->updateManialink) {
return; return;
} }
$this->updateManialink = false; $this->updateManialink = false;
if ($this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_WIDGET_ENABLE)) { if ($this->maniaControl->getSettingManager()->getSettingValue($this, self::SETTING_WIDGET_ENABLE)) {
$this->updateMapRanking();
$this->sendWidgetManiaLink(); $this->sendWidgetManiaLink();
} }
} }
@ -276,7 +279,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
$quadStyle = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultQuadStyle(); $quadStyle = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultQuadStyle();
$quadSubstyle = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultQuadSubstyle(); $quadSubstyle = $this->maniaControl->getManialinkManager()->getStyleManager()->getDefaultQuadSubstyle();
$records = $this->getLocalRecords($map, 1000); //TODO limit setting $records = $this->mapranking;
if (!is_array($records)) { if (!is_array($records)) {
Logger::logError("Couldn't fetch player records."); Logger::logError("Couldn't fetch player records.");
return null; return null;
@ -351,7 +354,7 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
$playersWithoutRecord[] = $player; $playersWithoutRecord[] = $player;
$sendManiaLink = false; $sendManiaLink = false;
} else { } else {
if ($record = $this->getLocalRecord($map, $player)) { if ($record = $this->getLocalRecordCache($map, $player)) {
$record->nickname = $player->nickname; $record->nickname = $player->nickname;
$recordFrame = $preGeneratedRecordsFrameWithRecord; $recordFrame = $preGeneratedRecordsFrameWithRecord;
$listFrame->addChild($recordFrame); $listFrame->addChild($recordFrame);
@ -401,21 +404,23 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
public function getLocalRecords(Map $map, $limit = -1) { public function getLocalRecords(Map $map, $limit = -1) {
$mysqli = $this->maniaControl->getDatabase()->getMysqli(); $mysqli = $this->maniaControl->getDatabase()->getMysqli();
$limit = ($limit > 0 ? 'LIMIT ' . $limit : ''); $limit = ($limit > 0 ? 'LIMIT ' . $limit : '');
$query = "SELECT * FROM ( $query = "SELECT * FROM `" . self::TABLE_RECORDS . "` recs
SELECT recs.*, @rank := @rank + 1 as `rank` FROM `" . self::TABLE_RECORDS . "` recs, (SELECT @rank := 0) ra LEFT JOIN `" . PlayerManager::TABLE_PLAYERS . "` players
ON recs.`playerIndex` = players.`index`
WHERE recs.`mapIndex` = {$map->index} WHERE recs.`mapIndex` = {$map->index}
ORDER BY recs.`time` ASC ORDER BY recs.`time` ASC
{$limit}) records {$limit};";
LEFT JOIN `" . PlayerManager::TABLE_PLAYERS . "` players
ON records.`playerIndex` = players.`index`;";
$result = $mysqli->query($query); $result = $mysqli->query($query);
if ($mysqli->error) { if ($mysqli->error) {
trigger_error($mysqli->error); trigger_error($mysqli->error);
return null; return null;
} }
$records = array(); $records = array();
$rank = 1;
while ($record = $result->fetch_object()) { while ($record = $result->fetch_object()) {
$record->{"rank"} = "$rank";
array_push($records, $record); array_push($records, $record);
$rank++;
} }
$result->free(); $result->free();
return $records; return $records;
@ -664,6 +669,30 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
return $record; return $record;
} }
/**
* Retrieve the local record for the given map and login using the Cache
*
* @param Player $player
* @param Map $map
* @return mixed
* @api
*/
public function getLocalRecordCache(Map $map, Player $player) {
$searchedValue = $player->index;
$record = array_filter($this->mapranking, function ($e) use ($searchedValue) {
return $e->index == $searchedValue;
});
if (isset($record)) {
if (isset($record[0])) {
$record = $record[0];
} else {
$record = null;
}
}
return $record;
}
/** /**
* Handle Player Connect Callback * Handle Player Connect Callback
* *
@ -989,4 +1018,33 @@ class LocalRecordsPlugin implements CallbackListener, CallQueueListener, Command
$this->recordWidget->setLineHeight($lineHeight); $this->recordWidget->setLineHeight($lineHeight);
$this->updateManialink = true; $this->updateManialink = true;
} }
}
/**
* Update the Map Ranking
*/
private function updateMapRanking() {
$mysqli = $this->maniaControl->getDatabase()->getMysqli();
$map = $this->maniaControl->getMapManager()->getCurrentMap();
$query = "SELECT players.nickname, players.`index`, recs.time, recs.`index`, recs.playerIndex, recs.mapIndex FROM `" . self::TABLE_RECORDS . "` recs
LEFT JOIN `" . PlayerManager::TABLE_PLAYERS . "` players
ON recs.`playerIndex` = players.`index`
WHERE recs.`mapIndex` = {$map->index}
ORDER BY recs.`time` ASC;";
$result = $mysqli->query($query);
if ($mysqli->error) {
trigger_error($mysqli->error);
return null;
}
$this->mapranking = array();
$rank = 1;
while ($record = $result->fetch_object()) {
$record->{"rank"} = "$rank";
array_push($this->mapranking, $record);
$rank++;
}
$result->free();
}
}