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

update manager fixes & improvements

Browse Source
This commit is contained in:
Steffen Schröder 2014-05-04 15:14:58 +02:00
parent 8cb6fdcceb
commit 0ce3c8bae6
1 changed files with 24 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -302,13 +302,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
} }
$self = $this; $self = $this;
$this->maniaControl->fileReader->loadFile($this->coreUpdateData->url, function ($updateFileContent, $error) use (&$self, &$updateData, &$player) { $updateData = $this->coreUpdateData;
$maniaControl = $this->maniaControl;
$this->maniaControl->fileReader->loadFile($updateData->url, function ($updateFileContent, $error) use (&$self, &$maniaControl, &$updateData, &$player) {
if (!$updateFileContent || $error) { if (!$updateFileContent || $error) {
$message = "Update failed: Couldn't load Update zip! {$error}"; $message = "Update failed: Couldn't load Update zip! {$error}";
if ($player) { if ($player) {
$self->maniaControl->chat->sendError($message, $player); $maniaControl->chat->sendError($message, $player);
} }
logMessage($message); $maniaControl->log($message);
return; return;
} }
@ -319,19 +321,20 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
if (!$bytes || $bytes <= 0) { if (!$bytes || $bytes <= 0) {
$message = "Update failed: Couldn't save Update zip!"; $message = "Update failed: Couldn't save Update zip!";
if ($player) { if ($player) {
$self->maniaControl->chat->sendError($message, $player); $maniaControl->chat->sendError($message, $player);
} }
logMessage($message); $maniaControl->log($message);
return; return;
} }
$zip = new \ZipArchive(); $zip = new \ZipArchive();
$result = $zip->open($updateFileName); $result = $zip->open($updateFileName);
if ($result !== true) { if ($result !== true) {
trigger_error("Couldn't open Update Zip. ({$result})"); $message = "Update failed: Couldn't open Update Zip. ({$result})";
if ($player) { if ($player) {
$self->maniaControl->chat->sendError("Update failed: Couldn't open Update zip!", $player); $maniaControl->chat->sendError($message, $player);
} }
$maniaControl->log($message);
return; return;
} }
@ -345,11 +348,11 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
$message = 'Update finished!'; $message = 'Update finished!';
if ($player) { if ($player) {
$self->maniaControl->chat->sendSuccess($message, $player); $maniaControl->chat->sendSuccess($message, $player);
} }
$self->maniaControl->log($message); $maniaControl->log($message);
$self->maniaControl->restart(); $maniaControl->restart();
}); });
return true; return true;
@ -411,14 +414,15 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
} }
$self = $this; $self = $this;
$this->checkCoreUpdateAsync(function (UpdateData $updateData = null) use (&$self, &$player) { $maniaControl = $this->maniaControl;
$this->checkCoreUpdateAsync(function (UpdateData $updateData = null) use (&$self, &$maniaControl, &$player) {
if (!$self->checkUpdateData($updateData)) { if (!$self->checkUpdateData($updateData)) {
$self->maniaControl->chat->sendInformation('No Update available!', $player->login); $maniaControl->chat->sendInformation('No Update available!', $player->login);
return; return;
} }
if (!$self->checkUpdateDataBuildVersion($updateData)) { if (!$self->checkUpdateDataBuildVersion($updateData)) {
$self->maniaControl->chat->sendError("Please update Your Server to '{$updateData->minDedicatedBuild}' in order to receive further Updates!", $player->login); $maniaControl->chat->sendError("Please update Your Server to '{$updateData->minDedicatedBuild}' in order to receive further Updates!", $player->login);
return; return;
} }
@ -427,16 +431,19 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
$buildDate = $self->getNightlyBuildDate(); $buildDate = $self->getNightlyBuildDate();
if ($buildDate) { if ($buildDate) {
if ($updateData->isNewerThan($buildDate)) { if ($updateData->isNewerThan($buildDate)) {
$self->maniaControl->chat->sendInformation("No new Build available! (Current Build: '{$buildDate}')", $player->login); $maniaControl->chat->sendInformation("No new Build available! (Current Build: '{$buildDate}')", $player->login);
return;
} else { } else {
$self->maniaControl->chat->sendSuccess("New Nightly Build ({$updateData->releaseDate}) available! (Current Build: '{$buildDate}')", $player->login); $maniaControl->chat->sendSuccess("New Nightly Build ({$updateData->releaseDate}) available! (Current Build: '{$buildDate}')", $player->login);
} }
} else { } else {
$self->maniaControl->chat->sendSuccess("New Nightly Build ('{$updateData->releaseDate}') available!", $player->login); $maniaControl->chat->sendSuccess("New Nightly Build ('{$updateData->releaseDate}') available!", $player->login);
} }
} else { } else {
$self->maniaControl->chat->sendSuccess('Update for Version ' . $updateData->version . ' available!', $player->login); $maniaControl->chat->sendSuccess('Update for Version ' . $updateData->version . ' available!', $player->login);
} }
$self->coreUpdateData = $updateData;
}); });
} }