Improve version handling.

This commit is contained in:
James Cole
2019-10-30 20:02:38 +01:00
parent 9a028d5002
commit cbc92d89e1
6 changed files with 25 additions and 5 deletions

View File

@@ -53,8 +53,8 @@ trait UpdateTrait
/**
* Parses the version check result in a human readable sentence.
*
* @param int $versionCheck
* @param string $version
* @param int $versionCheck
* @param array $information
*
* @return string
*/
@@ -76,6 +76,16 @@ trait UpdateTrait
'date' => $carbon->formatLocalized($monthAndDayFormat),
]
);
// append warning if beta or alpha.
$isBeta = $information['is_beta'] ?? false;
if (true === $isBeta) {
$return = sprintf('%s %s', $return, trans('firefly.update_version_beta'));
}
$isAlpha = $information['is_alpha'] ?? false;
if (true === $isAlpha) {
$return = sprintf('%s %s', $return, trans('firefly.update_version_alpha'));
}
}
if (0 === $versionCheck) {

View File

@@ -116,6 +116,8 @@ class UpdateController extends Controller
$latestRelease = '1.0';
$resultString = '';
$versionCheck = -2;
$channel = app('fireflyconfig')->get('update_channel', 'stable')->data;
try {
$latestRelease = $this->getLatestRelease();
} catch (FireflyException $e) {
@@ -143,6 +145,11 @@ class UpdateController extends Controller
}
app('fireflyconfig')->set('last_update_check', time());
return response()->json(['result' => $resultString]);
return response()->json(
[
'result' => $resultString,
'channel' => $channel,
]
);
}
}

View File

@@ -42,7 +42,7 @@ class UpdateRequest implements UpdateRequestInterface
*/
public function getVersion(string $channel): array
{
$uri = 'https://version.firefly-iii.org/index.json';
$uri = config('firefly.update_endpoint');
Log::debug(sprintf('Going to call %s', $uri));
try {
$client = new Client();

View File

@@ -31,7 +31,7 @@ interface UpdateRequestInterface
/**
* @param string $channel
*
* @return string
* @return array
* @throws FireflyException
*/
public function getVersion(string $channel): array;