Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/richdocuments.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--assets/document.ottbin0 -> 7747 bytes
-rw-r--r--assets/presentation.otpbin0 -> 13732 bytes
-rw-r--r--assets/spreadsheet.otsbin0 -> 6855 bytes
-rw-r--r--lib/Controller/OCSController.php9
-rw-r--r--lib/Controller/TemplatesController.php8
-rw-r--r--lib/TemplateManager.php128
6 files changed, 118 insertions, 27 deletions
diff --git a/assets/document.ott b/assets/document.ott
new file mode 100644
index 00000000..3c0e09e1
--- /dev/null
+++ b/assets/document.ott
Binary files differ
diff --git a/assets/presentation.otp b/assets/presentation.otp
new file mode 100644
index 00000000..33525d36
--- /dev/null
+++ b/assets/presentation.otp
Binary files differ
diff --git a/assets/spreadsheet.ots b/assets/spreadsheet.ots
new file mode 100644
index 00000000..1a6373cd
--- /dev/null
+++ b/assets/spreadsheet.ots
Binary files differ
diff --git a/lib/Controller/OCSController.php b/lib/Controller/OCSController.php
index d31fe170..1b8f2883 100644
--- a/lib/Controller/OCSController.php
+++ b/lib/Controller/OCSController.php
@@ -125,13 +125,8 @@ class OCSController extends \OCP\AppFramework\OCSController {
*/
public function getTemplates(string $type): DataResponse {
if (array_key_exists($type, TemplateManager::$tplTypes)) {
- $templates = $this->manager->getAll($type);
-
- $data = array_map(function(File $file) {
- return $this->manager->formatNodeReturn($file);
- }, $templates);
-
- return new DataResponse($data);
+ $templates = $this->manager->getAllFormatted($type);
+ return new DataResponse($templates);
}
throw new OCSBadRequestException('Wrong type');
}
diff --git a/lib/Controller/TemplatesController.php b/lib/Controller/TemplatesController.php
index 046a4c31..646e0561 100644
--- a/lib/Controller/TemplatesController.php
+++ b/lib/Controller/TemplatesController.php
@@ -195,10 +195,10 @@ class TemplatesController extends Controller {
*/
private function fetchPreview(
Node $node,
- int $x,
- int $y,
- bool $a = false,
- bool $forceIcon = true,
+ $x,
+ $y,
+ $a = false,
+ $forceIcon = true,
string $mode): Http\Response {
if (!($node instanceof Node) || (!$forceIcon && !$this->preview->isAvailable($node))) {
diff --git a/lib/TemplateManager.php b/lib/TemplateManager.php
index 0db4465e..87150a7a 100644
--- a/lib/TemplateManager.php
+++ b/lib/TemplateManager.php
@@ -30,6 +30,7 @@ use OCP\Files\IRootFolder;
use OCP\Files\Node;
use OCP\Files\NotFoundException;
use OCP\IConfig;
+use OCP\IL10N;
use OCP\IPreview;
use OCP\IURLGenerator;
use OC\Files\AppData\Factory;
@@ -51,6 +52,9 @@ class TemplateManager {
/** @var IRootFolder */
private $rootFolder;
+ /** @var IL10N */
+ private $l;
+
/** Accepted templates mime types */
const MIMES_DOCUMENTS = [
'application/vnd.oasis.opendocument.text-template'
@@ -69,6 +73,18 @@ class TemplateManager {
'presentation' => self::MIMES_PRESENTATIONS
];
+ const EMPTY_TEMPLATE_ID_TYPE = [
+ -1 => 'document',
+ -2 => 'spreadsheet',
+ -3 => 'presentation',
+ ];
+ const EMPTY_TEMPLATE_TYPE_ID = [
+ 'document' => -1,
+ 'spreadsheet' => -2,
+ 'presentation' => -3,
+ ];
+
+
/**
* Template manager
*
@@ -78,14 +94,16 @@ class TemplateManager {
* @param Factory $appDataFactory
* @param IURLGenerator $urlGenerator
* @param IRootFolder $rootFolder
- * @param IPreview $previewManager
+ * @param IL10N $l
+ * @throws \OCP\Files\NotPermittedException
*/
public function __construct($appName,
$userId,
IConfig $config,
Factory $appDataFactory,
IURLGenerator $urlGenerator,
- IRootFolder $rootFolder) {
+ IRootFolder $rootFolder,
+ IL10N $l) {
$this->appName = $appName;
$this->userId = $userId;
$this->config = $config;
@@ -103,6 +121,13 @@ class TemplateManager {
} catch (NotFoundException $e) {
$appData->newFolder('templates');
}
+ try {
+ $appData->getFolder('empty_templates');
+ } catch (NotFoundException $e) {
+ $appData->newFolder('empty_templates');
+ }
+
+ $this->l = $l;
}
/**
@@ -113,6 +138,15 @@ class TemplateManager {
*/
public function get($fileId) {
// is this a global template ?
+ $files = $this->getEmptyTemplateDir()->getDirectoryListing();
+
+ foreach ($files as $file) {
+ if ($file->getId() === $fileId) {
+ return $file;
+ }
+ }
+
+ // is this a global template ?
$files = $this->getSystemTemplateDir()->getDirectoryListing();
foreach ($files as $file) {
@@ -135,39 +169,73 @@ class TemplateManager {
* @param File[] $templates
* @return File[]
*/
- private function filterTemplates($templates) {
- return array_filter($templates, function (Node $templateFile) {
+ private function filterTemplates($templates, $type) {
+ return array_filter($templates, function (Node $templateFile) use ($type) {
if (!($templateFile instanceof File)) {
return false;
}
+ if (!in_array($templateFile->getMimeType(), self::$tplTypes[$type])) {
+ return false;
+ }
+
//Todo validate mimetypes etc
return true;
});
}
+ private function getEmpty($type) {
+ $folder = $this->getEmptyTemplateDir();
+
+ $templateFiles = $folder->getDirectoryListing();
+
+ if ($templateFiles === []) {
+ // Empty so lets copy over the basic templates
+ $templates = [
+ 'document.ott',
+ 'spreadsheet.ots',
+ 'presentation.otp',
+ ];
+
+ foreach ($templates as $template) {
+ $file = $folder->newFile($template);
+ $file->putContent(file_get_contents('../assets/' . $template));
+ $templateFiles[] = $file;
+ }
+ }
+
+ return $this->filterTemplates($templateFiles, $type);
+ }
+
/**
* Get all global templates
*
* @return File[]
*/
- public function getSystem() {
+ public function getSystem($type) {
$folder = $this->getSystemTemplateDir();
$templateFiles = $folder->getDirectoryListing();
- return $this->filterTemplates($templateFiles);
+ return $this->filterTemplates($templateFiles, $type);
}
/**
* @return array
*/
- public function getSystemFormatted() {
- $templates = $this->getSystem();
+ public function getSystemFormatted($type) {
+ $empty = $this->getEmpty($type);
+ $system = $this->getSystem($type);
- return array_map(function(File $file) {
+ $emptyFormatted = array_map(function(File $file) {
+ return $this->formatEmpty($file);
+ }, $empty);
+
+ $systemFormatted = array_map(function(File $file) {
return $this->formatNodeReturn($file);
- }, $templates);
+ }, $system);
+
+ return array_merge($emptyFormatted, $systemFormatted);
}
/**
@@ -175,12 +243,12 @@ class TemplateManager {
*
* @return File[]
*/
- public function getUser() {
+ public function getUser($type) {
try {
$templateDir = $this->getUserTemplateDir();
$templateFiles = $templateDir->getDirectoryListing();
- return $this->filterTemplates($templateFiles);
+ return $this->filterTemplates($templateFiles, $type);
} catch(NotFoundException $e) {
return [];
}
@@ -189,8 +257,8 @@ class TemplateManager {
/**
* @return array
*/
- public function getUserFormatted() {
- $templates = $this->getUser();
+ public function getUserFormatted($type) {
+ $templates = $this->getUser($type);
return array_map(function(File $file) {
return $this->formatNodeReturn($file);
@@ -202,7 +270,7 @@ class TemplateManager {
*
* @return File[]
*/
- public function getAll($type = 'document'): array{
+ public function getAll($type = 'document') {
$system = $this->getSystem();
$user = $this->getUser();
@@ -220,6 +288,17 @@ class TemplateManager {
}));
}
+ public function getAllFormatted($type) {
+ if (!array_key_exists($type, self::$tplTypes)) {
+ return [];
+ }
+
+ $system = $this->getSystemFormatted($type);
+ $user = $this->getUserFormatted($type);
+
+ return array_merge($system, $user);
+ }
+
/**
* Add a template to the global template folder
*
@@ -316,6 +395,15 @@ class TemplateManager {
}
/**
+ * @return Folder
+ */
+ private function getEmptyTemplateDir() {
+ return $this->rootFolder->get('appdata_' . $this->config->getSystemValue('instanceid', null))
+ ->get('richdocuments')
+ ->get('empty_templates');
+ }
+
+ /**
* Format template file for json return object
*
* @param File $template
@@ -327,7 +415,6 @@ class TemplateManager {
'name' => $template->getName(),
'preview' => $this->urlGenerator->linkToRouteAbsolute('richdocuments.templates.getPreview', ['fileId' => $template->getId()]),
'type' => $this->flipTypes()[$template->getMimeType()],
- 'etag' => $template->getEtag(),
'delete' => $this->urlGenerator->linkToRouteAbsolute('richdocuments.templates.delete', ['fileId' => $template->getId()])
];
}
@@ -346,4 +433,13 @@ class TemplateManager {
return false;
}
+
+ public function formatEmpty(File $template) {
+ return [
+ 'id' => $template->getId(),
+ 'name' => $this->l->t('Empty'),
+ 'preview' => $this->urlGenerator->linkToRouteAbsolute('richdocuments.templates.getPreview', ['fileId' => $template->getId()]),
+ 'type' => $this->flipTypes()[$template->getMimeType()],
+ ];
+ }
}
generated by cgit v1.2.3 (git 2.25.1) at 2024-08-25 15:28:30 +0300