* 391 Notification refactorings (#441) * Refactor notifications to allow easier plugins * Notification refactoring * Formatting * Move news to NewsService; cleanup of events * More refactoring; added send email out for news item and the template * Formatting * Formatting * Fix missing newsRepo (#445) * Refactor and add importer to Installer module #443 (#444) * Refactor and add importer to Installer module #443 * Refactor for finances to use in import * Import groups into roles * Formatting * Formatting * Add interface in installer for import * Notes about importing * Check for installer folder * Formatting * Fix pirep->user mapping * Unused import * Formatting * Replace importer with AJAX powered; better error handling #443 (#447) * Replace importer with AJAX powered; better error handling #443 * Formatting * Fix command line importer * Remove bootstrap cache (#448) * Cleanup the bootstrap/cache directory when packaging * Fix removal of bootstrap cache * Formatting * Stricter checks on ACARS API data (#451) * Stricter checks on ACARS API data * More checks * Fix for flight_number check forcing to exist * Allow nullable on flight_id * Avoid proc_open use #455 (#456) * Use PhpExecutableFinder() closes #457 #458 (#460) * Use DateTimeZone instead of int for creating datetime closes #461 * Fix CSV imports giving Storage class not found #454 (#462) * Fix CSV imports giving Storage class not found #454 * Update yarn files for security alert * Add PHP 7.4 support (#464) * Add PHP 7.4 to build matrix * DB fix * YAML parser fix in test data * Show versions * Package updates * Track used ICAOs * 7.4 METAR parsing fix * METAR parser fix * Formatting * Add meters to response units * Call instance for unit conversion * Return value * Catch exception for unknown quantity * Comment fix * Formatting * METAR parsing fixes on PHP 7.4 * Package updates * More random airport ID * More random airport ID * Properly disable toolbar * Semver written out to version file * Use dev as default identifier * Fix BindingResolutionError when debug toolbar isn't present (#465) * Fix BindingResolutionError when debug toolbar isn't present * Formatting * Split the importer module out from the installer module (#468) * Split the importer module out from the installer module * Cleanup of unused imports * Move updater into separate module #453 * Remove unused imports/formatting * Disable the install and importer modules at the end of the setup * Unused imports; update IJ style * test explicit stage for php+mysql * add more to matrix * Add different MariaDB versions * undo * Cleanup Model doc * Pilots cannot use the dashboard or flights without admin rights (#481) * Use auth middleware instead of specific groups for logged in state * Auth check for admin access * Check user admin access for updates * Formatting * Allow nullable field and calculate distance if nulled for flight import #478 (#482) * Check for no roles being attached #480 (#483) * Return the flight fares if there are no subfleet fares #488 (#489) * Return the flight fares if there are no subfleet fares #488 * Formatting * Formatting * Account for units when entering fuel amounts #493 * Search for ICAO not working properly (#496) * /flights and /flights/search direct to the same endpoint * Properly set the distance/planned_distance on save (#497) * 491 Installation Error (#495) * Disable CSRF token * Add error handling around looking up the theme and set a default * Note about logs in issue template * Formatting * Fix GeoService errors when viewing PIREP #498 (#499) * Add new command to export a specific PIREP for debugging (#501) * Set a default model value for airports on PIREP (#500) * Set a default model value for airports on PIREP * Fix airport icao reference * Default airport models * Catch broader exception writing out config files #491 * style * Add reference to docs on doc site (#502) * Properly create/update rows importing #486 (#503) * Add base Dockerfile for Dockerhub builds (#504) * New subfleet not being attached to an airline on import #479 (#505) * Fix subfleet not being attached to an airline on creation in import #479 * Call airline name with optional() around subfleet * Minor cleanup * Search flights by subfleet #484 (#506) * API level search of flights #484 * Add Subfleet to flights page for search * Make the fuel used optional (#512) * Add make to Docker container * Add getRootDomain() to Utils (#514) * Show admin dropdown for admin-access ability (#515) * Show admin dropdown for admin-access ability closes #509 * Formatting * Check user permissions on the routes #508 (#516) * Check user permissions on the routes #508 * Formatting * Return default value on exception for setting() * Correct text for no subfleets #507 (#518) * Add a public_url() helper #513 (#519) * Reduce number of queries for update check (#520) * Try to clear caches before updating (#522) * Try to clear caches before updating * Add clear-compiled to maintenance cache list * Formatting * Set PIREPs page to public (#526) Set PIREPs page to public * Fix live and route map errors #527 (#528) * Add menu bar for mobile (#529) * Format all blade templates to 2 spaces #530 (#531) * Fix PIREP edit endpoint closes #533 (#534) * Fix import during flight cron #532 (#535) * PIREPS resource except for show (#536) * Use optional() around the airport fields (#537) * Use optional() around the airport fields * Add null-coalesce around full_name * Add link to download ACARS config from profile (#539) * Add link to download ACARS config from profile * Formatting * Update xml config file template (#540)
215 lines
5.5 KiB
PHP
215 lines
5.5 KiB
PHP
<?php
|
|
|
|
namespace App\Services;
|
|
|
|
use App\Contracts\Service;
|
|
use App\Repositories\KvpRepository;
|
|
use App\Support\HttpClient;
|
|
use GuzzleHttp\Exception\GuzzleException;
|
|
use Illuminate\Support\Facades\Log;
|
|
use SemVer\SemVer\Version;
|
|
use Symfony\Component\Yaml\Yaml;
|
|
|
|
class VersionService extends Service
|
|
{
|
|
private $httpClient;
|
|
private $kvpRepo;
|
|
|
|
public function __construct(
|
|
HttpClient $httpClient,
|
|
KvpRepository $kvpRepo
|
|
) {
|
|
$this->httpClient = $httpClient;
|
|
$this->kvpRepo = $kvpRepo;
|
|
}
|
|
|
|
/**
|
|
* Clean the version string (e.,g strip the v in front)
|
|
*
|
|
* @param string $version
|
|
*
|
|
* @return string
|
|
*/
|
|
private function cleanVersionString($version): string
|
|
{
|
|
if ($version[0] === 'v') {
|
|
$version = substr($version, 1);
|
|
}
|
|
|
|
return $version;
|
|
}
|
|
|
|
/**
|
|
* Set the latest release version/tag into the KVP repo and return the tag
|
|
*
|
|
* @param $version_tag
|
|
* @param $download_url
|
|
*
|
|
* @return string The version string
|
|
*/
|
|
private function setLatestRelease($version_tag, $download_url): string
|
|
{
|
|
$version_tag = $this->cleanVersionString($version_tag);
|
|
|
|
$this->kvpRepo->save('latest_version_tag', $version_tag);
|
|
$this->kvpRepo->save('latest_version_url', $download_url);
|
|
|
|
return $version_tag;
|
|
}
|
|
|
|
/**
|
|
* Find and return the Github asset line
|
|
*
|
|
* @param $release
|
|
*
|
|
* @return string
|
|
*/
|
|
private function getGithubAsset($release): string
|
|
{
|
|
foreach ($release['assets'] as $asset) {
|
|
if ($asset['content_type'] === 'application/gzip') {
|
|
return $asset['browser_download_url'];
|
|
}
|
|
}
|
|
|
|
return '';
|
|
}
|
|
|
|
/**
|
|
* Download the latest version from github
|
|
*/
|
|
private function getLatestVersionGithub()
|
|
{
|
|
$releases = [];
|
|
|
|
try {
|
|
$releases = $this->httpClient->get(config('phpvms.version_file'), [
|
|
'headers' => [
|
|
'Accept' => 'application/json',
|
|
],
|
|
]);
|
|
} catch (GuzzleException $e) {
|
|
Log::error('Error retrieving new version: '.$e->getMessage());
|
|
}
|
|
|
|
$include_prerelease = setting('general.check_prerelease_version', false);
|
|
foreach ($releases as $release) {
|
|
if ($release['prerelease'] === true) {
|
|
if ($include_prerelease) {
|
|
return $this->setLatestRelease(
|
|
$release['tag_name'],
|
|
$this->getGithubAsset($release)
|
|
);
|
|
}
|
|
continue;
|
|
}
|
|
|
|
return $this->setLatestRelease(
|
|
$release['tag_name'],
|
|
$this->getGithubAsset($release)
|
|
);
|
|
}
|
|
|
|
return $releases;
|
|
}
|
|
|
|
/**
|
|
* Downloads the latest version and saves it into the KVP store
|
|
*/
|
|
public function getLatestVersion()
|
|
{
|
|
$latest_version = $this->getLatestVersionGithub();
|
|
return $latest_version;
|
|
}
|
|
|
|
/**
|
|
* Get the build ID, which is the date and the git log version
|
|
*
|
|
* @param array $cfg
|
|
*
|
|
* @return string
|
|
*/
|
|
public function getBuildId($cfg)
|
|
{
|
|
exec($cfg['git']['git-local'], $version);
|
|
$version = substr($version[0], 0, $cfg['build']['length']);
|
|
|
|
// prefix with the date in YYMMDD format
|
|
$date = date('ymd');
|
|
return $date.'.'.$version;
|
|
}
|
|
|
|
/**
|
|
* Get the current version
|
|
*
|
|
* @param bool $include_build True will include the build ID
|
|
*
|
|
* @return string
|
|
*/
|
|
public function getCurrentVersion($include_build = true)
|
|
{
|
|
$version_file = config_path('version.yml');
|
|
$cfg = Yaml::parse(file_get_contents($version_file));
|
|
|
|
$c = $cfg['current'];
|
|
$version = "{$c['major']}.{$c['minor']}.{$c['patch']}";
|
|
if ($c['prerelease'] !== '') {
|
|
$version .= "-{$c['prerelease']}";
|
|
if ($c['buildmetadata'] !== '') {
|
|
$version .= ".{$c['buildmetadata']}";
|
|
}
|
|
}
|
|
|
|
if ($include_build) {
|
|
// Get the current build id
|
|
$build_number = $this->getBuildId($cfg);
|
|
$cfg['build']['number'] = $build_number;
|
|
$version = $version.'+'.$build_number;
|
|
}
|
|
|
|
return $version;
|
|
}
|
|
|
|
/**
|
|
* See if a new version is available. Saves a flag into the KVP store if there is
|
|
*
|
|
* @param null [$current_version]
|
|
*
|
|
* @return bool
|
|
*/
|
|
public function isNewVersionAvailable($current_version = null)
|
|
{
|
|
if (!$current_version) {
|
|
$current_version = $this->getCurrentVersion(false);
|
|
} else {
|
|
$current_version = $this->cleanVersionString($current_version);
|
|
}
|
|
|
|
// Replace "dev" with "alpha", since
|
|
|
|
$latest_version = $this->getLatestVersion();
|
|
|
|
// Convert to semver
|
|
if ($this->isGreaterThan($latest_version, $current_version)) {
|
|
$this->kvpRepo->save('new_version_available', true);
|
|
return true;
|
|
}
|
|
|
|
$this->kvpRepo->save('new_version_available', false);
|
|
return false;
|
|
}
|
|
|
|
/**
|
|
* @param string $version1
|
|
* @param string $version2
|
|
*
|
|
* @return bool If $version1 is greater than $version2
|
|
*/
|
|
public function isGreaterThan($version1, $version2): bool
|
|
{
|
|
$version1 = Version::fromString($version1);
|
|
$version2 = Version::fromString($version2);
|
|
return $version1->isGreaterThan($version2);
|
|
}
|
|
}
|