mirrors/PocketMine-MP
1
0
Fork 0
mirror of https://github.com/pmmp/PocketMine-MP.git synced 2025-09-06 17:59:48 +00:00
Code Issues Projects Releases Wiki Activity

Merged server and API version

Browse Source
This commit is contained in:
Dylan K. Taylor
2018-06-17 12:54:18 +01:00
parent 77f3ca4d47
commit 1f9bed275a
8 changed files with 81 additions and 69 deletions
Download Patch File Download Diff File Expand all files Collapse all files

32
src/pocketmine/updater/AutoUpdater.php
View File

@ -35,10 +35,10 @@ class AutoUpdater{
protected $server;
/** @var string */
protected $endpoint;
/** @var bool */
protected $hasUpdate = false;
/** @var array|null */
protected $updateInfo = null;
/** @var VersionString|null */
protected $newVersion;
/**
* @param Server $server
@ -67,10 +67,9 @@ class AutoUpdater{
$this->showConsoleUpdate();
}
}elseif($this->server->getProperty("auto-updater.preferred-channel", true)){
$version = new VersionString();
if(!$version->isDev() and $this->getChannel() !== "stable"){
if(!\pocketmine\IS_DEVELOPMENT_BUILD and $this->getChannel() !== "stable"){
$this->showChannelSuggestionStable();
}elseif($version->isDev() and $this->getChannel() === "stable"){
}elseif(\pocketmine\IS_DEVELOPMENT_BUILD and $this->getChannel() === "stable"){
$this->showChannelSuggestionBeta();
}
}
@ -82,17 +81,15 @@ class AutoUpdater{
* @return bool
*/
public function hasUpdate() : bool{
return $this->hasUpdate;
return $this->newVersion !== null;
}
/**
* Posts a warning to the console to tell the user there is an update available
*/
public function showConsoleUpdate(){
$newVersion = new VersionString($this->updateInfo["version"]);
$messages = [
"Your version of " . $this->server->getName() . " is out of date. Version " . $newVersion->get(false) . " (build #" . $this->updateInfo["build"] . ") was released on " . date("D M j h:i:s Y", $this->updateInfo["date"])
"Your version of " . $this->server->getName() . " is out of date. Version " . $this->newVersion->getFullVersion(true) . " was released on " . date("D M j h:i:s Y", $this->updateInfo["date"])
];
if($this->updateInfo["details_url"] !== null){
$messages[] = "Details: " . $this->updateInfo["details_url"];
@ -159,15 +156,18 @@ class AutoUpdater{
if($this->updateInfo === null){
return;
}
$currentVersion = new VersionString($this->server->getPocketMineVersion());
$newVersion = new VersionString($this->updateInfo["version"]);
if($currentVersion->compare($newVersion) > 0 and ($currentVersion->get() !== $newVersion->get() or $currentVersion->getBuild() > 0)){
$this->hasUpdate = true;
}else{
$this->hasUpdate = false;
$currentVersion = new VersionString(\pocketmine\BASE_VERSION, \pocketmine\IS_DEVELOPMENT_BUILD, \pocketmine\BUILD_NUMBER);
try{
$newVersion = new VersionString($this->updateInfo["base_version"], $this->updateInfo["is_dev"], $this->updateInfo["build"]);
}catch(\InvalidArgumentException $e){
//Invalid version returned from API, assume there's no update
$this->server->getLogger()->debug("[AutoUpdater] Assuming no update because \"" . $e->getMessage() . "\"");
return;
}
if($currentVersion->compare($newVersion) > 0 and ($currentVersion->getFullVersion() !== $newVersion->getFullVersion() or $currentVersion->getBuild() > 0)){
$this->newVersion = $newVersion;
}
}
/**

4
src/pocketmine/updater/UpdateCheckTask.php
View File

@ -52,8 +52,8 @@ class UpdateCheckTask extends AsyncTask{
$response = json_decode($response, true);
if(is_array($response)){
if(
isset($response["version"]) and
isset($response["api_version"]) and
isset($response["base_version"]) and
isset($response["is_dev"]) and
isset($response["build"]) and
isset($response["date"]) and
isset($response["download_url"])