shihaam/akaunting
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

updated site request

Browse Source
This commit is contained in:
denisdulici
2019-12-04 18:10:38 +03:00
parent fe2ed7befc
commit b8018dd804
5 changed files with 115 additions and 145 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
app/Utilities/Updater.php
View File

@ -5,13 +5,13 @@ namespace App\Utilities;
use App\Events\Install\UpdateCopied;
use App\Events\Install\UpdateDownloaded;
use App\Events\Install\UpdateUnzipped;
use App\Utilities\Console;
use App\Traits\SiteApi;
use Artisan;
use Cache;
use Date;
use File;
use ZipArchive;
use Artisan;
use GuzzleHttp\Exception\RequestException;
class Updater
{
@ -38,10 +38,7 @@ class Updater
$url = 'apps/' . $alias . '/download/' . $new . '/' . $info['akaunting'] . '/' . $info['token'];
}
$response = static::getRemote($url, 'GET', ['timeout' => 50, 'track_redirects' => true]);
// Exception
if (!$response || ($response instanceof RequestException) || ($response->getStatusCode() != 200)) {
if (!$response = static::getResponse('GET', $url, ['timeout' => 50, 'track_redirects' => true])) {
throw new \Exception(trans('modules.errors.download', ['module' => $alias]));
}
@ -50,7 +47,7 @@ class Updater
$path = 'temp-' . md5(mt_rand());
$temp_path = storage_path('app/temp') . '/' . $path;
$file_path = $temp_path . '/update.zip';
$file_path = $temp_path . '/upload.zip';
// Create tmp directory
if (!File::isDirectory($temp_path)) {
@ -73,7 +70,7 @@ class Updater
{
$temp_path = storage_path('app/temp') . '/' . $path;
$file = $temp_path . '/update.zip';
$file = $temp_path . '/upload.zip';
// Unzip the file
$zip = new ZipArchive();

21
app/Utilities/Versions.php
View File

@ -6,7 +6,6 @@ use App\Traits\SiteApi;
use Cache;
use Date;
use Parsedown;
use GuzzleHttp\Exception\RequestException;
class Versions
{
@ -89,28 +88,14 @@ class Versions
public static function getLatestVersion($url, $latest)
{
$response = static::getRemote($url, 'GET', ['timeout' => 10, 'referer' => true]);
// Exception
if ($response instanceof RequestException) {
if (!$data = static::getResponseData('GET', $url, ['timeout' => 10])) {
return $latest;
}
// Bad response
if (!$response || ($response->getStatusCode() != 200)) {
if (!is_object($data)) {
return $latest;
}
$content = json_decode($response->getBody());
// Empty response
if (!is_object($content) || !is_object($content->data)) {
return $latest;
}
// Get the latest version
$latest = $content->data->latest;
return $latest;
return $data->latest;
}
}