From 497440477492b6e7df8ca1eb6c79eb7100a2fe24 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 12 Jan 2021 11:28:04 +0100 Subject: [PATCH 01/11] files: Create files from template API MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- apps/files/appinfo/routes.php | 15 ++ .../composer/composer/autoload_classmap.php | 1 + .../composer/composer/autoload_static.php | 1 + .../lib/Controller/TemplateController.php | 76 ++++++ apps/files/lib/Controller/ViewController.php | 14 +- .../tests/Controller/ViewControllerTest.php | 10 + lib/composer/composer/autoload_classmap.php | 6 + lib/composer/composer/autoload_static.php | 6 + .../Files/Template/TemplateManager.php | 237 ++++++++++++++++++ lib/private/Server.php | 3 + lib/private/legacy/OC_Util.php | 3 + .../Template/CreatedFromTemplateEvent.php | 64 +++++ .../Template/ICustomTemplateProvider.php | 51 ++++ .../Files/Template/ITemplateManager.php | 94 +++++++ lib/public/Files/Template/Template.php | 68 +++++ .../Files/Template/TemplateFileCreator.php | 73 ++++++ 16 files changed, 721 insertions(+), 1 deletion(-) create mode 100644 apps/files/lib/Controller/TemplateController.php create mode 100644 lib/private/Files/Template/TemplateManager.php create mode 100644 lib/public/Files/Template/CreatedFromTemplateEvent.php create mode 100644 lib/public/Files/Template/ICustomTemplateProvider.php create mode 100644 lib/public/Files/Template/ITemplateManager.php create mode 100644 lib/public/Files/Template/Template.php create mode 100644 lib/public/Files/Template/TemplateFileCreator.php diff --git a/apps/files/appinfo/routes.php b/apps/files/appinfo/routes.php index 65c8deb442..03a025cadf 100644 --- a/apps/files/appinfo/routes.php +++ b/apps/files/appinfo/routes.php @@ -138,6 +138,21 @@ $application->registerRoutes( 'url' => '/api/v1/directEditing/create', 'verb' => 'POST' ], + [ + 'name' => 'Template#list', + 'url' => '/api/v1/templates', + 'verb' => 'GET' + ], + [ + 'name' => 'Template#create', + 'url' => '/api/v1/templates/create', + 'verb' => 'POST' + ], + [ + 'name' => 'Template#path', + 'url' => '/api/v1/templates/path', + 'verb' => 'POST' + ], [ 'name' => 'TransferOwnership#transfer', 'url' => '/api/v1/transferownership', diff --git a/apps/files/composer/composer/autoload_classmap.php b/apps/files/composer/composer/autoload_classmap.php index 53fccf702b..bc2e496294 100644 --- a/apps/files/composer/composer/autoload_classmap.php +++ b/apps/files/composer/composer/autoload_classmap.php @@ -35,6 +35,7 @@ return array( 'OCA\\Files\\Controller\\ApiController' => $baseDir . '/../lib/Controller/ApiController.php', 'OCA\\Files\\Controller\\DirectEditingController' => $baseDir . '/../lib/Controller/DirectEditingController.php', 'OCA\\Files\\Controller\\DirectEditingViewController' => $baseDir . '/../lib/Controller/DirectEditingViewController.php', + 'OCA\\Files\\Controller\\TemplateController' => $baseDir . '/../lib/Controller/TemplateController.php', 'OCA\\Files\\Controller\\TransferOwnershipController' => $baseDir . '/../lib/Controller/TransferOwnershipController.php', 'OCA\\Files\\Controller\\ViewController' => $baseDir . '/../lib/Controller/ViewController.php', 'OCA\\Files\\Db\\TransferOwnership' => $baseDir . '/../lib/Db/TransferOwnership.php', diff --git a/apps/files/composer/composer/autoload_static.php b/apps/files/composer/composer/autoload_static.php index 635ed27c1b..ba39b2c570 100644 --- a/apps/files/composer/composer/autoload_static.php +++ b/apps/files/composer/composer/autoload_static.php @@ -50,6 +50,7 @@ class ComposerStaticInitFiles 'OCA\\Files\\Controller\\ApiController' => __DIR__ . '/..' . '/../lib/Controller/ApiController.php', 'OCA\\Files\\Controller\\DirectEditingController' => __DIR__ . '/..' . '/../lib/Controller/DirectEditingController.php', 'OCA\\Files\\Controller\\DirectEditingViewController' => __DIR__ . '/..' . '/../lib/Controller/DirectEditingViewController.php', + 'OCA\\Files\\Controller\\TemplateController' => __DIR__ . '/..' . '/../lib/Controller/TemplateController.php', 'OCA\\Files\\Controller\\TransferOwnershipController' => __DIR__ . '/..' . '/../lib/Controller/TransferOwnershipController.php', 'OCA\\Files\\Controller\\ViewController' => __DIR__ . '/..' . '/../lib/Controller/ViewController.php', 'OCA\\Files\\Db\\TransferOwnership' => __DIR__ . '/..' . '/../lib/Db/TransferOwnership.php', diff --git a/apps/files/lib/Controller/TemplateController.php b/apps/files/lib/Controller/TemplateController.php new file mode 100644 index 0000000000..69d2790df1 --- /dev/null +++ b/apps/files/lib/Controller/TemplateController.php @@ -0,0 +1,76 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +declare(strict_types=1); + +namespace OCA\Files\Controller; + +use OCP\AppFramework\Http\DataResponse; +use OCP\AppFramework\OCS\OCSForbiddenException; +use OCP\AppFramework\OCSController; +use OCP\Files\GenericFileException; +use OCP\Files\Template\ITemplateManager; +use OCP\IRequest; + +class TemplateController extends OCSController { + protected $templateManager; + + public function __construct($appName, IRequest $request, ITemplateManager $templateManager) { + parent::__construct($appName, $request); + $this->templateManager = $templateManager; + } + + /** + * @NoAdminRequired + */ + public function list(): DataResponse { + return new DataResponse($this->templateManager->listCreators()); + } + + /** + * @NoAdminRequired + * @throws OCSForbiddenException + */ + public function create(string $filePath, string $templatePath = '', string $templateType = 'user'): DataResponse { + try { + return new DataResponse($this->templateManager->createFromTemplate($filePath, $templatePath, $templateType)); + } catch (GenericFileException $e) { + throw new OCSForbiddenException($e->getMessage()); + } + } + + /** + * @NoAdminRequired + */ + public function path(string $templatePath = '', bool $copySystemTemplates = false) { + try { + $this->templateManager->setTemplatePath($templatePath); + if ($copySystemTemplates) { + $this->templateManager->initializeTemplateDirectory($templatePath); + } + return new DataResponse(); + } catch (GenericFileException $e) { + throw new OCSForbiddenException($e->getMessage()); + } + } +} diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 364735437e..124363f07b 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -44,10 +44,12 @@ use OCP\AppFramework\Http\ContentSecurityPolicy; use OCP\AppFramework\Http\RedirectResponse; use OCP\AppFramework\Http\Response; use OCP\AppFramework\Http\TemplateResponse; +use OCP\AppFramework\Services\IInitialState; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Folder; use OCP\Files\IRootFolder; use OCP\Files\NotFoundException; +use OCP\Files\Template\ITemplateManager; use OCP\IConfig; use OCP\IL10N; use OCP\IRequest; @@ -80,6 +82,10 @@ class ViewController extends Controller { protected $rootFolder; /** @var Helper */ protected $activityHelper; + /** @var IInitialState */ + private $initialState; + /** @var ITemplateManager */ + private $templateManager; public function __construct(string $appName, IRequest $request, @@ -90,7 +96,9 @@ class ViewController extends Controller { IUserSession $userSession, IAppManager $appManager, IRootFolder $rootFolder, - Helper $activityHelper + Helper $activityHelper, + IInitialState $initialState, + ITemplateManager $templateManager ) { parent::__construct($appName, $request); $this->appName = $appName; @@ -103,6 +111,8 @@ class ViewController extends Controller { $this->appManager = $appManager; $this->rootFolder = $rootFolder; $this->activityHelper = $activityHelper; + $this->initialState = $initialState; + $this->templateManager = $templateManager; } /** @@ -283,6 +293,8 @@ class ViewController extends Controller { if (class_exists(LoadViewer::class)) { $this->eventDispatcher->dispatchTyped(new LoadViewer()); } + $this->initialState->provideInitialState('template_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : null); + $this->initialState->provideInitialState('templates', $this->templateManager->listCreators()); $params = []; $params['usedSpacePercent'] = (int) $storageInfo['relative']; diff --git a/apps/files/tests/Controller/ViewControllerTest.php b/apps/files/tests/Controller/ViewControllerTest.php index fc2b82de9c..bc233599e3 100644 --- a/apps/files/tests/Controller/ViewControllerTest.php +++ b/apps/files/tests/Controller/ViewControllerTest.php @@ -36,10 +36,12 @@ use OCA\Files\Activity\Helper; use OCA\Files\Controller\ViewController; use OCP\App\IAppManager; use OCP\AppFramework\Http; +use OCP\AppFramework\Services\IInitialState; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\File; use OCP\Files\Folder; use OCP\Files\IRootFolder; +use OCP\Files\Template\ITemplateManager; use OCP\IConfig; use OCP\IL10N; use OCP\IRequest; @@ -78,6 +80,10 @@ class ViewControllerTest extends TestCase { private $rootFolder; /** @var Helper|\PHPUnit\Framework\MockObject\MockObject */ private $activityHelper; + /** @var IInitialState|\PHPUnit\Framework\MockObject\MockObject */ + private $initialState; + /** @var ITemplateManager|\PHPUnit\Framework\MockObject\MockObject */ + private $templateManager; protected function setUp(): void { parent::setUp(); @@ -97,6 +103,8 @@ class ViewControllerTest extends TestCase { ->willReturn($this->user); $this->rootFolder = $this->getMockBuilder('\OCP\Files\IRootFolder')->getMock(); $this->activityHelper = $this->createMock(Helper::class); + $this->initialState = $this->createMock(IInitialState::class); + $this->templateManager = $this->createMock(ITemplateManager::class); $this->viewController = $this->getMockBuilder('\OCA\Files\Controller\ViewController') ->setConstructorArgs([ 'files', @@ -109,6 +117,8 @@ class ViewControllerTest extends TestCase { $this->appManager, $this->rootFolder, $this->activityHelper, + $this->initialState, + $this->templateManager, ]) ->setMethods([ 'getStorageInfo', diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php index 673d558104..63cd4db595 100644 --- a/lib/composer/composer/autoload_classmap.php +++ b/lib/composer/composer/autoload_classmap.php @@ -315,6 +315,11 @@ return array( 'OCP\\Files\\Storage\\IStorage' => $baseDir . '/lib/public/Files/Storage/IStorage.php', 'OCP\\Files\\Storage\\IStorageFactory' => $baseDir . '/lib/public/Files/Storage/IStorageFactory.php', 'OCP\\Files\\Storage\\IWriteStreamStorage' => $baseDir . '/lib/public/Files/Storage/IWriteStreamStorage.php', + 'OCP\\Files\\Template\\CreatedFromTemplateEvent' => $baseDir . '/lib/public/Files/Template/CreatedFromTemplateEvent.php', + 'OCP\\Files\\Template\\ICustomTemplateProvider' => $baseDir . '/lib/public/Files/Template/ICustomTemplateProvider.php', + 'OCP\\Files\\Template\\ITemplateManager' => $baseDir . '/lib/public/Files/Template/ITemplateManager.php', + 'OCP\\Files\\Template\\Template' => $baseDir . '/lib/public/Files/Template/Template.php', + 'OCP\\Files\\Template\\TemplateFileCreator' => $baseDir . '/lib/public/Files/Template/TemplateFileCreator.php', 'OCP\\Files\\UnseekableException' => $baseDir . '/lib/public/Files/UnseekableException.php', 'OCP\\Files_FullTextSearch\\Model\\AFilesDocument' => $baseDir . '/lib/public/Files_FullTextSearch/Model/AFilesDocument.php', 'OCP\\FullTextSearch\\Exceptions\\FullTextSearchAppNotAvailableException' => $baseDir . '/lib/public/FullTextSearch/Exceptions/FullTextSearchAppNotAvailableException.php', @@ -1125,6 +1130,7 @@ return array( 'OC\\Files\\Stream\\HashWrapper' => $baseDir . '/lib/private/Files/Stream/HashWrapper.php', 'OC\\Files\\Stream\\Quota' => $baseDir . '/lib/private/Files/Stream/Quota.php', 'OC\\Files\\Stream\\SeekableHttpStream' => $baseDir . '/lib/private/Files/Stream/SeekableHttpStream.php', + 'OC\\Files\\Template\\TemplateManager' => $baseDir . '/lib/private/Files/Template/TemplateManager.php', 'OC\\Files\\Type\\Detection' => $baseDir . '/lib/private/Files/Type/Detection.php', 'OC\\Files\\Type\\Loader' => $baseDir . '/lib/private/Files/Type/Loader.php', 'OC\\Files\\Type\\TemplateManager' => $baseDir . '/lib/private/Files/Type/TemplateManager.php', diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php index 1ee50ae6b7..6bcd72d01f 100644 --- a/lib/composer/composer/autoload_static.php +++ b/lib/composer/composer/autoload_static.php @@ -344,6 +344,11 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OCP\\Files\\Storage\\IStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IStorage.php', 'OCP\\Files\\Storage\\IStorageFactory' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IStorageFactory.php', 'OCP\\Files\\Storage\\IWriteStreamStorage' => __DIR__ . '/../../..' . '/lib/public/Files/Storage/IWriteStreamStorage.php', + 'OCP\\Files\\Template\\CreatedFromTemplateEvent' => __DIR__ . '/../../..' . '/lib/public/Files/Template/CreatedFromTemplateEvent.php', + 'OCP\\Files\\Template\\ICustomTemplateProvider' => __DIR__ . '/../../..' . '/lib/public/Files/Template/ICustomTemplateProvider.php', + 'OCP\\Files\\Template\\ITemplateManager' => __DIR__ . '/../../..' . '/lib/public/Files/Template/ITemplateManager.php', + 'OCP\\Files\\Template\\Template' => __DIR__ . '/../../..' . '/lib/public/Files/Template/Template.php', + 'OCP\\Files\\Template\\TemplateFileCreator' => __DIR__ . '/../../..' . '/lib/public/Files/Template/TemplateFileCreator.php', 'OCP\\Files\\UnseekableException' => __DIR__ . '/../../..' . '/lib/public/Files/UnseekableException.php', 'OCP\\Files_FullTextSearch\\Model\\AFilesDocument' => __DIR__ . '/../../..' . '/lib/public/Files_FullTextSearch/Model/AFilesDocument.php', 'OCP\\FullTextSearch\\Exceptions\\FullTextSearchAppNotAvailableException' => __DIR__ . '/../../..' . '/lib/public/FullTextSearch/Exceptions/FullTextSearchAppNotAvailableException.php', @@ -1154,6 +1159,7 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c 'OC\\Files\\Stream\\HashWrapper' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/HashWrapper.php', 'OC\\Files\\Stream\\Quota' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/Quota.php', 'OC\\Files\\Stream\\SeekableHttpStream' => __DIR__ . '/../../..' . '/lib/private/Files/Stream/SeekableHttpStream.php', + 'OC\\Files\\Template\\TemplateManager' => __DIR__ . '/../../..' . '/lib/private/Files/Template/TemplateManager.php', 'OC\\Files\\Type\\Detection' => __DIR__ . '/../../..' . '/lib/private/Files/Type/Detection.php', 'OC\\Files\\Type\\Loader' => __DIR__ . '/../../..' . '/lib/private/Files/Type/Loader.php', 'OC\\Files\\Type\\TemplateManager' => __DIR__ . '/../../..' . '/lib/private/Files/Type/TemplateManager.php', diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php new file mode 100644 index 0000000000..8b0c78d0b9 --- /dev/null +++ b/lib/private/Files/Template/TemplateManager.php @@ -0,0 +1,237 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +declare(strict_types=1); + + +namespace OC\Files\Template; + +use OCP\EventDispatcher\IEventDispatcher; +use OCP\Files\Folder; +use OCP\Files\File; +use OCP\Files\GenericFileException; +use OCP\Files\IRootFolder; +use OCP\Files\Node; +use OCP\Files\NotFoundException; +use OCP\Files\Template\CreatedFromTemplateEvent; +use OCP\Files\Template\ICustomTemplateProvider; +use OCP\Files\Template\ITemplateManager; +use OCP\Files\Template\Template; +use OCP\Files\Template\TemplateFileCreator; +use OCP\IConfig; +use OCP\IPreview; +use OCP\IServerContainer; +use OCP\IUserSession; +use OCP\L10N\IFactory; +use Psr\Log\LoggerInterface; + +class TemplateManager implements ITemplateManager { + private $types = []; + + private $registeredProviders = []; + private $providers; + + private $serverContainer; + private $eventDispatcher; + private $rootFolder; + private $previewManager; + private $config; + private $l10n; + private $logger; + private $userId; + + public function __construct( + IServerContainer $serverContainer, + IEventDispatcher $eventDispatcher, + IRootFolder $rootFolder, + IUserSession $userSession, + IPreview $previewManager, + IConfig $config, + IFactory $l10n, + LoggerInterface $logger + ) { + $this->serverContainer = $serverContainer; + $this->eventDispatcher = $eventDispatcher; + $this->rootFolder = $rootFolder; + $this->previewManager = $previewManager; + $this->config = $config; + $this->l10n = $l10n->get('lib'); + $this->logger = $logger; + $user = $userSession->getUser(); + $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 getRegisteredProviders(): array { + if ($this->providers !== null) { + return $this->providers; + } + $this->providers = []; + foreach ($this->registeredProviders as $providerClass) { + $this->providers[$providerClass] = $this->serverContainer->get($providerClass); + } + return $this->providers; + } + + public function listCreators(): array { + return array_map(function (TemplateFileCreator $entry) { + return array_merge($entry->jsonSerialize(), [ + 'templates' => $this->getTemplateFiles($entry) + ]); + }, $this->types); + } + + /** + * @param string $filePath + * @param string $templateId + * @return array + * @throws GenericFileException + */ + public function createFromTemplate(string $filePath, string $templateId = '', string $templateType = 'user'): array { + $userFolder = $this->rootFolder->getUserFolder($this->userId); + try { + $userFolder->get($filePath); + throw new GenericFileException($this->l10n->t('File already exists')); + } catch (NotFoundException $e) { + } + try { + $targetFile = $userFolder->newFile($filePath); + if ($templateType === 'user' && $templateId !== '') { + $template = $userFolder->get($templateId); + $template->copy($targetFile->getPath()); + } else { + $matchingProvider = array_filter($this->getRegisteredProviders(), function (ICustomTemplateProvider $provider) use ($templateType) { + return $templateType === get_class($provider); + }); + $provider = array_shift($matchingProvider); + if ($provider) { + $template = $provider->getCustomTemplate($templateId); + $template->copy($targetFile->getPath()); + } + } + $this->eventDispatcher->dispatchTyped(new CreatedFromTemplateEvent($template, $targetFile)); + return $this->formatFile($userFolder->get($filePath)); + } catch (\Exception $e) { + $this->logger->error($e->getMessage(), ['exception' => $e]); + throw new GenericFileException($this->l10n->t('Failed to create file from template')); + } + } + + /** + * @return Folder + * @throws \OCP\Files\NotFoundException + * @throws \OCP\Files\NotPermittedException + * @throws \OC\User\NoUserException + */ + private function getTemplateFolder(): Node { + return $this->rootFolder->getUserFolder($this->userId)->get($this->getTemplatePath()); + } + + private function getTemplateFiles(TemplateFileCreator $type): array { + $templates = []; + foreach ($this->getRegisteredProviders() as $provider) { + foreach ($type->getMimetypes() as $mimetype) { + foreach ($provider->getCustomTemplates($mimetype) as $template) { + $templates[] = $template; + } + } + } + try { + $userTemplateFolder = $this->getTemplateFolder(); + } catch (\Exception $e) { + return $templates; + } + foreach ($type->getMimetypes() as $mimetype) { + foreach ($userTemplateFolder->searchByMime($mimetype) as $templateFile) { + $template = new Template( + 'user', + $this->rootFolder->getUserFolder($this->userId)->getRelativePath($templateFile->getPath()), + $templateFile + ); + $template->setHasPreview($this->previewManager->isAvailable($templateFile)); + $templates[] = $template; + } + } + + return $templates; + } + + /** + * @param Node|File $file + * @return array + * @throws NotFoundException + * @throws \OCP\Files\InvalidPathException + */ + private function formatFile(Node $file): array { + return [ + 'basename' => $file->getName(), + 'etag' => $file->getEtag(), + 'fileid' => $file->getId(), + 'filename' => $this->rootFolder->getUserFolder($this->userId)->getRelativePath($file->getPath()), + 'lastmod' => $file->getMTime(), + 'mime' => $file->getMimetype(), + 'size' => $file->getSize(), + 'type' => $file->getType(), + 'hasPreview' => $this->previewManager->isAvailable($file) + ]; + } + + public function hasTemplateDirectory(): bool { + try { + $this->getTemplateFolder(); + return true; + } catch (\Exception $e) { + } + return false; + } + + public function setTemplatePath(string $path): void { + $this->config->setUserValue($this->userId, 'core', 'templateDirectory', $path); + } + + public function getTemplatePath(): string { + return $this->config->getUserValue($this->userId, 'core', 'templateDirectory', $this->l10n->t('Templates') . '/'); + } + + public function initializeTemplateDirectory(string $path = null, string $userId = null): void { + if ($userId !== null) { + $this->userId = $userId; + } + $userFolder = $this->rootFolder->getUserFolder($this->userId); + $templateDirectoryPath = $path ?? $this->l10n->t('Templates') . '/'; + try { + $userFolder->get($templateDirectoryPath); + } catch (NotFoundException $e) { + $folder = $userFolder->newFolder($templateDirectoryPath); + $folder->newFile('Testtemplate.txt'); + } + $this->setTemplatePath($templateDirectoryPath); + } +} diff --git a/lib/private/Server.php b/lib/private/Server.php index ba95416579..c0d6afbaaf 100644 --- a/lib/private/Server.php +++ b/lib/private/Server.php @@ -95,6 +95,7 @@ use OC\Files\Node\HookConnector; use OC\Files\Node\LazyRoot; use OC\Files\Node\Root; use OC\Files\Storage\StorageFactory; +use OC\Files\Template\TemplateManager; use OC\Files\Type\Loader; use OC\Files\View; use OC\FullTextSearch\FullTextSearchManager; @@ -166,6 +167,7 @@ use OCP\Files\IRootFolder; use OCP\Files\Mount\IMountManager; use OCP\Files\NotFoundException; use OCP\Files\Storage\IStorageFactory; +use OCP\Files\Template\ITemplateManager; use OCP\FullTextSearch\IFullTextSearchManager; use OCP\GlobalScale\IConfig; use OCP\Group\Events\BeforeGroupCreatedEvent; @@ -289,6 +291,7 @@ class Server extends ServerContainer implements IServerContainer { $this->registerDeprecatedAlias('ContactsManager', \OCP\Contacts\IManager::class); $this->registerAlias(\OCP\DirectEditing\IManager::class, \OC\DirectEditing\Manager::class); + $this->registerAlias(ITemplateManager::class, TemplateManager::class); $this->registerAlias(IActionFactory::class, ActionFactory::class); diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index d5805719ea..16e68b07cf 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -66,6 +66,7 @@ use bantu\IniGetWrapper\IniGetWrapper; use OC\AppFramework\Http\Request; use OC\Files\Storage\LocalRootStorage; +use OCP\Files\Template\ITemplateManager; use OCP\IConfig; use OCP\IGroupManager; use OCP\ILogger; @@ -447,6 +448,8 @@ class OC_Util { self::copyr($skeletonDirectory, $userDirectory); // update the file cache $userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE); + $templateManaer = \OC::$server->get(ITemplateManager::class); + $templateManaer->initializeTemplateDirectory(null, $userId); } } diff --git a/lib/public/Files/Template/CreatedFromTemplateEvent.php b/lib/public/Files/Template/CreatedFromTemplateEvent.php new file mode 100644 index 0000000000..8d80281440 --- /dev/null +++ b/lib/public/Files/Template/CreatedFromTemplateEvent.php @@ -0,0 +1,64 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +declare(strict_types=1); + + +namespace OCP\Files\Template; + +use OCP\EventDispatcher\Event; +use OCP\Files\File; + +/** + * @since 21.0.0 + */ +class CreatedFromTemplateEvent extends Event { + private $template; + private $target; + + /** + * @param File|null $template + * @param File $target + * @since 21.0.0 + */ + public function __construct(?File $template, File $target) { + $this->template = $template; + $this->target = $target; + } + + /** + * @return File|null + * @since 21.0.0 + */ + public function getTemplate(): ?File { + return $this->template; + } + + /** + * @return File + * @since 21.0.0 + */ + public function getTarget(): File { + return $this->target; + } +} diff --git a/lib/public/Files/Template/ICustomTemplateProvider.php b/lib/public/Files/Template/ICustomTemplateProvider.php new file mode 100644 index 0000000000..a14ea86a10 --- /dev/null +++ b/lib/public/Files/Template/ICustomTemplateProvider.php @@ -0,0 +1,51 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +declare(strict_types=1); + + +namespace OCP\Files\Template; + +use OCP\Files\File; + +/** + * @since 21.0.0 + */ +interface ICustomTemplateProvider { + /** + * Return a list of additional templates that the template provider is offering + * + * @return File[] + * @since 21.0.0 + */ + public function getCustomTemplates(string $mimetype): array; + + /** + * Return the file for a given template id + * + * @param string $template identifier of the template + * @return File + * @since 21.0.0 + */ + public function getCustomTemplate(string $template): File; +} diff --git a/lib/public/Files/Template/ITemplateManager.php b/lib/public/Files/Template/ITemplateManager.php new file mode 100644 index 0000000000..61dbb68cd7 --- /dev/null +++ b/lib/public/Files/Template/ITemplateManager.php @@ -0,0 +1,94 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +declare(strict_types=1); + + +namespace OCP\Files\Template; + +use OCP\Files\GenericFileException; + +/** + * @since 21.0.0 + */ +interface ITemplateManager { + + /** + * Register a template type support + * + * @param TemplateFileCreator $templateType + * @since 21.0.0 + */ + public function registerTemplateFileCreator(TemplateFileCreator $templateType): void; + + /** + * Register a custom template provider class that is able to inject custom templates + * in addition to the user defined ones + * + * @param string $providerClass + * @since 21.0.0 + */ + public function registerTemplateProvider(string $providerClass): void; + + /** + * Get a list of available file creators and their offered templates + * + * @return array + * @since 21.0.0 + */ + public function listCreators(): array; + + /** + * @return bool + * @since 21.0.0 + */ + public function hasTemplateDirectory(): bool; + + /** + * @param string $path + * @return void + * @since 21.0.0 + */ + public function setTemplatePath(string $path): void; + + /** + * @return string + * @since 21.0.0 + */ + public function getTemplatePath(): string; + + /** + * @param string $path + * @since 21.0.0 + */ + public function initializeTemplateDirectory(string $path): void; + + /** + * @param string $filePath + * @param string $templateId + * @return array + * @throws GenericFileException + * @since 21.0.0 + */ + public function createFromTemplate(string $filePath, string $templateId = '', string $templateType = 'user'): array; +} diff --git a/lib/public/Files/Template/Template.php b/lib/public/Files/Template/Template.php new file mode 100644 index 0000000000..b5b90e01f8 --- /dev/null +++ b/lib/public/Files/Template/Template.php @@ -0,0 +1,68 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +declare(strict_types=1); + + +namespace OCP\Files\Template; + +use OCP\Files\File; + +class Template implements \JsonSerializable { + protected $templateType; + protected $templateId; + protected $file; + protected $hasPreview = false; + protected $previewUrl; + + final public function __construct(string $templateType, string $templateId, File $file) { + $this->templateType = $templateType; + $this->templateId = $templateId; + $this->file = $file; + } + + final public function setCustomPreviewUrl(string $previewUrl): void { + $this->previewUrl = $previewUrl; + } + + final public function setHasPreview(bool $hasPreview): void { + $this->hasPreview = $hasPreview; + } + + final public function jsonSerialize() { + return [ + 'templateType' => $this->templateType, + 'templateId' => $this->templateId, + 'basename' => $this->file->getName(), + 'etag' => $this->file->getEtag(), + 'fileid' => $this->file->getId(), + 'filename' => $this->templateId, + 'lastmod' => $this->file->getMTime(), + 'mime' => $this->file->getMimetype(), + 'size' => $this->file->getSize(), + 'type' => $this->file->getType(), + 'hasPreview' => $this->hasPreview, + 'previewUrl' => $this->previewUrl + ]; + } +} diff --git a/lib/public/Files/Template/TemplateFileCreator.php b/lib/public/Files/Template/TemplateFileCreator.php new file mode 100644 index 0000000000..eeca2f0c01 --- /dev/null +++ b/lib/public/Files/Template/TemplateFileCreator.php @@ -0,0 +1,73 @@ + + * + * @author Julius Härtl + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +declare(strict_types=1); + +namespace OCP\Files\Template; + +/** + * @since 21.0.0 + */ +final class TemplateFileCreator implements \JsonSerializable { + protected $appId; + protected $mimetypes = []; + protected $actionName; + protected $fileExtension; + protected $iconClass; + + public function __construct( + string $appId, string $actionName, string $fileExtension + ) { + $this->appId = $appId; + $this->actionName = $actionName; + $this->fileExtension = $fileExtension; + } + + public function getAppId(): string { + return $this->appId; + } + + public function setIconClass(string $iconClass): TemplateFileCreator { + $this->iconClass = $iconClass; + return $this; + } + + public function addMimetype(string $mimetype): TemplateFileCreator { + $this->mimetypes[] = $mimetype; + return $this; + } + + public function getMimetypes(): array { + return $this->mimetypes; + } + + public function jsonSerialize() { + return [ + 'app' => $this->appId, + 'label' => $this->actionName, + 'extension' => $this->fileExtension, + 'iconClass' => $this->iconClass, + 'mimetypes' => $this->mimetypes + ]; + } +} From 78e114ed72a01e3c37fe0e955ffe6ef649782575 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Thu, 14 Jan 2021 13:31:15 +0100 Subject: [PATCH 02/11] Add template picker MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .../lib/Controller/TemplateController.php | 2 +- apps/files/lib/Controller/ViewController.php | 1 + .../lib/Event/LoadAdditionalScriptsEvent.php | 3 +- apps/files/src/components/TemplatePreview.vue | 203 +++++++++++++ apps/files/src/templates.js | 92 ++++++ apps/files/src/utils/davUtils.js | 42 +++ apps/files/src/utils/fileUtils.js | 53 ++++ apps/files/src/views/TemplatePicker.vue | 268 ++++++++++++++++++ apps/files/webpack.js | 3 +- .../Files/Template/TemplateManager.php | 2 +- .../Files/Template/ITemplateManager.php | 2 +- 11 files changed, 666 insertions(+), 5 deletions(-) create mode 100644 apps/files/src/components/TemplatePreview.vue create mode 100644 apps/files/src/templates.js create mode 100644 apps/files/src/utils/davUtils.js create mode 100644 apps/files/src/utils/fileUtils.js create mode 100644 apps/files/src/views/TemplatePicker.vue diff --git a/apps/files/lib/Controller/TemplateController.php b/apps/files/lib/Controller/TemplateController.php index 69d2790df1..08a324a46e 100644 --- a/apps/files/lib/Controller/TemplateController.php +++ b/apps/files/lib/Controller/TemplateController.php @@ -1,5 +1,5 @@ * * @author Julius Härtl diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 124363f07b..846ec14c4a 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -190,6 +190,7 @@ class ViewController extends Controller { // Load the files we need \OCP\Util::addStyle('files', 'merged'); \OCP\Util::addScript('files', 'merged-index'); + \OCP\Util::addScript('files', 'dist/templates'); // mostly for the home storage's free space // FIXME: Make non static diff --git a/apps/files/lib/Event/LoadAdditionalScriptsEvent.php b/apps/files/lib/Event/LoadAdditionalScriptsEvent.php index de222ccc55..e5943c6f89 100644 --- a/apps/files/lib/Event/LoadAdditionalScriptsEvent.php +++ b/apps/files/lib/Event/LoadAdditionalScriptsEvent.php @@ -30,7 +30,8 @@ namespace OCA\Files\Event; use OCP\EventDispatcher\Event; /** - * This event is triggered when the files app is rendered. It canb e used to add additional scripts to the files app. + * This event is triggered when the files app is rendered. + * It can be used to add additional scripts to the files app. * * @since 17.0.0 */ diff --git a/apps/files/src/components/TemplatePreview.vue b/apps/files/src/components/TemplatePreview.vue new file mode 100644 index 0000000000..538e1bcff7 --- /dev/null +++ b/apps/files/src/components/TemplatePreview.vue @@ -0,0 +1,203 @@ + + + + + + + diff --git a/apps/files/src/templates.js b/apps/files/src/templates.js new file mode 100644 index 0000000000..3cffc30085 --- /dev/null +++ b/apps/files/src/templates.js @@ -0,0 +1,92 @@ +/** + * @copyright Copyright (c) 2020 John Molakvoæ + * + * @author John Molakvoæ + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +import { getLoggerBuilder } from '@nextcloud/logger' +import { loadState } from '@nextcloud/initial-state' +import { translate as t, translatePlural as n } from '@nextcloud/l10n' +import Vue from 'vue' + +import TemplatePickerView from './views/TemplatePicker' + +// Set up logger +const logger = getLoggerBuilder() + .setApp('files') + .detectUser() + .build() + +// Add translates functions +Vue.mixin({ + methods: { + t, + n, + }, +}) + +// Create document root +const TemplatePickerRoot = document.createElement('div') +TemplatePickerRoot.id = 'template-picker' +document.body.appendChild(TemplatePickerRoot) + +// Retrieve and init templates +const templates = loadState('files', 'templates', []) +logger.debug('Templates providers', templates) + +// Init vue app +const View = Vue.extend(TemplatePickerView) +const TemplatePicker = new View({ + name: 'TemplatePicker', + propsData: { + logger, + }, +}) +TemplatePicker.$mount('#template-picker') + +// Init template engine after load +window.addEventListener('DOMContentLoaded', function() { + // Init template files menu + templates.forEach((provider, index) => { + + const newTemplatePlugin = { + attach(menu) { + const fileList = menu.fileList + + // only attach to main file list, public view is not supported yet + if (fileList.id !== 'files' && fileList.id !== 'files.public') { + return + } + + // register the new menu entry + menu.addMenuEntry({ + id: `template-new-${provider.app}-${index}`, + displayName: provider.label, + templateName: provider.label + provider.extension, + iconClass: provider.iconClass || 'icon-file', + fileType: 'file', + actionHandler(name) { + TemplatePicker.open(name, provider) + }, + }) + }, + } + OC.Plugins.register('OCA.Files.NewFileMenu', newTemplatePlugin) + }) +}) diff --git a/apps/files/src/utils/davUtils.js b/apps/files/src/utils/davUtils.js new file mode 100644 index 0000000000..f64801f08d --- /dev/null +++ b/apps/files/src/utils/davUtils.js @@ -0,0 +1,42 @@ +/** + * @copyright Copyright (c) 2019 John Molakvoæ + * + * @author John Molakvoæ + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +import { generateRemoteUrl } from '@nextcloud/router' +import { getCurrentUser } from '@nextcloud/auth' + +const getRootPath = function() { + if (getCurrentUser()) { + return generateRemoteUrl(`dav/files/${getCurrentUser().uid}`) + } else { + return generateRemoteUrl('webdav').replace('/remote.php', '/public.php') + } +} + +const isPublic = function() { + return !getCurrentUser() +} + +const getToken = function() { + return document.getElementById('sharingToken') && document.getElementById('sharingToken').value +} + +export { getRootPath, getToken, isPublic } diff --git a/apps/files/src/utils/fileUtils.js b/apps/files/src/utils/fileUtils.js new file mode 100644 index 0000000000..97d1c33356 --- /dev/null +++ b/apps/files/src/utils/fileUtils.js @@ -0,0 +1,53 @@ +/** + * @copyright Copyright (c) 2021 John Molakvoæ + * + * @author John Molakvoæ + * + * @license GNU AGPL version 3 or any later version + * + * This program is free software: you can redistribute it and/or modify + * it under the terms of the GNU Affero General Public License as + * published by the Free Software Foundation, either version 3 of the + * License, or (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU Affero General Public License for more details. + * + * You should have received a copy of the GNU Affero General Public License + * along with this program. If not, see . + * + */ + +/** + * Get an url encoded path + * + * @param {String} path the full path + * @returns {string} url encoded file path + */ +const encodeFilePath = function(path) { + const pathSections = (path.startsWith('/') ? path : `/${path}`).split('/') + let relativePath = '' + pathSections.forEach((section) => { + if (section !== '') { + relativePath += '/' + encodeURIComponent(section) + } + }) + return relativePath +} + +/** + * Extract dir and name from file path + * + * @param {String} path the full path + * @returns {String[]} [dirPath, fileName] + */ +const extractFilePaths = function(path) { + const pathSections = path.split('/') + const fileName = pathSections[pathSections.length - 1] + const dirPath = pathSections.slice(0, pathSections.length - 1).join('/') + return [dirPath, fileName] +} + +export { encodeFilePath, extractFilePaths } diff --git a/apps/files/src/views/TemplatePicker.vue b/apps/files/src/views/TemplatePicker.vue new file mode 100644 index 0000000000..84c7c38aba --- /dev/null +++ b/apps/files/src/views/TemplatePicker.vue @@ -0,0 +1,268 @@ + + + + + + + diff --git a/apps/files/webpack.js b/apps/files/webpack.js index 0c16e47653..8dbbad5081 100644 --- a/apps/files/webpack.js +++ b/apps/files/webpack.js @@ -2,7 +2,8 @@ const path = require('path'); module.exports = { entry: { - 'sidebar': path.join(__dirname, 'src', 'sidebar.js'), + sidebar: path.join(__dirname, 'src', 'sidebar.js'), + templates: path.join(__dirname, 'src', 'templates.js'), 'files-app-settings': path.join(__dirname, 'src', 'files-app-settings.js'), 'personal-settings': path.join(__dirname, 'src', 'main-personal-settings.js'), }, diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php index 8b0c78d0b9..3b033a4404 100644 --- a/lib/private/Files/Template/TemplateManager.php +++ b/lib/private/Files/Template/TemplateManager.php @@ -1,5 +1,5 @@ * * @author Julius Härtl diff --git a/lib/public/Files/Template/ITemplateManager.php b/lib/public/Files/Template/ITemplateManager.php index 61dbb68cd7..94545c17b4 100644 --- a/lib/public/Files/Template/ITemplateManager.php +++ b/lib/public/Files/Template/ITemplateManager.php @@ -1,5 +1,5 @@ * * @author Julius Härtl From 66fa3fca8323fe763e4177cc31d3f535802e976a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Mon, 18 Jan 2021 16:11:09 +0100 Subject: [PATCH 03/11] Add ratio to template creators MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- .../Files/Template/TemplateFileCreator.php | 30 ++++++++++++++++++- 1 file changed, 29 insertions(+), 1 deletion(-) diff --git a/lib/public/Files/Template/TemplateFileCreator.php b/lib/public/Files/Template/TemplateFileCreator.php index eeca2f0c01..c41a6514ee 100644 --- a/lib/public/Files/Template/TemplateFileCreator.php +++ b/lib/public/Files/Template/TemplateFileCreator.php @@ -34,7 +34,11 @@ final class TemplateFileCreator implements \JsonSerializable { protected $actionName; protected $fileExtension; protected $iconClass; + protected $ratio = null; + /** + * @since 21.0.0 + */ public function __construct( string $appId, string $actionName, string $fileExtension ) { @@ -43,31 +47,55 @@ final class TemplateFileCreator implements \JsonSerializable { $this->fileExtension = $fileExtension; } + /** + * @since 21.0.0 + */ public function getAppId(): string { return $this->appId; } + /** + * @since 21.0.0 + */ public function setIconClass(string $iconClass): TemplateFileCreator { $this->iconClass = $iconClass; return $this; } + /** + * @since 21.0.0 + */ public function addMimetype(string $mimetype): TemplateFileCreator { $this->mimetypes[] = $mimetype; return $this; } + /** + * @since 21.0.0 + */ public function getMimetypes(): array { return $this->mimetypes; } + /** + * @since 21.0.0 + */ + public function setRatio(float $ratio) { + $this->ratio = $ratio; + return $this; + } + + /** + * @since 21.0.0 + */ public function jsonSerialize() { return [ 'app' => $this->appId, 'label' => $this->actionName, 'extension' => $this->fileExtension, 'iconClass' => $this->iconClass, - 'mimetypes' => $this->mimetypes + 'mimetypes' => $this->mimetypes, + 'ratio' => $this->ratio ]; } } From 7e6d69d166cbc92fb457fc72efc9abe850a0bbe4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Julius=20H=C3=A4rtl?= Date: Tue, 19 Jan 2021 11:20:50 +0100 Subject: [PATCH 04/11] Add templatedirectory config value to let admins have their custom templates by default MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Julius Härtl --- config/config.sample.php | 15 ++++ .../Files/Template/TemplateManager.php | 73 ++++++++++++++++--- lib/private/legacy/OC_Util.php | 12 +-- .../Files/Template/ITemplateManager.php | 5 +- lib/public/Files/Template/Template.php | 15 ++++ 5 files changed, 104 insertions(+), 16 deletions(-) diff --git a/config/config.sample.php b/config/config.sample.php index 216a32c8eb..9824749a25 100644 --- a/config/config.sample.php +++ b/config/config.sample.php @@ -317,6 +317,21 @@ $CONFIG = [ */ 'skeletondirectory' => '/path/to/nextcloud/core/skeleton', + +/** + * The directory where the template files are located. These files will be + * copied to the template directory of new users. Leave empty to not copy any + * template files. + * ``{lang}`` can be used as a placeholder for the language of the user. + * If the directory does not exist, it falls back to non dialect (from ``de_DE`` + * to ``de``). If that does not exist either, it falls back to ``default`` + * + * If this is not set creating a template directory will only happen if no custom + * ``skeletondirectory`` is defined, otherwise the shipped templates will be used + * to create a template directory for the user. + */ +'templatesdirectory' => '/path/to/nextcloud/templates', + /** * If your user backend does not allow password resets (e.g. when it's a * read-only user backend like LDAP), you can specify a custom link, where the diff --git a/lib/private/Files/Template/TemplateManager.php b/lib/private/Files/Template/TemplateManager.php index 3b033a4404..614440327e 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\Files\Cache\Scanner; use OCP\EventDispatcher\IEventDispatcher; use OCP\Files\Folder; use OCP\Files\File; @@ -59,6 +60,7 @@ class TemplateManager implements ITemplateManager { private $l10n; private $logger; private $userId; + private $l10nFactory; public function __construct( IServerContainer $serverContainer, @@ -67,7 +69,7 @@ class TemplateManager implements ITemplateManager { IUserSession $userSession, IPreview $previewManager, IConfig $config, - IFactory $l10n, + IFactory $l10nFactory, LoggerInterface $logger ) { $this->serverContainer = $serverContainer; @@ -75,7 +77,8 @@ class TemplateManager implements ITemplateManager { $this->rootFolder = $rootFolder; $this->previewManager = $previewManager; $this->config = $config; - $this->l10n = $l10n->get('lib'); + $this->l10nFactory = $l10nFactory; + $this->l10n = $l10nFactory->get('lib'); $this->logger = $logger; $user = $userSession->getUser(); $this->userId = $user ? $user->getUID() : null; @@ -224,14 +227,66 @@ class TemplateManager implements ITemplateManager { if ($userId !== null) { $this->userId = $userId; } - $userFolder = $this->rootFolder->getUserFolder($this->userId); - $templateDirectoryPath = $path ?? $this->l10n->t('Templates') . '/'; + + $defaultSkeletonDirectory = \OC::$SERVERROOT . '/core/skeleton'; + $defaultTemplateDirectory = \OC::$SERVERROOT . '/core/skeleton/Templates'; + $skeletonPath = $this->config->getSystemValue('skeletondirectory', $defaultSkeletonDirectory); + $skeletonTemplatePath = $this->config->getSystemValue('templatedirectory', $defaultTemplateDirectory); + $userLang = $this->l10nFactory->getUserLanguage(); + try { - $userFolder->get($templateDirectoryPath); - } catch (NotFoundException $e) { - $folder = $userFolder->newFolder($templateDirectoryPath); - $folder->newFile('Testtemplate.txt'); + $l10n = $this->l10nFactory->get('lib', $userLang); + $userFolder = $this->rootFolder->getUserFolder($this->userId); + $userTemplatePath = $path ?? $l10n->t('Templates') . '/'; + + // All locations are default so we just need to rename the directory to the users language + if ($skeletonPath === $defaultSkeletonDirectory && $skeletonTemplatePath === $defaultTemplateDirectory && $userFolder->nodeExists('Templates')) { + $newPath = $userFolder->getPath() . '/' . $userTemplatePath; + if ($newPath !== $userFolder->get('Templates')->getPath()) { + $userFolder->get('Templates')->move($newPath); + } + $this->setTemplatePath($userTemplatePath); + return; + } + + // A custom template directory is specified + if (!empty($skeletonTemplatePath) && $skeletonTemplatePath !== $defaultTemplateDirectory) { + // In case the shipped template files are in place we remove them + if ($skeletonPath === $defaultSkeletonDirectory && $userFolder->nodeExists('Templates')) { + $shippedSkeletonTemplates = $userFolder->get('Templates'); + $shippedSkeletonTemplates->delete(); + } + try { + $userFolder->get($userTemplatePath); + } catch (NotFoundException $e) { + $folder = $userFolder->newFolder($userTemplatePath); + + $localizedSkeletonTemplatePath = $this->getLocalizedTemplatePath($skeletonTemplatePath, $userLang); + if (!empty($localizedSkeletonTemplatePath) && file_exists($localizedSkeletonTemplatePath)) { + \OC_Util::copyr($localizedSkeletonTemplatePath, $folder); + $userFolder->getStorage()->getScanner()->scan($userTemplatePath, Scanner::SCAN_RECURSIVE); + } + } + $this->setTemplatePath($userTemplatePath); + } + } catch (\Throwable $e) { + $this->logger->error('Failed to rename templates directory to user language ' . $userLang . ' for ' . $userId, ['app' => 'files_templates']); } - $this->setTemplatePath($templateDirectoryPath); + } + + private function getLocalizedTemplatePath(string $skeletonTemplatePath, string $userLang) { + $localizedSkeletonTemplatePath = str_replace('{lang}', $userLang, $skeletonTemplatePath); + + if (!file_exists($localizedSkeletonTemplatePath)) { + $dialectStart = strpos($userLang, '_'); + if ($dialectStart !== false) { + $localizedSkeletonTemplatePath = str_replace('{lang}', substr($userLang, 0, $dialectStart), $skeletonTemplatePath); + } + if ($dialectStart === false || !file_exists($localizedSkeletonTemplatePath)) { + $localizedSkeletonTemplatePath = str_replace('{lang}', 'default', $skeletonTemplatePath); + } + } + + return $localizedSkeletonTemplatePath; } } diff --git a/lib/private/legacy/OC_Util.php b/lib/private/legacy/OC_Util.php index 16e68b07cf..05d54cf84e 100644 --- a/lib/private/legacy/OC_Util.php +++ b/lib/private/legacy/OC_Util.php @@ -72,6 +72,7 @@ use OCP\IGroupManager; use OCP\ILogger; use OCP\IUser; use OCP\IUserSession; +use Psr\Log\LoggerInterface; class OC_Util { public static $scripts = []; @@ -412,6 +413,9 @@ class OC_Util { * @suppress PhanDeprecatedFunction */ public static function copySkeleton($userId, \OCP\Files\Folder $userDirectory) { + /** @var LoggerInterface $logger */ + $logger = \OC::$server->get(LoggerInterface::class); + $plainSkeletonDirectory = \OC::$server->getConfig()->getSystemValue('skeletondirectory', \OC::$SERVERROOT . '/core/skeleton'); $userLang = \OC::$server->getL10NFactory()->findLanguage(); $skeletonDirectory = str_replace('{lang}', $userLang, $plainSkeletonDirectory); @@ -440,14 +444,12 @@ class OC_Util { } if (!empty($skeletonDirectory)) { - \OCP\Util::writeLog( - 'files_skeleton', - 'copying skeleton for '.$userId.' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'), - ILogger::DEBUG - ); + $logger->debug('copying skeleton for '.$userId.' from '.$skeletonDirectory.' to '.$userDirectory->getFullPath('/'), ['app' => 'files_skeleton']); self::copyr($skeletonDirectory, $userDirectory); // update the file cache $userDirectory->getStorage()->getScanner()->scan('', \OC\Files\Cache\Scanner::SCAN_RECURSIVE); + + /** @var ITemplateManager $templateManaer */ $templateManaer = \OC::$server->get(ITemplateManager::class); $templateManaer->initializeTemplateDirectory(null, $userId); } diff --git a/lib/public/Files/Template/ITemplateManager.php b/lib/public/Files/Template/ITemplateManager.php index 94545c17b4..28d57a8b94 100644 --- a/lib/public/Files/Template/ITemplateManager.php +++ b/lib/public/Files/Template/ITemplateManager.php @@ -78,10 +78,11 @@ interface ITemplateManager { public function getTemplatePath(): string; /** - * @param string $path + * @param string|null $path + * @param string|null $userId * @since 21.0.0 */ - public function initializeTemplateDirectory(string $path): void; + public function initializeTemplateDirectory(string $path = null, string $userId = null): void; /** * @param string $filePath diff --git a/lib/public/Files/Template/Template.php b/lib/public/Files/Template/Template.php index b5b90e01f8..28fd00d0f8 100644 --- a/lib/public/Files/Template/Template.php +++ b/lib/public/Files/Template/Template.php @@ -28,6 +28,9 @@ namespace OCP\Files\Template; use OCP\Files\File; +/** + * @since 21.0.0 + */ class Template implements \JsonSerializable { protected $templateType; protected $templateId; @@ -35,20 +38,32 @@ class Template implements \JsonSerializable { protected $hasPreview = false; protected $previewUrl; + /** + * @since 21.0.0 + */ final public function __construct(string $templateType, string $templateId, File $file) { $this->templateType = $templateType; $this->templateId = $templateId; $this->file = $file; } + /** + * @since 21.0.0 + */ final public function setCustomPreviewUrl(string $previewUrl): void { $this->previewUrl = $previewUrl; } + /** + * @since 21.0.0 + */ final public function setHasPreview(bool $hasPreview): void { $this->hasPreview = $hasPreview; } + /** + * @since 21.0.0 + */ final public function jsonSerialize() { return [ 'templateType' => $this->templateType, From 4f90766ba314171bbfc78d1e988307c50633e7f3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Tue, 19 Jan 2021 16:38:51 +0100 Subject: [PATCH 05/11] Skip template picker if none available MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- .../lib/Controller/TemplateController.php | 12 +-- apps/files/lib/Controller/ViewController.php | 2 +- apps/files/src/components/TemplatePreview.vue | 45 ++++++--- apps/files/src/services/Templates.js | 29 ++++++ apps/files/src/templates.js | 91 +++++++++++++---- apps/files/src/utils/davUtils.js | 18 +++- apps/files/src/views/TemplatePicker.vue | 72 +++++++++----- core/css/css-variables.scss | 3 + core/css/icons.scss | 1 + core/img/actions/template-add.svg | 1 + .../Files/Template/TemplateManager.php | 97 +++++++++++++------ lib/private/legacy/OC_Util.php | 6 +- .../Files/Template/ITemplateManager.php | 4 +- .../Files/Template/TemplateFileCreator.php | 19 +++- 14 files changed, 295 insertions(+), 105 deletions(-) create mode 100644 apps/files/src/services/Templates.js create mode 100644 core/img/actions/template-add.svg diff --git a/apps/files/lib/Controller/TemplateController.php b/apps/files/lib/Controller/TemplateController.php index 08a324a46e..5a16334322 100644 --- a/apps/files/lib/Controller/TemplateController.php +++ b/apps/files/lib/Controller/TemplateController.php @@ -64,12 +64,12 @@ class TemplateController extends OCSController { */ public function path(string $templatePath = '', bool $copySystemTemplates = false) { try { - $this->templateManager->setTemplatePath($templatePath); - if ($copySystemTemplates) { - $this->templateManager->initializeTemplateDirectory($templatePath); - } - return new DataResponse(); - } catch (GenericFileException $e) { + $templatePath = $this->templateManager->initializeTemplateDirectory($templatePath, null, $copySystemTemplates); + return new DataResponse([ + 'template_path' => $templatePath, + 'templates' => $this->templateManager->listCreators() + ]); + } catch (\Exception $e) { throw new OCSForbiddenException($e->getMessage()); } } diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 846ec14c4a..aade5a5b44 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -294,7 +294,7 @@ class ViewController extends Controller { if (class_exists(LoadViewer::class)) { $this->eventDispatcher->dispatchTyped(new LoadViewer()); } - $this->initialState->provideInitialState('template_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : null); + $this->initialState->provideInitialState('templates_path', $this->templateManager->hasTemplateDirectory() ? $this->templateManager->getTemplatePath() : null); $this->initialState->provideInitialState('templates', $this->templateManager->listCreators()); $params = []; diff --git a/apps/files/src/components/TemplatePreview.vue b/apps/files/src/components/TemplatePreview.vue index 538e1bcff7..89162ba4ef 100644 --- a/apps/files/src/components/TemplatePreview.vue +++ b/apps/files/src/components/TemplatePreview.vue @@ -30,9 +30,9 @@ @change="onCheck">