mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge pull request #14994 from nextcloud/feature/noid/pre-releases-for-beta-and-daily 

Enable pre-releases for beta and daily channel
This commit is contained in:
Morris Jobke 2019-04-10 23:02:05 +02:00 committed by GitHub
parent 0559b604b2 8e278a2c38
commit 302c10b836
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 27 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/private/App/AppStore/Fetcher/AppFetcher.php
View File

@ -83,14 +83,17 @@ class AppFetcher extends Fetcher {
/** @var mixed[] $response */ /** @var mixed[] $response */
$response = parent::fetch($ETag, $content); $response = parent::fetch($ETag, $content);
$allowPreReleases = $this->getChannel() === 'beta' || $this->getChannel() === 'daily';
$allowNightly = $this->getChannel() === 'daily';
foreach($response['data'] as $dataKey => $app) { foreach($response['data'] as $dataKey => $app) {
$releases = []; $releases = [];
// Filter all compatible releases // Filter all compatible releases
foreach($app['releases'] as $release) { foreach($app['releases'] as $release) {
// Exclude all nightly and pre-releases // Exclude all nightly and pre-releases if required
if($release['isNightly'] === false if (($allowNightly || $release['isNightly'] === false)
&& strpos($release['version'], '-') === false) { && ($allowPreReleases || strpos($release['version'], '-') === false)) {
// Exclude all versions not compatible with the current version // Exclude all versions not compatible with the current version
try { try {
$versionParser = new VersionParser(); $versionParser = new VersionParser();

21
lib/private/App/AppStore/Fetcher/Fetcher.php
View File

@ -57,6 +57,8 @@ abstract class Fetcher {
protected $endpointUrl; protected $endpointUrl;
/** @var string */ /** @var string */
protected $version; protected $version;
/** @var string */
protected $channel;
/** /**
* @param Factory $appDataFactory * @param Factory $appDataFactory
@ -197,4 +199,23 @@ abstract class Fetcher {
public function setVersion(string $version) { public function setVersion(string $version) {
$this->version = $version; $this->version = $version;
} }
/**
* Get the currently Nextcloud update channel
* @return string
*/
protected function getChannel() {
if ($this->channel === null) {
$this->channel = \OC_Util::getChannel();
}
return $this->channel;
}
/**
* Set the current Nextcloud update channel
* @param string $channel
*/
public function setChannel(string $channel) {
$this->channel = $channel;
}
} }