templates: better support cross-format templates

If form filling was used to create a file, do not add a template source.
Otherwise Collabora Online creates the file again from the template.

Use the format option in 'transform-document-structure' to avoid an
intermediate save in the template format, which might not be supported
as a save format.

Signed-off-by: Jaume Pujantell <jaume.pujantell@collabora.com>

Author: Jaume Pujantell

lib/Listener/FileCreatedFromTemplateListener.php

@@ -41,31 +41,31 @@ public function handle(Event $event): void {
 
 		$templateFile = $event->getTemplate();
 
-		// Empty template
-		if ($templateFile === null) {
-			$event->getTarget()->putContent($this->templateManager->getEmptyFileContent($event->getTarget()->getExtension()));
-			$templateType = $this->templateManager->getTemplateTypeForExtension($event->getTarget()->getExtension());
-			$emptyTemplates = $this->templateManager->getEmpty($templateType);
-			$emptyTemplate = array_shift($emptyTemplates);
-			if ($emptyTemplate && $this->templateManager->isSupportedTemplateSource($emptyTemplate->getExtension())) {
-				// Only use TemplateSource if supported filetype
-				$this->templateManager->setTemplateSource($event->getTarget()->getId(), $emptyTemplate->getId());
-			}
-			return;
-		}
-
-		if ($this->templateManager->isSupportedTemplateSource($templateFile->getExtension())) {
-			// Only use TemplateSource if supported filetype
-			$this->templateManager->setTemplateSource($event->getTarget()->getId(), $templateFile->getId());
-		}
-
 		if ($this->capabilitiesService->hasFormFilling()) {
 			try {
-				$filledTemplate = $this->templateFieldService->fillFields($templateFile, $event->getTemplateFields());
+				$filledTemplate = $this->templateFieldService->fillFields($templateFile, $event->getTemplateFields(), null, event->getTarget()->getExtension());
 				$event->getTarget()->putContent($filledTemplate);
 			} catch (\Exception $e) {
 				$this->logger->error($e->getMessage(), ['exception' => $e]);
 			}
+		} else {
+			// Empty template
+			if ($templateFile === null) {
+				$event->getTarget()->putContent($this->templateManager->getEmptyFileContent($event->getTarget()->getExtension()));
+				$templateType = $this->templateManager->getTemplateTypeForExtension($event->getTarget()->getExtension());
+				$emptyTemplates = $this->templateManager->getEmpty($templateType);
+				$emptyTemplate = array_shift($emptyTemplates);
+				if ($emptyTemplate && $this->templateManager->isSupportedTemplateSource($emptyTemplate->getExtension())) {
+					// Only use TemplateSource if supported filetype
+					$this->templateManager->setTemplateSource($event->getTarget()->getId(), $emptyTemplate->getId());
+				}
+				return;
+			}
+
+			if ($this->templateManager->isSupportedTemplateSource($templateFile->getExtension())) {
+				// Only use TemplateSource if supported filetype
+				$this->templateManager->setTemplateSource($event->getTarget()->getId(), $templateFile->getId());
+			}
 		}
 
 		// Avoid having the mimetype of the source file set

lib/Service/TemplateFieldService.php

@@ -177,7 +177,7 @@ public function fillFields(Node|int $file, array $fields = [], ?string $destinat
 
 		$formFormat = [
 			'name' => 'format',
-			'contents' => $file->getExtension(),
+			'contents' => $format === null ? $file->getExtension() : $format,
 		];
 
 		$form = RemoteOptionsService::getDefaultOptions();
@@ -191,13 +191,6 @@ public function fillFields(Node|int $file, array $fields = [], ?string $destinat
 
 			$content = $response->getBody();
 
-			if ($format !== null) {
-				$tmp = $this->tempManager->getTemporaryFile();
-				file_put_contents($tmp, $content);
-				$fp = fopen($tmp, 'rb');
-				$content = $this->remoteService->convertTo($file->getName(), $fp, $format);
-			}
-
 			if ($destination !== null) {
 				$this->writeToDestination($destination, $content);
 			}