From 580155abe716dd9fb385823819c473313c4e3dd1 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Wed, 10 Jun 2015 12:01:54 +0200 Subject: Load the update information asyncroniously to fix the page load speed --- lib/private/app.php | 6 ++++-- settings/controller/appsettingscontroller.php | 16 ++++++++++------ settings/js/apps.js | 16 +++++++++++++++- settings/templates/apps.php | 4 +--- 4 files changed, 30 insertions(+), 12 deletions(-) diff --git a/lib/private/app.php b/lib/private/app.php index a4dd513a5d8..4814561baec 100644 --- a/lib/private/app.php +++ b/lib/private/app.php @@ -797,9 +797,11 @@ class OC_App { * List all apps, this is used in apps.php * * @param bool $onlyLocal + * @param bool $includeUpdateInfo Should we check whether there is an update + * in the app store? * @return array */ - public static function listAllApps($onlyLocal = false) { + public static function listAllApps($onlyLocal = false, $includeUpdateInfo = true) { $installedApps = OC_App::getAllApps(); //TODO which apps do we want to blacklist and how do we integrate @@ -841,7 +843,7 @@ class OC_App { $info['removable'] = true; } - $info['update'] = OC_Installer::isUpdateAvailable($app); + $info['update'] = ($includeUpdateInfo) ? OC_Installer::isUpdateAvailable($app) : null; $appIcon = self::getAppPath($app) . '/img/' . $app . '.svg'; if (file_exists($appIcon)) { diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php index f1b62bb1d38..a98d297a122 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/controller/appsettingscontroller.php @@ -147,16 +147,18 @@ class AppSettingsController extends Controller { * Get all available apps in a category * * @param int $category + * @param bool $includeUpdateInfo Should we check whether there is an update + * in the app store? * @return array */ - public function listApps($category = 0) { + public function listApps($category = 0, $includeUpdateInfo = true) { if(!is_null($this->cache->get('listApps-'.$category))) { $apps = $this->cache->get('listApps-'.$category); } else { switch ($category) { // installed apps case 0: - $apps = $this->getInstalledApps(); + $apps = $this->getInstalledApps($includeUpdateInfo); usort($apps, function ($a, $b) { $a = (string)$a['name']; $b = (string)$b['name']; @@ -168,7 +170,7 @@ class AppSettingsController extends Controller { break; // not-installed apps case 1: - $apps = \OC_App::listAllApps(true); + $apps = \OC_App::listAllApps(true, $includeUpdateInfo); $apps = array_filter($apps, function ($app) { return !$app['active']; }); @@ -189,7 +191,7 @@ class AppSettingsController extends Controller { $apps = array(); } else { // don't list installed apps - $installedApps = $this->getInstalledApps(); + $installedApps = $this->getInstalledApps(false); $installedApps = array_map(function ($app) { if (isset($app['ocsid'])) { return $app['ocsid']; @@ -245,10 +247,12 @@ class AppSettingsController extends Controller { } /** + * @param bool $includeUpdateInfo Should we check whether there is an update + * in the app store? * @return array */ - private function getInstalledApps() { - $apps = \OC_App::listAllApps(true); + private function getInstalledApps($includeUpdateInfo = true) { + $apps = \OC_App::listAllApps(true, $includeUpdateInfo); $apps = array_filter($apps, function ($app) { return $app['active']; }); diff --git a/settings/js/apps.js b/settings/js/apps.js index 1d115eb8182..2863e86dba8 100644 --- a/settings/js/apps.js +++ b/settings/js/apps.js @@ -81,7 +81,7 @@ OC.Settings.Apps = OC.Settings.Apps || { $('#app-category-' + categoryId).addClass('active'); OC.Settings.Apps.State.currentCategory = categoryId; - this._loadCategoryCall = $.ajax(OC.generateUrl('settings/apps/list?category={categoryId}', { + this._loadCategoryCall = $.ajax(OC.generateUrl('settings/apps/list?category={categoryId}&includeUpdateInfo=0', { categoryId: categoryId }), { type:'GET', @@ -123,6 +123,20 @@ OC.Settings.Apps = OC.Settings.Apps || { }, complete: function() { $('#apps-list').removeClass('icon-loading'); + $.ajax(OC.generateUrl('settings/apps/list?category={categoryId}&includeUpdateInfo=1', { + categoryId: categoryId + }), { + type: 'GET', + success: function (apps) { + _.each(apps.apps, function(app) { + if (app.update) { + var $update = $('#app-' + app.id + ' .update'); + $update.removeClass('hidden'); + $update.val(t('settings', 'Update to %s').replace(/%s/g, app.update)); + } + }) + } + }); } }); }, diff --git a/settings/templates/apps.php b/settings/templates/apps.php index 0904f31df4d..c88efb8746a 100644 --- a/settings/templates/apps.php +++ b/settings/templates/apps.php @@ -108,9 +108,7 @@ script( {{/unless}} - {{#if update}} - - {{/if}} + {{#if active}} "/> -- cgit v1.2.3 From 5ca6ec7ead2966a1cad1213d898a326a9e315550 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Mon, 15 Jun 2015 10:04:13 +0200 Subject: Make "include update info" part of the cache key --- settings/controller/appsettingscontroller.php | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/settings/controller/appsettingscontroller.php b/settings/controller/appsettingscontroller.php index a98d297a122..d64c945c02c 100644 --- a/settings/controller/appsettingscontroller.php +++ b/settings/controller/appsettingscontroller.php @@ -152,8 +152,10 @@ class AppSettingsController extends Controller { * @return array */ public function listApps($category = 0, $includeUpdateInfo = true) { - if(!is_null($this->cache->get('listApps-'.$category))) { - $apps = $this->cache->get('listApps-'.$category); + $cacheName = 'listApps-' . $category . '-' . (int) $includeUpdateInfo; + + if(!is_null($this->cache->get($cacheName))) { + $apps = $this->cache->get($cacheName); } else { switch ($category) { // installed apps @@ -241,7 +243,7 @@ class AppSettingsController extends Controller { return $app; }, $apps); - $this->cache->set('listApps-'.$category, $apps, 300); + $this->cache->set($cacheName, $apps, 300); return ['apps' => $apps, 'status' => 'success']; } -- cgit v1.2.3