IntenseFinance/firefly-iii
3
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-02-25 18:45:27 -06:00
Code Issues Packages Projects Releases Wiki Activity

Make update code slightly more robust.

Browse Source
This commit is contained in:
James Cole 2019-02-10 07:59:11 +01:00
parent 4f274a290e
commit c6e3b54705
1 changed files with 16 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
app/Helpers/Update/UpdateTrait.php
View File

@ -50,6 +50,8 @@ trait UpdateTrait
$request->call(); $request->call();
} catch (FireflyException $e) { } catch (FireflyException $e) {
Log::error(sprintf('Could not check for updates: %s', $e->getMessage())); Log::error(sprintf('Could not check for updates: %s', $e->getMessage()));
return null;
} }
// get releases from array. // get releases from array.
@ -81,11 +83,14 @@ trait UpdateTrait
Log::debug(sprintf('Now in parseResult(%d)', $versionCheck)); Log::debug(sprintf('Now in parseResult(%d)', $versionCheck));
$current = (string)config('firefly.version'); $current = (string)config('firefly.version');
$return = ''; $return = '';
$triggered = false;
if ($versionCheck === -2) { if ($versionCheck === -2) {
Log::debug('-2, so give error.'); Log::debug('-2, so give error.');
$return = (string)trans('firefly.update_check_error'); $return = (string)trans('firefly.update_check_error');
$triggered = true;
} }
if ($versionCheck === -1 && null !== $release) { if ($versionCheck === -1 && null !== $release) {
$triggered = true;
Log::debug('New version!'); Log::debug('New version!');
// there is a new FF version! // there is a new FF version!
// has it been released for at least three days? // has it been released for at least three days?
@ -106,16 +111,23 @@ trait UpdateTrait
} }
if (0 === $versionCheck) { if (0 === $versionCheck) {
$triggered = true;
Log::debug('User is running current version.'); Log::debug('User is running current version.');
// you are running the current version! // you are running the current version!
$return = (string)trans('firefly.update_current_version_alert', ['version' => $current]); $return = (string)trans('firefly.update_current_version_alert', ['version' => $current]);
} }
if (1 === $versionCheck && null !== $release) { if (1 === $versionCheck && null !== $release) {
$triggered = true;
Log::debug('User is running NEWER version.'); Log::debug('User is running NEWER version.');
// you are running a newer version! // you are running a newer version!
$return = (string)trans('firefly.update_newer_version_alert', ['your_version' => $current, 'new_version' => $release->getTitle()]); $return = (string)trans('firefly.update_newer_version_alert', ['your_version' => $current, 'new_version' => $release->getTitle()]);
} }
if (false === $triggered) {
Log::debug('No option was triggered.');
$return = (string)trans('firefly.update_check_error');
}
return $return; return $return;
} }
@ -131,6 +143,7 @@ trait UpdateTrait
Log::debug('Now in versionCheck()'); Log::debug('Now in versionCheck()');
if (null === $release) { if (null === $release) {
Log::debug('Release is null, return -2.'); Log::debug('Release is null, return -2.');
return -2; return -2;
} }
$current = (string)config('firefly.version'); $current = (string)config('firefly.version');