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

fixed & improved plugin install

Browse Source
This commit is contained in:
Steffen Schröder 2014-05-02 04:58:41 +02:00
parent 6a193a2fb5
commit d3c7b51f2f
1 changed files with 35 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
application/core/Update/PluginUpdateManager.php
View File

@ -85,6 +85,9 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
$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); $install = (strpos($actionId, PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN) === 0);
if (!$update && !$install) {
return;
}
$login = $callback[1][1]; $login = $callback[1][1];
$player = $this->maniaControl->playerManager->getPlayer($login); $player = $this->maniaControl->playerManager->getPlayer($login);
@ -92,27 +95,39 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
if ($update) { if ($update) {
$pluginClass = substr($actionId, strlen(PluginMenu::ACTION_PREFIX_UPDATEPLUGIN)); $pluginClass = substr($actionId, strlen(PluginMenu::ACTION_PREFIX_UPDATEPLUGIN));
if ($pluginClass == 'All') { if ($pluginClass == 'All') {
$this->checkPluginsUpdate($player); $this->performPluginsUpdate($player);
} }
else { else {
$newUpdate = $this->getPluginUpdate($pluginClass); $pluginUpdateData = $this->getPluginUpdate($pluginClass);
if ($newUpdate) { if ($pluginUpdateData) {
$newUpdate->pluginClass = $pluginClass; $this->installPlugin($pluginUpdateData, $player, true);
$this->updatePlugin($newUpdate, $player, true); }
else {
$message = 'Error loading Plugin Update Data!';
$this->maniaControl->chat->sendError($message, $player);
} }
} }
} }
else {
if ($install) {
$pluginId = substr($actionId, strlen(PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN)); $pluginId = substr($actionId, strlen(PluginInstallMenu::ACTION_PREFIX_INSTALLPLUGIN));
$url = ManiaControl::URL_WEBSERVICE . 'plugins?id=' . $pluginId; $url = ManiaControl::URL_WEBSERVICE . 'plugins?id=' . $pluginId;
$dataJson = FileUtil::loadFile($url); $self = $this;
$pluginVersions = json_decode($dataJson); $this->maniaControl->fileReader->loadFile($url, function ($data, $error) use(&$self, &$player) {
if ($pluginVersions && isset($pluginVersions[0])) { if ($error || !$data) {
$pluginData = $pluginVersions[0]; $message = "Error loading Plugin Install Data! {$error}";
$this->installPlugin($pluginData, $player, true); $self->maniaControl->chat->sendError($message, $player);
} return;
}
$data = json_decode($data);
if (!isset($data[0])) {
$message = "Error loading Plugin Install Data! {$error}";
$self->maniaControl->chat->sendError($message, $player);
return;
}
$pluginUpdateData = new PluginUpdateData($data[0]);
$self->installPlugin($pluginUpdateData, $player);
});
} }
} }
@ -253,7 +268,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
* @return mixed * @return mixed
*/ */
public function parsePluginsData($webServiceResult) { public function parsePluginsData($webServiceResult) {
if (!$webServiceResult || is_array($webServiceResult)) { if (!$webServiceResult || !is_array($webServiceResult)) {
return false; return false;
} }
$pluginsData = array(); $pluginsData = array();
@ -310,7 +325,7 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
*/ */
private function installPlugin(PluginUpdateData $pluginUpdateData, Player $player = null, $update = false) { private function installPlugin(PluginUpdateData $pluginUpdateData, Player $player = null, $update = false) {
$self = $this; $self = $this;
$this->maniaControl->fileReader->loadFile($pluginData->currentVersion->url, function ($updateFileContent, $error) use(&$self, &$pluginUpdateData, &$player, &$update) { $this->maniaControl->fileReader->loadFile($pluginUpdateData->url, function ($updateFileContent, $error) use(&$self, &$pluginUpdateData, &$player, &$update) {
$actionNoun = ($update ? 'Update' : 'Install'); $actionNoun = ($update ? 'Update' : 'Install');
$actionVerb = ($update ? 'Updating' : 'Installing'); $actionVerb = ($update ? 'Updating' : 'Installing');
$actionVerbDone = ($update ? 'updated' : 'installed'); $actionVerbDone = ($update ? 'updated' : 'installed');
@ -350,7 +365,11 @@ class PluginUpdateManager implements CallbackListener, CommandListener, TimerLis
unlink($updateFileName); unlink($updateFileName);
FileUtil::removeTempFolder(); FileUtil::removeTempFolder();
$message = "Successfully {$actionVerbDone} '{$pluginUpdateData->pluginName}'!"; $messageExtra = '';
if ($update) {
$messageExtra = ' (Restart ManiaControl to load the new Version!)';
}
$message = "Successfully {$actionVerbDone} '{$pluginUpdateData->pluginName}'!{$messageExtra}";
if ($player) { if ($player) {
$self->maniaControl->chat->sendSuccess($message, $player); $self->maniaControl->chat->sendSuccess($message, $player);
} }