sascha
/
nextcloud-server
mirror of https://github.com/nextcloud/server.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

chore: Deduplicate common code between installApp and installShippedApp 

Signed-off-by: Côme Chilliet <come.chilliet@nextcloud.com>
pull/53895/head
Côme Chilliet 2025-07-29 16:50:51 +07:00
parent 4abfd4871f
commit 61a87bc384
No known key found for this signature in database
GPG Key ID: A3E2F658B28C760A
1 changed files with 44 additions and 64 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

108
lib/private/Installer.php
Unescape Escape View File

@ -65,7 +65,7 @@ class Installer {
$l = $this->l10nFactory->get('core');
$info = $this->appManager->getAppInfoByPath($appPath . '/appinfo/info.xml', $l->getLanguageCode());
if (!is_array($info)) {
if (!is_array($info) || $info['id'] !== $appId) {
throw new \Exception(
$l->t('App "%s" cannot be installed because appinfo file cannot be read.',
[$appId]
@ -77,7 +77,7 @@ class Installer {
$ignoreMax = $forceEnable || in_array($appId, $ignoreMaxApps, true);
$version = implode('.', \OCP\Util::getVersion());
if (!\OC_App::isAppCompatible($version, $info, $ignoreMax)) {
if (!$this->appManager->isAppCompatible($version, $info, $ignoreMax)) {
throw new \Exception(
$l->t('App "%s" cannot be installed because it is not compatible with this version of the server.',
[$info['name']]
@ -87,46 +87,10 @@ class Installer {
// check for required dependencies
\OC_App::checkAppDependencies($this->config, $l, $info, $ignoreMax);
/** @var Coordinator $coordinator */
$coordinator = \OC::$server->get(Coordinator::class);
$coordinator = Server::get(Coordinator::class);
$coordinator->runLazyRegistration($appId);
\OC_App::registerAutoloading($appId, $appPath);
$previousVersion = $this->config->getAppValue($info['id'], 'installed_version', false);
if ($previousVersion) {
\OC_App::executeRepairSteps($appId, $info['repair-steps']['pre-migration']);
}
//install the database
$ms = new MigrationService($info['id'], \OCP\Server::get(Connection::class));
$ms->migrate('latest', !$previousVersion);
if ($previousVersion) {
\OC_App::executeRepairSteps($appId, $info['repair-steps']['post-migration']);
}
\OC_App::setupBackgroundJobs($info['background-jobs']);
//run appinfo/install.php
self::includeAppScript($appPath . '/appinfo/install.php');
\OC_App::executeRepairSteps($appId, $info['repair-steps']['install']);
//set the installed version
$this->config->setAppValue($info['id'], 'installed_version', $this->appManager->getAppVersion($info['id'], false));
$this->config->setAppValue($info['id'], 'enabled', 'no');
//set remote/public handlers
foreach ($info['remote'] as $name => $path) {
$this->config->setAppValue('core', 'remote_' . $name, $info['id'] . '/' . $path);
}
foreach ($info['public'] as $name => $path) {
$this->config->setAppValue('core', 'public_' . $name, $info['id'] . '/' . $path);
}
\OC_App::setAppTypes($info['id']);
return $info['id'];
return $this->installAppLastSteps($appPath, $info, null, 'no');
}
/**
@ -567,46 +531,45 @@ class Installer {
return $errors;
}
/**
* install an app already placed in the app folder
*/
public function installShippedApp(string $app, ?IOutput $output = null): string|false {
if ($output instanceof IOutput) {
$output->debug('Installing ' . $app);
}
$appPath = $this->appManager->getAppPath($app);
\OC_App::registerAutoloading($app, $appPath);
private function installAppLastSteps(string $appPath, array $info, ?IOutput $output = null, string $enabled = 'no'): string {
\OC_App::registerAutoloading($info['id'], $appPath);
$ms = new MigrationService($app, Server::get(Connection::class));
$previousVersion = $this->config->getAppValue($info['id'], 'installed_version', '');
$ms = new MigrationService($info['id'], Server::get(Connection::class));
if ($output instanceof IOutput) {
$ms->setOutput($output);
}
$previousVersion = $this->config->getAppValue($app, 'installed_version', '');
$ms->migrate('latest', $previousVersion !== '');
if ($previousVersion !== '') {
\OC_App::executeRepairSteps($info['id'], $info['repair-steps']['pre-migration']);
}
//run appinfo/install.php
self::includeAppScript("$appPath/appinfo/install.php");
$ms->migrate('latest', $previousVersion === '');
$info = $this->appManager->getAppInfo($app);
if (is_null($info)) {
return false;
if ($previousVersion !== '') {
\OC_App::executeRepairSteps($info['id'], $info['repair-steps']['post-migration']);
}
if ($output instanceof IOutput) {
$output->debug('Registering tasks of ' . $app);
$output->debug('Registering tasks of ' . $info['id']);
}
\OC_App::setupBackgroundJobs($info['background-jobs']);
\OC_App::executeRepairSteps($app, $info['repair-steps']['install']);
// Run appinfo/install.php
self::includeAppScript($appPath . '/appinfo/install.php');
\OC_App::executeRepairSteps($info['id'], $info['repair-steps']['install']);
$this->config->setAppValue($app, 'installed_version', $this->appManager->getAppVersion($app));
// Set the installed version
$this->config->setAppValue($info['id'], 'installed_version', $this->appManager->getAppVersion($info['id'], false));
$this->config->setAppValue($info['id'], 'enabled', $enabled);
//set remote/public handlers
// Set remote/public handlers
foreach ($info['remote'] as $name => $path) {
$this->config->setAppValue('core', 'remote_' . $name, $app . '/' . $path);
$this->config->setAppValue('core', 'remote_' . $name, $info['id'] . '/' . $path);
}
foreach ($info['public'] as $name => $path) {
$this->config->setAppValue('core', 'public_' . $name, $app . '/' . $path);
$this->config->setAppValue('core', 'public_' . $name, $info['id'] . '/' . $path);
}
\OC_App::setAppTypes($info['id']);
@ -614,6 +577,23 @@ class Installer {
return $info['id'];
}
/**
* install an app already placed in the app folder
*/
public function installShippedApp(string $app, ?IOutput $output = null): string|false {
if ($output instanceof IOutput) {
$output->debug('Installing ' . $app);
}
$info = $this->appManager->getAppInfo($app);
if (is_null($info) || $info['id'] !== $app) {
return false;
}
$appPath = $this->appManager->getAppPath($app);
return $this->installAppLastSteps($appPath, $info, $output, 'yes');
}
private static function includeAppScript(string $script): void {
if (file_exists($script)) {
include $script;