kenmirrors/firefly-iii
1
0
Fork 0
mirror of https://github.com/firefly-iii/firefly-iii.git synced 2025-09-05 20:22:07 +00:00
Code Issues Projects Releases Wiki Activity

Simplify update check.

Browse Source
This commit is contained in:
James Cole
2020-02-02 10:39:37 +01:00
parent f99f166623
commit 7f3522339c
9 changed files with 173 additions and 167 deletions
Download Patch File Download Diff File Expand all files Collapse all files

46
app/Http/Controllers/Admin/UpdateController.php
View File

@@ -23,14 +23,12 @@ declare(strict_types=1);
namespace FireflyIII\Http\Controllers\Admin;
use FireflyIII\Exceptions\FireflyException;
use FireflyIII\Helpers\Update\UpdateTrait;
use FireflyIII\Http\Controllers\Controller;
use FireflyIII\Http\Middleware\IsDemoUser;
use FireflyIII\Http\Middleware\IsSandStormUser;
use Illuminate\Http\JsonResponse;
use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Log;
/**
* Class HomeController.
@@ -110,46 +108,12 @@ class UpdateController extends Controller
/**
* Does a manual update check.
*/
public function updateCheck(): JsonResponse
public function updateCheck(): RedirectResponse
{
$success = true;
$latestRelease = '1.0';
$resultString = '';
$versionCheck = -2;
$channel = app('fireflyconfig')->get('update_channel', 'stable')->data;
$release = $this->getLatestRelease();
try {
$latestRelease = $this->getLatestRelease();
} catch (FireflyException $e) {
Log::error($e->getMessage());
$success = false;
}
session()->flash($release['level'], $release['message']);
// if error, tell the user.
if (false === $success) {
$resultString = (string)trans('firefly.update_check_error');
session()->flash('error', $resultString);
}
// if not, compare and tell the user.
if (true === $success) {
$versionCheck = $this->versionCheck($latestRelease);
$resultString = $this->parseResult($versionCheck, $latestRelease);
}
Log::debug(sprintf('Result string is: "%s"', $resultString));
if (0 !== $versionCheck && '' !== $resultString) {
// flash info
session()->flash('info', $resultString);
}
app('fireflyconfig')->set('last_update_check', time());
return response()->json(
[
'result' => $resultString,
'channel' => $channel,
]
);
return redirect(route('admin.update-check'));
}
}