aboutsummaryrefslogtreecommitdiffstats
path: root/lib/private
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2021-01-28 11:50:40 +0100
committerJulius Härtl <jus@bitgrid.net>2021-01-28 12:00:21 +0100
commit6c1b357973cc86f553ca83a9ed615e64c20d112f (patch)
treebc84697f50a3f701fcf7575fc5d4a1c388de3c0f /lib/private
parent2d46971199eecb49b96d5031bdbad25e448d0b27 (diff)
downloadnextcloud-server-6c1b357973cc86f553ca83a9ed615e64c20d112f.tar.gz
nextcloud-server-6c1b357973cc86f553ca83a9ed615e64c20d112f.zip
Move TemplateProvider registration to boot context and make template type registration lazy
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib/private')
-rw-r--r--lib/private/AppFramework/Bootstrap/RegistrationContext.php23
-rw-r--r--lib/private/Files/Template/TemplateManager.php46
2 files changed, 51 insertions, 18 deletions
diff --git a/lib/private/AppFramework/Bootstrap/RegistrationContext.php b/lib/private/AppFramework/Bootstrap/RegistrationContext.php
index d6271f5ce45..d2dc365d835 100644
--- a/lib/private/AppFramework/Bootstrap/RegistrationContext.php
+++ b/lib/private/AppFramework/Bootstrap/RegistrationContext.php
@@ -77,6 +77,9 @@ class RegistrationContext {
/** @var array[] */
private $wellKnownHandlers = [];
+ /** @var array[] */
+ private $templateProviders = [];
+
/** @var ILogger */
private $logger;
@@ -186,6 +189,13 @@ class RegistrationContext {
$class
);
}
+
+ public function registerTemplateProvider(string $providerClass): void {
+ $this->context->registerTemplateProvider(
+ $this->appId,
+ $providerClass
+ );
+ }
};
}
@@ -279,6 +289,13 @@ class RegistrationContext {
];
}
+ public function registerTemplateProvider(string $appId, string $class): void {
+ $this->templateProviders[] = [
+ 'appId' => $appId,
+ 'class' => $class,
+ ];
+ }
+
/**
* @param App[] $apps
*/
@@ -451,7 +468,7 @@ class RegistrationContext {
}
/**
- * @erturn array[]
+ * @return array[]
*/
public function getInitialStates(): array {
return $this->initialStates;
@@ -463,4 +480,8 @@ class RegistrationContext {
public function getWellKnownHandlers(): array {
return $this->wellKnownHandlers;
}
+
+ public function getTemplateProviders(): array {
+ return $this->templateProviders;
+ }
}
diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php
index 1942f83b86c..813f3fe83e9 100644
--- a/lib/private/Files/Template/TemplateManager.php
+++ b/lib/private/Files/Template/TemplateManager.php
@@ -26,6 +26,7 @@ declare(strict_types=1);
namespace OC\Files\Template;
+use OC\AppFramework\Bootstrap\Coordinator;
use OC\Files\Cache\Scanner;
use OCP\EventDispatcher\IEventDispatcher;
use OCP\Files\Folder;
@@ -35,7 +36,7 @@ use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\Files\NotPermittedException;
-use OCP\Files\Template\CreatedFromTemplateEvent;
+use OCP\Files\Template\FileCreatedFromTemplateEvent;
use OCP\Files\Template\ICustomTemplateProvider;
use OCP\Files\Template\ITemplateManager;
use OCP\Files\Template\Template;
@@ -48,10 +49,11 @@ use OCP\L10N\IFactory;
use Psr\Log\LoggerInterface;
class TemplateManager implements ITemplateManager {
+ private $registeredTypes = [];
private $types = [];
- private $registeredProviders = [];
- private $providers;
+ /** @var array|null */
+ private $providers = null;
private $serverContainer;
private $eventDispatcher;
@@ -62,10 +64,13 @@ class TemplateManager implements ITemplateManager {
private $logger;
private $userId;
private $l10nFactory;
+ /** @var Coordinator */
+ private $bootstrapCoordinator;
public function __construct(
IServerContainer $serverContainer,
IEventDispatcher $eventDispatcher,
+ Coordinator $coordinator,
IRootFolder $rootFolder,
IUserSession $userSession,
IPreview $previewManager,
@@ -75,6 +80,7 @@ class TemplateManager implements ITemplateManager {
) {
$this->serverContainer = $serverContainer;
$this->eventDispatcher = $eventDispatcher;
+ $this->bootstrapCoordinator = $coordinator;
$this->rootFolder = $rootFolder;
$this->previewManager = $previewManager;
$this->config = $config;
@@ -85,39 +91,45 @@ class TemplateManager implements ITemplateManager {
$this->userId = $user ? $user->getUID() : null;
}
- public function registerTemplateFileCreator(TemplateFileCreator $templateType): void {
- $this->types[] = $templateType;
- }
-
- public function registerTemplateProvider(string $providerClass): void {
- $this->registeredProviders[] = $providerClass;
+ public function registerTemplateFileCreator(callable $callback): void {
+ $this->registeredTypes[] = $callback;
}
public function getRegisteredProviders(): array {
if ($this->providers !== null) {
return $this->providers;
}
+
+ $context = $this->bootstrapCoordinator->getRegistrationContext();
+
$this->providers = [];
- foreach ($this->registeredProviders as $providerClass) {
- $this->providers[$providerClass] = $this->serverContainer->get($providerClass);
+ foreach ($context->getTemplateProviders() as $provider) {
+ $this->providers[$provider['class']] = $this->serverContainer->get($provider['class']);
}
return $this->providers;
}
- public function listCreators():? array {
- if ($this->types === null) {
- return null;
+ public function getTypes(): array {
+ foreach ($this->registeredTypes as $registeredType) {
+ $this->types[] = $registeredType();
}
+ return $this->types;
+ }
- usort($this->types, function (TemplateFileCreator $a, TemplateFileCreator $b) {
+ public function listCreators(): array {
+ $types = $this->getTypes();
+ usort($types, function (TemplateFileCreator $a, TemplateFileCreator $b) {
return $a->getOrder() - $b->getOrder();
});
+ return $types;
+ }
+ public function listTemplates(): array {
return array_map(function (TemplateFileCreator $entry) {
return array_merge($entry->jsonSerialize(), [
'templates' => $this->getTemplateFiles($entry)
]);
- }, $this->types);
+ }, $this->listCreators());
}
/**
@@ -148,7 +160,7 @@ class TemplateManager implements ITemplateManager {
$template->copy($targetFile->getPath());
}
}
- $this->eventDispatcher->dispatchTyped(new CreatedFromTemplateEvent($template, $targetFile));
+ $this->eventDispatcher->dispatchTyped(new FileCreatedFromTemplateEvent($template, $targetFile));
return $this->formatFile($userFolder->get($filePath));
} catch (\Exception $e) {
$this->logger->error($e->getMessage(), ['exception' => $e]);