From 8b63e08d85ab6b8d1d6450e6dfda40d4ea337655 Mon Sep 17 00:00:00 2001
From: Arsalan Ul Haq Sohni <arsalan-ul-haq.sohni@strato.de>
Date: Mon, 2 Mar 2026 10:23:59 +0100
Subject: [PATCH 1/5] IONOS(assistant): feat: add filteredShape computed
 property to exclude numberOfImages field

(cherry picked from commit fa7cca1d8b0d52e254645e2498d8a282863caf51)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 src/components/fields/TaskTypeFields.vue | 13 ++++++++++++-
 1 file changed, 12 insertions(+), 1 deletion(-)

diff --git a/src/components/fields/TaskTypeFields.vue b/src/components/fields/TaskTypeFields.vue
index 6d5e0d4ed..3113debfb 100644
--- a/src/components/fields/TaskTypeFields.vue
+++ b/src/components/fields/TaskTypeFields.vue
@@ -4,7 +4,7 @@
 -->
 <template>
 	<div class="task-type-fields">
-		<TaskTypeField v-for="(field, key) in shape"
+		<TaskTypeField v-for="(field, key) in filteredShape"
 			:key="'shape' + key"
 			:field-key="key"
 			:field="field"
@@ -108,6 +108,17 @@ export default {
 			}
 			return this.optionalShape
 		},
+		filteredShape() {
+			// Hide numberOfImages field
+			if (!this.isOutput && this.shape) {
+				const filtered = { ...this.shape }
+				if ('numberOfImages' in filtered) {
+					delete filtered.numberOfImages
+				}
+				return filtered
+			}
+			return this.shape
+		},
 	},
 
 	watch: {

From 7e533bcc5694c28fb5dd710856e1340ca7668978 Mon Sep 17 00:00:00 2001
From: Simon Holzman <simon.holzman@verizon.net>
Date: Sun, 28 Jun 2026 17:22:23 -0400
Subject: [PATCH 2/5] fix: avoid mime_content_type warning on wrapped streams

mime_content_type() requires stream_cast() support to operate on a
stream resource directly. Streams returned by File::fopen() can be
wrapped in Icewind\Streams\CallbackWrapper, which does not implement
stream_cast(), causing a PHP warning to be logged on every
preview/output-file request even though the mime type is still
detected correctly.

This drains the stream into a temporary file first, then calls
mime_content_type() against the file path instead. No behavior change;
only removes log noise.

Signed-off-by: Simon Holzman <simon.holzman@verizon.net>
(cherry picked from commit 3ece3ab15b1a98f3417351dda0a8b940f15f7020)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
(cherry picked from commit e522f3cc50ab237a41946da1b07f1472faf5f3b4)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/Service/AssistantService.php | 27 +++++++++++++++++++++++++--
 1 file changed, 25 insertions(+), 2 deletions(-)

diff --git a/lib/Service/AssistantService.php b/lib/Service/AssistantService.php
index 17b3d3e2b..7d3199cca 100644
--- a/lib/Service/AssistantService.php
+++ b/lib/Service/AssistantService.php
@@ -722,7 +722,7 @@ public function saveOutputFile(string $userId, int $ocpTaskId, int $fileId): arr
 	 * @throws NotPermittedException
 	 */
 	private function getTargetFileName(File $file): string {
-		$mimeType = mime_content_type($file->fopen('rb'));
+		$mimeType = $this->detectMimeType($file->fopen('rb'));
 		$fileName = $file->getName();
 
 		$mimes = new \Mimey\MimeTypes;
@@ -734,6 +734,29 @@ private function getTargetFileName(File $file): string {
 		return $fileName;
 	}
 
+	/**
+	 * Wraps mime_content_type() to avoid a PHP warning when given a stream
+	 * that does not implement stream_cast() (e.g. Icewind\Streams\CallbackWrapper,
+	 * returned by File::fopen() for some storage backends). The stream is
+	 * drained into a temp file first so mime_content_type() can operate on a
+	 * real path instead of the unsupported stream resource.
+	 *
+	 * @param resource $stream
+	 * @return string|false
+	 */
+	private function detectMimeType($stream) {
+		$tmpFile = tempnam(sys_get_temp_dir(), 'nc_assistant_mime_');
+		$tmpHandle = fopen($tmpFile, 'wb');
+		stream_copy_to_stream($stream, $tmpHandle);
+		fclose($tmpHandle);
+		if (is_resource($stream)) {
+			fclose($stream);
+		}
+		$mimeType = mime_content_type($tmpFile);
+		unlink($tmpFile);
+		return $mimeType;
+	}
+
 	/**
 	 * @param Task $task
 	 * @return array
@@ -786,7 +809,7 @@ private function extractFileIdsFromTask(Task $task): array {
 	 */
 	public function getOutputFilePreviewFile(string $userId, int $taskId, int $fileId, ?int $x = 100, ?int $y = 100): ?array {
 		$taskOutputFile = $this->getTaskOutputFile($userId, $taskId, $fileId);
-		$realMime = mime_content_type($taskOutputFile->fopen('rb'));
+		$realMime = $this->detectMimeType($taskOutputFile->fopen('rb'));
 		return $this->previewService->getFilePreviewFile($taskOutputFile, $x, $y, $realMime ?: null);
 	}
 

From 268cc58ab39537e40e9b4dc114047d8c00531f23 Mon Sep 17 00:00:00 2001
From: Simon Holzman <simon.holzman@verizon.net>
Date: Mon, 13 Jul 2026 23:32:00 -0400
Subject: [PATCH 3/5] fix: use finfo buffer instead of mime_content_type on
 streams

Avoids copying the whole file to disk for mime detection.
Reads only the first 4096 bytes into a buffer and uses
finfo::buffer() to detect the mime type, which does not
require stream_cast() support.

Addresses maintainer feedback on #592.

Signed-off-by: Simon Holzman <simon.holzman@verizon.net>
(cherry picked from commit 2be918a414d922f8258db0b14d30f3e8c3bb2caa)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
(cherry picked from commit cc750bd611c59514fd89dcb68e302e51d1aa9a48)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/Service/AssistantService.php | 29 ++++-------------------------
 1 file changed, 4 insertions(+), 25 deletions(-)

diff --git a/lib/Service/AssistantService.php b/lib/Service/AssistantService.php
index 7d3199cca..59f266d4e 100644
--- a/lib/Service/AssistantService.php
+++ b/lib/Service/AssistantService.php
@@ -722,7 +722,8 @@ public function saveOutputFile(string $userId, int $ocpTaskId, int $fileId): arr
 	 * @throws NotPermittedException
 	 */
 	private function getTargetFileName(File $file): string {
-		$mimeType = $this->detectMimeType($file->fopen('rb'));
+		$head = fread($file->fopen('rb'), 4096);
+		$mimeType = (new \finfo(FILEINFO_MIME_TYPE))->buffer($head);
 		$fileName = $file->getName();
 
 		$mimes = new \Mimey\MimeTypes;
@@ -734,29 +735,6 @@ private function getTargetFileName(File $file): string {
 		return $fileName;
 	}
 
-	/**
-	 * Wraps mime_content_type() to avoid a PHP warning when given a stream
-	 * that does not implement stream_cast() (e.g. Icewind\Streams\CallbackWrapper,
-	 * returned by File::fopen() for some storage backends). The stream is
-	 * drained into a temp file first so mime_content_type() can operate on a
-	 * real path instead of the unsupported stream resource.
-	 *
-	 * @param resource $stream
-	 * @return string|false
-	 */
-	private function detectMimeType($stream) {
-		$tmpFile = tempnam(sys_get_temp_dir(), 'nc_assistant_mime_');
-		$tmpHandle = fopen($tmpFile, 'wb');
-		stream_copy_to_stream($stream, $tmpHandle);
-		fclose($tmpHandle);
-		if (is_resource($stream)) {
-			fclose($stream);
-		}
-		$mimeType = mime_content_type($tmpFile);
-		unlink($tmpFile);
-		return $mimeType;
-	}
-
 	/**
 	 * @param Task $task
 	 * @return array
@@ -809,7 +787,8 @@ private function extractFileIdsFromTask(Task $task): array {
 	 */
 	public function getOutputFilePreviewFile(string $userId, int $taskId, int $fileId, ?int $x = 100, ?int $y = 100): ?array {
 		$taskOutputFile = $this->getTaskOutputFile($userId, $taskId, $fileId);
-		$realMime = $this->detectMimeType($taskOutputFile->fopen('rb'));
+		$head = fread($taskOutputFile->fopen('rb'), 4096);
+		$realMime = (new \finfo(FILEINFO_MIME_TYPE))->buffer($head);
 		return $this->previewService->getFilePreviewFile($taskOutputFile, $x, $y, $realMime ?: null);
 	}
 

From b3d22c9a4e1ca2d4c38ca12430eee45c202e1502 Mon Sep 17 00:00:00 2001
From: Julien Veyssier <julien-nc@posteo.net>
Date: Wed, 23 Sep 2026 17:20:36 +0200
Subject: [PATCH 4/5] fix: improve mimetype detection when serving a task
 output file (just like when saving and generating a preview)

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
(cherry picked from commit 66e2ad46be370c3d24ae78ba90f1fa2453307d8e)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
(cherry picked from commit 201d6ce498791b613921d05acf79edea406fdfa2)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/Controller/AssistantApiController.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/AssistantApiController.php b/lib/Controller/AssistantApiController.php
index 6f0270721..58a48dd20 100644
--- a/lib/Controller/AssistantApiController.php
+++ b/lib/Controller/AssistantApiController.php
@@ -399,7 +399,8 @@ public function getOutputFilePreview(int $ocpTaskId, int $fileId, ?int $x = 100,
 	public function getOutputFile(int $ocpTaskId, int $fileId): DataDownloadResponse|DataResponse {
 		try {
 			$taskOutputFile = $this->assistantService->getTaskOutputFile($this->userId, $ocpTaskId, $fileId);
-			$realMime = mime_content_type($taskOutputFile->fopen('rb'));
+			$head = fread($taskOutputFile->fopen('rb'), 4096);
+			$realMime = (new \finfo(FILEINFO_MIME_TYPE))->buffer($head);
 			$response = new DataDownloadResponse(
 				$taskOutputFile->getContent(),
 				$ocpTaskId . '-' . $fileId,

From f23d180e4b1ecf4c56050704613c9d7c7d259f62 Mon Sep 17 00:00:00 2001
From: Julien Veyssier <julien-nc@posteo.net>
Date: Thu, 24 Sep 2026 15:29:46 +0200
Subject: [PATCH 5/5] use the appData file extension if there is one

Signed-off-by: Julien Veyssier <julien-nc@posteo.net>
(cherry picked from commit 5cde2e7943d9b9799ce5750f0bebb92f94656028)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
(cherry picked from commit ffec40001b76a8dd2865610a1623c7b4df2f2f60)
Signed-off-by: Misha M.-Kupriyanov <kupriyanov@strato.de>
---
 lib/Controller/AssistantApiController.php | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/lib/Controller/AssistantApiController.php b/lib/Controller/AssistantApiController.php
index 58a48dd20..1b9ff145b 100644
--- a/lib/Controller/AssistantApiController.php
+++ b/lib/Controller/AssistantApiController.php
@@ -401,9 +401,16 @@ public function getOutputFile(int $ocpTaskId, int $fileId): DataDownloadResponse
 			$taskOutputFile = $this->assistantService->getTaskOutputFile($this->userId, $ocpTaskId, $fileId);
 			$head = fread($taskOutputFile->fopen('rb'), 4096);
 			$realMime = (new \finfo(FILEINFO_MIME_TYPE))->buffer($head);
+
+			$fileName = $ocpTaskId . '-' . $fileId;
+			$extension = pathinfo($taskOutputFile->getName(), PATHINFO_EXTENSION);
+			if ($extension !== '') {
+				$fileName .= '.' . $extension;
+			}
+
 			$response = new DataDownloadResponse(
 				$taskOutputFile->getContent(),
-				$ocpTaskId . '-' . $fileId,
+				$fileName,
 				$realMime ?: 'application/octet-stream',
 			);
 			$response->cacheFor(60 * 60 * 24, false, true);