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

Plugins can now be installed via the settings UI.

Browse Source
This commit is contained in:
Max Klaversma 2014-04-16 22:53:14 +02:00 committed by Steffen Schröder
parent 9d345d1b9e
commit 5b884d7a9c
3 changed files with 108 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
application/core/Plugins/PluginManager.php
View File

@ -119,6 +119,7 @@ class PluginManager {
return false; return false;
} }
array_push($this->pluginClasses, $pluginClass); array_push($this->pluginClasses, $pluginClass);
sort($this->pluginClasses);
return true; return true;
} }
@ -221,7 +222,7 @@ class PluginManager {
* *
* @param string $directory * @param string $directory
*/ */
private function loadPluginFiles($directory = '') { public function loadPluginFiles($directory = '') {
$pluginFiles = scandir($directory); $pluginFiles = scandir($directory);
foreach($pluginFiles as $pluginFile) { foreach($pluginFiles as $pluginFile) {
if (stripos($pluginFile, '.') === 0) { if (stripos($pluginFile, '.') === 0) {
@ -315,7 +316,7 @@ class PluginManager {
* @param string $className * @param string $className
* @return bool * @return bool
*/ */
private function getSavedPluginStatus($className) { public function getSavedPluginStatus($className) {
$mysqli = $this->maniaControl->database->mysqli; $mysqli = $this->maniaControl->database->mysqli;
$pluginStatusQuery = "SELECT `active` FROM `" . self::TABLE_PLUGINS . "` $pluginStatusQuery = "SELECT `active` FROM `" . self::TABLE_PLUGINS . "`
WHERE `className` = ?;"; WHERE `className` = ?;";

138
application/core/Update/UpdateManager.php
View File

@ -75,7 +75,6 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
$this->maniaControl->commandManager->registerCommandListener('checkupdate', $this, 'handle_CheckUpdate', true); $this->maniaControl->commandManager->registerCommandListener('checkupdate', $this, 'handle_CheckUpdate', true);
$this->maniaControl->commandManager->registerCommandListener('coreupdate', $this, 'handle_CoreUpdate', true); $this->maniaControl->commandManager->registerCommandListener('coreupdate', $this, 'handle_CoreUpdate', true);
$this->maniaControl->commandManager->registerCommandListener('pluginupdate', $this, 'handle_PluginUpdate', true); $this->maniaControl->commandManager->registerCommandListener('pluginupdate', $this, 'handle_PluginUpdate', true);
$this->maniaControl->commandManager->registerCommandListener('pluginlist', $this, 'handle_PluginList', true);
$this->currentBuildDate = $this->getNightlyBuildDate(); $this->currentBuildDate = $this->getNightlyBuildDate();
@ -247,6 +246,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
public function handleManialinkPageAnswer(array $callback) { public function handleManialinkPageAnswer(array $callback) {
$actionId = $callback[1][2]; $actionId = $callback[1][2];
$update = (strpos($actionId, PluginMenu::ACTION_PREFIX_UPDATEPLUGIN) === 0); $update = (strpos($actionId, PluginMenu::ACTION_PREFIX_UPDATEPLUGIN) === 0);
$install = (strpos($actionId, PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN) === 0);
$login = $callback[1][1]; $login = $callback[1][1];
$player = $this->maniaControl->playerManager->getPlayer($login); $player = $this->maniaControl->playerManager->getPlayer($login);
@ -263,6 +263,18 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
} }
} }
} }
if($install) {
$pluginId = substr($actionId, strlen(PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN));
$url = ManiaControl::URL_WEBSERVICE . 'plugins?id=' . $pluginId;
$dataJson = FileUtil::loadFile($url);
$pluginVersions = json_decode($dataJson);
if ($pluginVersions && isset($pluginVersions[0])) {
$pluginData = $pluginVersions[0];
$this->installPlugin($pluginData, $player, true);
}
}
} }
/** /**
@ -351,39 +363,6 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
$this->checkPluginsUpdate($player); $this->checkPluginsUpdate($player);
} }
/**
* Handle //pluginlist command
*
* @param array $chatCallback
* @param Player $player
*/
public function handle_PluginList(array $chatCallback, Player $player) {
if (!$this->maniaControl->authenticationManager->checkPermission($player, self::SETTING_PERMISSION_UPDATE)) {
$this->maniaControl->authenticationManager->sendNotAllowed($player);
return;
}
$url = ManiaControl::URL_WEBSERVICE . 'plugins';
$dataJson = FileUtil::loadFile($url);
$pluginList = json_decode($dataJson);
if (!$pluginList || !isset($pluginList[0])) {
$this->maniaControl->chat->sendInformation('Pluginlist could not be retrieved from the Web Services!', $player->login);
}
$pluginClasses = $this->maniaControl->pluginManager->getPluginClasses();
$pluginIds = array();
/** @var Plugin $class */
foreach($pluginClasses as $class) {
$pluginIds[] = $class::getId();
}
foreach($pluginList as $plugin) {
if(!in_array($plugin->id, $pluginIds)) {
$this->maniaControl->chat->sendInformation($plugin->name.' (v'.$plugin->currentVersion->version.') - '.$plugin->description, $player->login);
}
}
}
/** /**
* Checks if there are outdated plugins active. * Checks if there are outdated plugins active.
* @param Player $player * @param Player $player
@ -536,6 +515,97 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
}); });
} }
/**
* Update pluginfile
*
* @param $pluginData
* @param Player $player
* @param bool $reopen
*/
private function installPlugin($pluginData, Player $player, $reopen = false) {
$this->maniaControl->fileReader->loadFile($pluginData->currentVersion->url, function ($installFileContent, $error) use (&$updateData, &$player, &$pluginData, &$reopen) {
$pluginsDirectory = ManiaControlDir . '/plugins/';
$pluginFiles = scandir($pluginsDirectory);
$this->maniaControl->log('[UPDATE] Now installing '.$pluginData->name.' ...');
$this->maniaControl->chat->sendInformation('Now installing '.$pluginData->name.' ...', $player->login);
$tempDir = ManiaControlDir . '/temp/';
if (!is_dir($tempDir)) {
mkdir($tempDir);
}
$installFileName = $tempDir . $pluginData->currentVersion->zipfile;
$bytes = file_put_contents($installFileName, $installFileContent);
if (!$bytes || $bytes <= 0) {
trigger_error("Couldn't save plugin Zip.");
$this->maniaControl->chat->sendError('Install failed: Couldn\'t save plugin zip!', $player->login);
return false;
}
$zip = new \ZipArchive();
$result = $zip->open($installFileName);
if ($result !== true) {
trigger_error("Couldn't open plugin Zip. ({$result})");
$this->maniaControl->chat->sendError('Install failed: Couldn\'t open plugin zip!', $player->login);
return false;
}
$zip->extractTo(ManiaControlDir.'/plugins');
$zip->close();
unlink($installFileName);
@rmdir($tempDir);
$pluginFilesAfter = scandir($pluginsDirectory);
$newFiles = array_diff($pluginFilesAfter, $pluginFiles);
$classesBefore = get_declared_classes();
foreach($newFiles as $newFile) {
$filePath = $pluginsDirectory . $newFile;
if (is_file($filePath)) {
$success = include_once $filePath;
if (!$success) {
trigger_error("Error loading File '{$filePath}'!");
}
continue;
}
$dirPath = $pluginsDirectory . $newFile;
if (is_dir($dirPath)) {
$this->maniaControl->pluginManager->loadPluginFiles($dirPath);
continue;
}
}
$classesAfter = get_declared_classes();
$newClasses = array_diff($classesAfter, $classesBefore);
foreach($newClasses as $className) {
if (!$this->maniaControl->pluginManager->isPluginClass($className)) {
continue;
}
/** @var Plugin $className */
$this->maniaControl->pluginManager->addPluginClass($className);
$className::prepare($this->maniaControl);
if ($this->maniaControl->pluginManager->isPluginActive($className)) {
continue;
}
if (!$this->maniaControl->pluginManager->getSavedPluginStatus($className)) {
continue;
}
}
$this->maniaControl->log('[UPDATE] Successfully installed '.$pluginData->name.'!');
$this->maniaControl->chat->sendSuccess('Successfully installed '.$pluginData->name.'!', $player->login);
if ($reopen) {
$menuId = $this->maniaControl->configurator->getMenuId('Install Plugins');
$this->maniaControl->configurator->reopenMenu($player, $menuId);
}
});
}
/** /**
* Set Core Update Data * Set Core Update Data
* *