fixup! fix: generate favourite icon without imagick svg support

Signed-off-by: SebastianKrupinski <[email protected]>

Author: SebastianKrupinski

apps/theming/lib/Controller/IconController.php

@@ -97,10 +97,10 @@ public function getFavicon(string $app = 'core'): Response {
 		$iconFile = null;
 		try {
 			$iconFile = $this->imageManager->getImage('favicon', false);
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => $iconFile->getMimeType()]);
 		} catch (NotFoundException $e) {
 		}
-		if ($iconFile === null && $this->imageManager->canConvert('PNG')) {
+		if ($iconFile === null && ($this->imageManager->canConvert('SVG') || $this->imageManager->canConvert('PNG'))) {
 			$color = $this->themingDefaults->getColorPrimary();
 			try {
 				$iconFile = $this->imageManager->getCachedImage('favIcon-' . $app . $color);
@@ -111,11 +111,11 @@ public function getFavicon(string $app = 'core'): Response {
 				}
 				$iconFile = $this->imageManager->setCachedImage('favIcon-' . $app . $color, $icon);
 			}
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => $iconFile->getMimeType()]);
 		}
 		if ($response === null) {
 			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon.png';
-			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+			$response = new DataDisplayResponse($this->fileAccessHelper->file_get_contents($fallbackLogo), Http::STATUS_OK, ['Content-Type' => 'image/png']);
 		}
 		$response->cacheFor(86400);
 		return $response;
@@ -142,10 +142,10 @@ public function getTouchIcon(string $app = 'core'): Response {
 		$response = null;
 		try {
 			$iconFile = $this->imageManager->getImage('favicon');
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/x-icon']);
+			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => $iconFile->getMimeType()]);
 		} catch (NotFoundException $e) {
 		}
-		if ($this->imageManager->canConvert('PNG')) {
+		if ($this->imageManager->canConvert('SVG') || $this->imageManager->canConvert('PNG')) {
 			$color = $this->themingDefaults->getColorPrimary();
 			try {
 				$iconFile = $this->imageManager->getCachedImage('touchIcon-' . $app . $color);
@@ -156,7 +156,7 @@ public function getTouchIcon(string $app = 'core'): Response {
 				}
 				$iconFile = $this->imageManager->setCachedImage('touchIcon-' . $app . $color, $icon);
 			}
-			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => 'image/png']);
+			$response = new FileDisplayResponse($iconFile, Http::STATUS_OK, ['Content-Type' => $iconFile->getMimeType()]);
 		}
 		if ($response === null) {
 			$fallbackLogo = \OC::$SERVERROOT . '/core/img/favicon-touch.png';

apps/theming/lib/Controller/ThemingController.php

@@ -345,6 +345,7 @@ public function undoAll(): DataResponse {
 	#[OpenAPI(scope: OpenAPI::SCOPE_DEFAULT)]
 	public function getImage(string $key, bool $useSvg = true) {
 		try {
+			$useSvg = $useSvg && $this->imageManager->canConvert('SVG');
 			$file = $this->imageManager->getImage($key, $useSvg);
 		} catch (NotFoundException $e) {
 			return new NotFoundResponse();
@@ -355,13 +356,8 @@ public function getImage(string $key, bool $useSvg = true) {
 		$csp->allowInlineStyle();
 		$response->setContentSecurityPolicy($csp);
 		$response->cacheFor(3600);
-		$response->addHeader('Content-Type', $this->config->getAppValue($this->appName, $key . 'Mime', ''));
+		$response->addHeader('Content-Type', $file->getMimeType());
 		$response->addHeader('Content-Disposition', 'attachment; filename="' . $key . '"');
-		if (!$useSvg) {
-			$response->addHeader('Content-Type', 'image/png');
-		} else {
-			$response->addHeader('Content-Type', $this->config->getAppValue($this->appName, $key . 'Mime', ''));
-		}
 		return $response;
 	}
 

apps/theming/lib/ImageManager.php

@@ -89,7 +89,25 @@ public function getImage(string $key, bool $useSvg = true): ISimpleFile {
 		if ($mime === '' || !$folder->fileExists($key)) {
 			throw new NotFoundException();
 		}
-
+		// if SVG was requested and is supported
+		if ($useSvg && $this->canConvert('SVG')) {
+			if (!$folder->fileExists($key . '.svg')) {
+				try {
+					$finalIconFile = new \Imagick();
+					$finalIconFile->setBackgroundColor('none');
+					$finalIconFile->readImageBlob($folder->getFile($key)->getContent());
+					$finalIconFile->setImageFormat('SVG');
+					$svgFile = $folder->newFile($key . '.svg');
+					$svgFile->putContent($finalIconFile->getImageBlob());
+					return $svgFile;
+				} catch (\ImagickException $e) {
+					$this->logger->info('The image was requested to be no SVG file, but converting it to SVG failed: ' . $e->getMessage());
+				}
+			} else {
+				return $folder->getFile($key . '.svg');
+			}
+		}
+		// if SVG was not requested, but PNG is supported
 		if (!$useSvg && $this->canConvert('PNG')) {
 			if (!$folder->fileExists($key . '.png')) {
 				try {
@@ -107,7 +125,7 @@ public function getImage(string $key, bool $useSvg = true): ISimpleFile {
 				return $folder->getFile($key . '.png');
 			}
 		}
-
+		// fallback to the original file
 		return $folder->getFile($key);
 	}