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

removed 'nightly' from methods as they are relevant for all channels

Browse Source
This commit is contained in:
Steffen Schröder 2014-09-01 03:43:07 +02:00
parent d6069f9231
commit b6f061510f
1 changed files with 17 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -24,6 +24,9 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
/* /*
* Constants * Constants
*/ */
const CHANNEL_RELEASE = 'release';
const CHANNEL_BETA = 'beta';
const CHANNEL_NIGHTLY = 'nightly';
const SETTING_ENABLE_UPDATECHECK = 'Enable Automatic Core Update Check'; const SETTING_ENABLE_UPDATECHECK = 'Enable Automatic Core Update Check';
const SETTING_UPDATECHECK_INTERVAL = 'Core Update Check Interval (Hours)'; const SETTING_UPDATECHECK_INTERVAL = 'Core Update Check Interval (Hours)';
const SETTING_UPDATECHECK_CHANNEL = 'Core Update Channel (release, beta, nightly)'; const SETTING_UPDATECHECK_CHANNEL = 'Core Update Channel (release, beta, nightly)';
@ -31,15 +34,14 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
const SETTING_AUTO_UPDATE = 'Perform update automatically'; const SETTING_AUTO_UPDATE = 'Perform update automatically';
const SETTING_PERMISSION_UPDATE = 'Update Core'; const SETTING_PERMISSION_UPDATE = 'Update Core';
const SETTING_PERMISSION_UPDATECHECK = 'Check Core Update'; const SETTING_PERMISSION_UPDATECHECK = 'Check Core Update';
const CHANNEL_RELEASE = 'release'; const BUILD_DATE_FILE_NAME = 'build_date.txt';
const CHANNEL_BETA = 'beta';
const CHANNEL_NIGHTLY = 'nightly';
/* /*
* Public properties * Public properties
*/ */
/** @var PluginUpdateManager $pluginUpdateManager */ /** @var PluginUpdateManager $pluginUpdateManager
/** @deprecated see getPluginUpdateManager() */ * @deprecated see getPluginUpdateManager()
*/
public $pluginUpdateManager = null; public $pluginUpdateManager = null;
/* /*
@ -210,7 +212,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
} }
$isNightly = $this->isNightlyUpdateChannel(); $isNightly = $this->isNightlyUpdateChannel();
$buildDate = $this->getNightlyBuildDate(); $buildDate = $this->getBuildDate();
if ($isNightly || $buildDate) { if ($isNightly || $buildDate) {
return $updateData->isNewerThan($buildDate); return $updateData->isNewerThan($buildDate);
@ -233,13 +235,13 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
} }
/** /**
* Get the Build Date of the local Nightly Build Version * Get the build date of the local version
* *
* @return string * @return string
*/ */
public function getNightlyBuildDate() { public function getBuildDate() {
if (!$this->currentBuildDate) { if (!$this->currentBuildDate) {
$nightlyBuildDateFile = MANIACONTROL_PATH . 'core' . DIRECTORY_SEPARATOR . 'nightly_build.txt'; $nightlyBuildDateFile = MANIACONTROL_PATH . 'core' . DIRECTORY_SEPARATOR . self::BUILD_DATE_FILE_NAME;
if (file_exists($nightlyBuildDateFile)) { if (file_exists($nightlyBuildDateFile)) {
$this->currentBuildDate = file_get_contents($nightlyBuildDateFile); $this->currentBuildDate = file_get_contents($nightlyBuildDateFile);
} }
@ -378,8 +380,8 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
unlink($updateFileName); unlink($updateFileName);
FileUtil::deleteTempFolder(); FileUtil::deleteTempFolder();
// Set the Nightly Build Date // Set the build date
$this->setNightlyBuildDate($updateData->releaseDate); $this->setBuildDate($updateData->releaseDate);
$message = 'Update finished!'; $message = 'Update finished!';
if ($player) { if ($player) {
@ -394,13 +396,13 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
} }
/** /**
* Set the Build Date of the local Nightly Build Version * Set the build date version
* *
* @param string $date * @param string $date
* @return bool * @return bool
*/ */
public function setNightlyBuildDate($date) { public function setBuildDate($date) {
$nightlyBuildDateFile = MANIACONTROL_PATH . 'core' . DIRECTORY_SEPARATOR . 'nightly_build.txt'; $nightlyBuildDateFile = MANIACONTROL_PATH . 'core' . DIRECTORY_SEPARATOR . self::BUILD_DATE_FILE_NAME;
$success = (bool)file_put_contents($nightlyBuildDateFile, $date); $success = (bool)file_put_contents($nightlyBuildDateFile, $date);
$this->currentBuildDate = $date; $this->currentBuildDate = $date;
return $success; return $success;
@ -463,7 +465,7 @@ class UpdateManager implements CallbackListener, CommandListener, TimerListener
$isNightly = $this->isNightlyUpdateChannel(); $isNightly = $this->isNightlyUpdateChannel();
if ($isNightly) { if ($isNightly) {
$buildDate = $this->getNightlyBuildDate(); $buildDate = $this->getBuildDate();
if ($buildDate) { if ($buildDate) {
if ($updateData->isNewerThan($buildDate)) { if ($updateData->isNewerThan($buildDate)) {
$this->maniaControl->getChat()->sendInformation("No new Build available! (Current Build: '{$buildDate}')", $player->login); $this->maniaControl->getChat()->sendInformation("No new Build available! (Current Build: '{$buildDate}')", $player->login);