From 2ac8d9a3db5f2515a95fa46a0e354d70012a2a56 Mon Sep 17 00:00:00 2001 From: Git'Fellow <12234510+solracsf@users.noreply.github.com> Date: Mon, 9 Sep 2024 09:29:09 +0200 Subject: fix(appstore): return if appstore is manually disabled Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> fix: camel case Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> fix: log a debug log Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> fix: typing Signed-off-by: Git'Fellow <12234510+solracsf@users.noreply.github.com> fix: typo fix: typing --- lib/private/App/AppStore/Fetcher/AppFetcher.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) (limited to 'lib') diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index ae36d849c5e..412de722a12 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -148,10 +148,17 @@ class AppFetcher extends Fetcher { $this->ignoreMaxVersion = $ignoreMaxVersion; } - - public function get($allowUnstable = false) { + public function get($allowUnstable = false): array { $allowPreReleases = $allowUnstable || $this->getChannel() === 'beta' || $this->getChannel() === 'daily' || $this->getChannel() === 'git'; + $appStoreEnabled = $this->config->getSystemValueBool('appstoreenabled', true); + $internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true); + + if (!$appStoreEnabled || !$internetAvailable) { + $this->logger->debug('AppStore is disabled or this instance has no Internet connection', ['app' => 'appstoreFetcher']); + return []; + } + $apps = parent::get($allowPreReleases); if (empty($apps)) { $this->logger->warning('Could not get apps from the appstore', ['app' => 'appstoreFetcher']); -- cgit v1.2.3 From 4d3168fb24e21819129d17e69847c91331e2c3c0 Mon Sep 17 00:00:00 2001 From: John Molakvoæ Date: Tue, 10 Sep 2024 16:00:56 +0200 Subject: fix(appstore): disabled appstore log level bump from debug to info MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Co-authored-by: Joas Schilling <213943+nickvergessen@users.noreply.github.com> Signed-off-by: John Molakvoæ --- lib/private/App/AppStore/Fetcher/AppFetcher.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib') diff --git a/lib/private/App/AppStore/Fetcher/AppFetcher.php b/lib/private/App/AppStore/Fetcher/AppFetcher.php index 412de722a12..676638f69df 100644 --- a/lib/private/App/AppStore/Fetcher/AppFetcher.php +++ b/lib/private/App/AppStore/Fetcher/AppFetcher.php @@ -155,7 +155,7 @@ class AppFetcher extends Fetcher { $internetAvailable = $this->config->getSystemValueBool('has_internet_connection', true); if (!$appStoreEnabled || !$internetAvailable) { - $this->logger->debug('AppStore is disabled or this instance has no Internet connection', ['app' => 'appstoreFetcher']); + $this->logger->info('AppStore is disabled or this instance has no Internet connection', ['app' => 'appstoreFetcher']); return []; } -- cgit v1.2.3