From 3d7bfaee31d99aed19992ccfc536bb63010caea5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?John=20Molakvo=C3=A6?= <skjnldsv@protonmail.com>
Date: Fri, 11 Aug 2023 14:32:42 +0200
Subject: [PATCH] feat: redirect to the mime icon if no preview available
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Signed-off-by: John Molakvoæ <skjnldsv@protonmail.com>
---
 apps/files/src/components/FileEntry.vue     | 17 +---
 apps/files/src/components/VirtualList.vue   |  2 +-
 core/Controller/PreviewController.php       | 27 ++++--
 lib/composer/composer/autoload_classmap.php |  2 +
 lib/composer/composer/autoload_static.php   |  2 +
 lib/private/Preview/MimeIconProvider.php    | 98 +++++++++++++++++++++
 lib/private/Server.php                      |  3 +
 lib/public/Files/IMimeTypeDetector.php      |  6 ++
 lib/public/Preview/IMimeIconProvider.php    | 31 +++++++
 9 files changed, 166 insertions(+), 22 deletions(-)
 create mode 100644 lib/private/Preview/MimeIconProvider.php
 create mode 100644 lib/public/Preview/IMimeIconProvider.php

diff --git a/apps/files/src/components/FileEntry.vue b/apps/files/src/components/FileEntry.vue
index 98b4dfca07cb1..6e43d3340c72f 100644
--- a/apps/files/src/components/FileEntry.vue
+++ b/apps/files/src/components/FileEntry.vue
@@ -45,10 +45,6 @@
 					class="files-list__row-icon-preview"
 					:style="{ backgroundImage }" />
 
-				<span v-else-if="mimeIconUrl"
-					class="files-list__row-icon-preview files-list__row-icon-preview--mime"
-					:style="{ backgroundImage: mimeIconUrl }" />
-
 				<FileIcon v-else />
 
 				<!-- Favorite icon -->
@@ -155,17 +151,16 @@
 </template>
 
 <script lang='ts'>
+import { CancelablePromise } from 'cancelable-promise'
 import { debounce } from 'debounce'
 import { emit } from '@nextcloud/event-bus'
 import { extname } from 'path'
 import { formatFileSize, Permission } from '@nextcloud/files'
-import { Fragment } from 'vue-frag'
 import { generateUrl } from '@nextcloud/router'
 import { showError, showSuccess } from '@nextcloud/dialogs'
 import { translate } from '@nextcloud/l10n'
 import { vOnClickOutside } from '@vueuse/components'
 import axios from '@nextcloud/axios'
-import CancelablePromise from 'cancelable-promise'
 import FileIcon from 'vue-material-design-icons/File.vue'
 import FolderIcon from 'vue-material-design-icons/Folder.vue'
 import moment from '@nextcloud/moment'
@@ -205,7 +200,6 @@ export default Vue.extend({
 		FavoriteIcon,
 		FileIcon,
 		FolderIcon,
-		Fragment,
 		NcActionButton,
 		NcActions,
 		NcCheckboxRadioSwitch,
@@ -394,6 +388,7 @@ export default Vue.extend({
 				// Request tiny previews
 				url.searchParams.set('x', '32')
 				url.searchParams.set('y', '32')
+				url.searchParams.set('mimeFallback', 'true')
 
 				// Handle cropping
 				url.searchParams.set('a', this.cropPreviews === true ? '0' : '1')
@@ -402,14 +397,6 @@ export default Vue.extend({
 				return null
 			}
 		},
-		mimeIconUrl() {
-			const mimeType = this.source.mime || 'application/octet-stream'
-			const mimeIconUrl = window.OC?.MimeType?.getIconUrl?.(mimeType)
-			if (mimeIconUrl) {
-				return `url(${mimeIconUrl})`
-			}
-			return ''
-		},
 
 		// Sorted actions that are enabled for this node
 		enabledActions() {
diff --git a/apps/files/src/components/VirtualList.vue b/apps/files/src/components/VirtualList.vue
index 38523549b17fc..4d48bf624e97d 100644
--- a/apps/files/src/components/VirtualList.vue
+++ b/apps/files/src/components/VirtualList.vue
@@ -14,7 +14,7 @@
 		<tbody :style="tbodyStyle" class="files-list__tbody">
 			<component :is="dataComponent"
 				v-for="(item, i) in renderedItems"
-				:key="item[dataKey]"
+				:key="i"
 				:active="(i >= bufferItems || index <= bufferItems) && (i < shownItems - bufferItems)"
 				:source="item"
 				:index="i"
diff --git a/core/Controller/PreviewController.php b/core/Controller/PreviewController.php
index c9183466f90d7..8cd5cde0203f4 100644
--- a/core/Controller/PreviewController.php
+++ b/core/Controller/PreviewController.php
@@ -32,12 +32,14 @@
 use OCP\AppFramework\Http;
 use OCP\AppFramework\Http\DataResponse;
 use OCP\AppFramework\Http\FileDisplayResponse;
+use OCP\AppFramework\Http\RedirectResponse;
 use OCP\Files\File;
 use OCP\Files\IRootFolder;
 use OCP\Files\Node;
 use OCP\Files\NotFoundException;
 use OCP\IPreview;
 use OCP\IRequest;
+use OCP\Preview\IMimeIconProvider;
 
 class PreviewController extends Controller {
 	public function __construct(
@@ -46,6 +48,7 @@ public function __construct(
 		private IPreview $preview,
 		private IRootFolder $root,
 		private ?string $userId,
+		private IMimeIconProvider $mimeIconProvider,
 	) {
 		parent::__construct($appName, $request);
 	}
@@ -62,6 +65,7 @@ public function __construct(
 	 * @param bool $a Whether to not crop the preview
 	 * @param bool $forceIcon Force returning an icon
 	 * @param string $mode How to crop the image
+	 * @param bool $mimeFallback Whether to fallback to the mime icon if no preview is available
 	 * @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_FORBIDDEN|Http::STATUS_NOT_FOUND, array<empty>, array{}>
 	 *
 	 * 200: Preview returned
@@ -75,7 +79,8 @@ public function getPreview(
 		int $y = 32,
 		bool $a = false,
 		bool $forceIcon = true,
-		string $mode = 'fill'): Http\Response {
+		string $mode = 'fill',
+		bool $mimeFallback): Http\Response {
 		if ($file === '' || $x === 0 || $y === 0) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
@@ -87,7 +92,7 @@ public function getPreview(
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
 
-		return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode);
+		return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode, $mimeFallback);
 	}
 
 	/**
@@ -102,6 +107,7 @@ public function getPreview(
 	 * @param bool $a Whether to not crop the preview
 	 * @param bool $forceIcon Force returning an icon
 	 * @param string $mode How to crop the image
+	 * @param bool $mimeFallback Whether to fallback to the mime icon if no preview is available
 	 * @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_FORBIDDEN|Http::STATUS_NOT_FOUND, array<empty>, array{}>
 	 *
 	 * 200: Preview returned
@@ -115,7 +121,8 @@ public function getPreviewByFileId(
 		int $y = 32,
 		bool $a = false,
 		bool $forceIcon = true,
-		string $mode = 'fill') {
+		string $mode = 'fill',
+		bool $mimeFallback = false) {
 		if ($fileId === -1 || $x === 0 || $y === 0) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
 		}
@@ -129,11 +136,11 @@ public function getPreviewByFileId(
 
 		$node = array_pop($nodes);
 
-		return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode);
+		return $this->fetchPreview($node, $x, $y, $a, $forceIcon, $mode, $mimeFallback);
 	}
 
 	/**
-	 * @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_FORBIDDEN|Http::STATUS_NOT_FOUND, array<empty>, array{}>
+	 * @return FileDisplayResponse<Http::STATUS_OK, array{Content-Type: string}>|DataResponse<Http::STATUS_BAD_REQUEST|Http::STATUS_FORBIDDEN|Http::STATUS_NOT_FOUND, array<empty>, array{}>|RedirectResponse<string>
 	 */
 	private function fetchPreview(
 		Node $node,
@@ -141,7 +148,8 @@ private function fetchPreview(
 		int $y,
 		bool $a,
 		bool $forceIcon,
-		string $mode) : Http\Response {
+		string $mode,
+		bool $mimeFallback = false) : Http\Response {
 		if (!($node instanceof File) || (!$forceIcon && !$this->preview->isAvailable($node))) {
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		}
@@ -167,6 +175,13 @@ private function fetchPreview(
 			$response->cacheFor(3600 * 24, false, true);
 			return $response;
 		} catch (NotFoundException $e) {
+		// If we have no preview enabled, we can redirect to the mime icon if any
+			if ($mimeFallback) {
+				if ($url = $this->mimeIconProvider->getMimeIconUrl($node->getMimeType())) {
+					return new RedirectResponse($url);
+				}
+			}
+
 			return new DataResponse([], Http::STATUS_NOT_FOUND);
 		} catch (\InvalidArgumentException $e) {
 			return new DataResponse([], Http::STATUS_BAD_REQUEST);
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 2e5c239b6ed1b..4b99fc1813550 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -533,6 +533,7 @@
     'OCP\\OCS\\IDiscoveryService' => $baseDir . '/lib/public/OCS/IDiscoveryService.php',
     'OCP\\PreConditionNotMetException' => $baseDir . '/lib/public/PreConditionNotMetException.php',
     'OCP\\Preview\\BeforePreviewFetchedEvent' => $baseDir . '/lib/public/Preview/BeforePreviewFetchedEvent.php',
+    'OCP\\Preview\\IMimeIconProvider' => $baseDir . '/lib/public/Preview/IMimeIconProvider.php',
     'OCP\\Preview\\IProvider' => $baseDir . '/lib/public/Preview/IProvider.php',
     'OCP\\Preview\\IProviderV2' => $baseDir . '/lib/public/Preview/IProviderV2.php',
     'OCP\\Preview\\IVersionedPreviewFile' => $baseDir . '/lib/public/Preview/IVersionedPreviewFile.php',
@@ -1479,6 +1480,7 @@
     'OC\\Preview\\MSOffice2007' => $baseDir . '/lib/private/Preview/MSOffice2007.php',
     'OC\\Preview\\MSOfficeDoc' => $baseDir . '/lib/private/Preview/MSOfficeDoc.php',
     'OC\\Preview\\MarkDown' => $baseDir . '/lib/private/Preview/MarkDown.php',
+    'OC\\Preview\\MimeIconProvider' => $baseDir . '/lib/private/Preview/MimeIconProvider.php',
     'OC\\Preview\\Movie' => $baseDir . '/lib/private/Preview/Movie.php',
     'OC\\Preview\\Office' => $baseDir . '/lib/private/Preview/Office.php',
     'OC\\Preview\\OpenDocument' => $baseDir . '/lib/private/Preview/OpenDocument.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 48c6701c7c605..121931b60d06a 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -566,6 +566,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OCP\\OCS\\IDiscoveryService' => __DIR__ . '/../../..' . '/lib/public/OCS/IDiscoveryService.php',
         'OCP\\PreConditionNotMetException' => __DIR__ . '/../../..' . '/lib/public/PreConditionNotMetException.php',
         'OCP\\Preview\\BeforePreviewFetchedEvent' => __DIR__ . '/../../..' . '/lib/public/Preview/BeforePreviewFetchedEvent.php',
+        'OCP\\Preview\\IMimeIconProvider' => __DIR__ . '/../../..' . '/lib/public/Preview/IMimeIconProvider.php',
         'OCP\\Preview\\IProvider' => __DIR__ . '/../../..' . '/lib/public/Preview/IProvider.php',
         'OCP\\Preview\\IProviderV2' => __DIR__ . '/../../..' . '/lib/public/Preview/IProviderV2.php',
         'OCP\\Preview\\IVersionedPreviewFile' => __DIR__ . '/../../..' . '/lib/public/Preview/IVersionedPreviewFile.php',
@@ -1512,6 +1513,7 @@ class ComposerStaticInit749170dad3f5e7f9ca158f5a9f04f6a2
         'OC\\Preview\\MSOffice2007' => __DIR__ . '/../../..' . '/lib/private/Preview/MSOffice2007.php',
         'OC\\Preview\\MSOfficeDoc' => __DIR__ . '/../../..' . '/lib/private/Preview/MSOfficeDoc.php',
         'OC\\Preview\\MarkDown' => __DIR__ . '/../../..' . '/lib/private/Preview/MarkDown.php',
+        'OC\\Preview\\MimeIconProvider' => __DIR__ . '/../../..' . '/lib/private/Preview/MimeIconProvider.php',
         'OC\\Preview\\Movie' => __DIR__ . '/../../..' . '/lib/private/Preview/Movie.php',
         'OC\\Preview\\Office' => __DIR__ . '/../../..' . '/lib/private/Preview/Office.php',
         'OC\\Preview\\OpenDocument' => __DIR__ . '/../../..' . '/lib/private/Preview/OpenDocument.php',
diff --git a/lib/private/Preview/MimeIconProvider.php b/lib/private/Preview/MimeIconProvider.php
new file mode 100644
index 0000000000000..dba1ab621b119
--- /dev/null
+++ b/lib/private/Preview/MimeIconProvider.php
@@ -0,0 +1,98 @@
+<?php
+/**
+ * @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OC\Preview;
+
+use OCA\Theming\ThemingDefaults;
+use OCP\App\IAppManager;
+use OCP\Files\IMimeTypeDetector;
+use OCP\IConfig;
+use OCP\IURLGenerator;
+use OCP\Preview\IMimeIconProvider;
+
+class MimeIconProvider implements IMimeIconProvider {
+
+	public function __construct(
+		protected IMimeTypeDetector $mimetypeDetector,
+		protected IConfig $config,
+		protected IURLGenerator $urlGenerator,
+		protected IAppManager $appManager,
+		protected ThemingDefaults $themingDefaults,
+	) {}
+
+	public function getMimeIconUrl(string $mime): string|null {
+		if (!$mime) {
+			return null;
+		}
+
+		// Fetch all the aliases
+		$aliases = $this->mimetypeDetector->getAllAliases();
+
+		// Remove comments
+		$aliases = array_filter($aliases, static function ($key) {
+			return !($key === '' || $key[0] === '_');
+		}, ARRAY_FILTER_USE_KEY);
+
+		// Map all the aliases recursively
+		foreach ($aliases as $alias => $value) {
+			if ($alias === $mime) {
+				$mime = $value;
+			}
+		}
+
+		$fileName = str_replace('/', '-', $mime);
+		if ($url = $this->searchfileName($fileName)) {
+			return $url;
+		}
+
+		$mimeType = explode('/', $mime)[0];
+		if ($url = $this->searchfileName($mimeType)) {
+			return $url;
+		}
+
+		return null;
+	}
+	
+	private function searchfileName(string $fileName): string|null {
+		// If the file exists in the current enabled legacy
+		// custom theme, let's return it
+		$theme = $this->config->getSystemValue('theme', '');
+		if (!empty($theme)) {
+			$path = "/themes/$theme/core/img/filetypes/$fileName.svg";
+			if (file_exists(\OC::$SERVERROOT . $path)) {
+				return $this->urlGenerator->getAbsoluteURL($path);
+			}
+		}
+		
+		// Previously, we used to pass thi through Theming
+		// But it was only used to colour icons containing
+		// 0082c9. Since with vue we moved to inline svg icons,
+		// we can just use the default core icons.
+
+		// Finally, if the file exists in core, let's return it
+		$path = "/core/img/filetypes/$fileName.svg";
+		if (file_exists(\OC::$SERVERROOT . $path)) {
+			return $this->urlGenerator->getAbsoluteURL($path);
+		}
+
+		return null;
+	}
+}
diff --git a/lib/private/Server.php b/lib/private/Server.php
index e9966e83caee9..e1de1b84e29d2 100644
--- a/lib/private/Server.php
+++ b/lib/private/Server.php
@@ -127,6 +127,7 @@
 use OC\OCS\DiscoveryService;
 use OC\Preview\GeneratorHelper;
 use OC\Preview\IMagickSupport;
+use OC\Preview\MimeIconProvider;
 use OC\Remote\Api\ApiFactory;
 use OC\Remote\InstanceFactory;
 use OC\RichObjectStrings\Validator;
@@ -262,6 +263,7 @@
 use OCA\Files_External\Service\BackendService;
 use OCP\Profiler\IProfiler;
 use OC\Profiler\Profiler;
+use OCP\Preview\IMimeIconProvider;
 
 /**
  * Class Server
@@ -337,6 +339,7 @@ public function __construct($webRoot, \OC\Config $config) {
 		});
 		/** @deprecated 19.0.0 */
 		$this->registerDeprecatedAlias('PreviewManager', IPreview::class);
+		$this->registerAlias(IMimeIconProvider::class, MimeIconProvider::class);
 
 		$this->registerService(\OC\Preview\Watcher::class, function (ContainerInterface $c) {
 			return new \OC\Preview\Watcher(
diff --git a/lib/public/Files/IMimeTypeDetector.php b/lib/public/Files/IMimeTypeDetector.php
index 11ba5cfc95f91..9992c153edc75 100644
--- a/lib/public/Files/IMimeTypeDetector.php
+++ b/lib/public/Files/IMimeTypeDetector.php
@@ -82,4 +82,10 @@ public function detectString($data);
 	 * @since 8.2.0
 	 */
 	public function mimeTypeIcon($mimeType);
+
+	/**
+	 * @return string[]
+	 * @since 28.0.0
+	 */
+	public function getAllAliases(): array;
 }
diff --git a/lib/public/Preview/IMimeIconProvider.php b/lib/public/Preview/IMimeIconProvider.php
new file mode 100644
index 0000000000000..26d6c3293239a
--- /dev/null
+++ b/lib/public/Preview/IMimeIconProvider.php
@@ -0,0 +1,31 @@
+<?php
+/**
+ * @copyright Copyright (c) 2023 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license AGPL-3.0-or-later
+ *
+ * This code is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License, version 3,
+ * as published by the Free Software Foundation.
+ *
+ * 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, version 3,
+ * along with this program. If not, see <http://www.gnu.org/licenses/>
+ *
+ */
+namespace OCP\Preview;
+
+/**
+ * Interface IMimeIconProvider
+ *
+ * @since 28.0.0
+ */
+interface IMimeIconProvider {
+	public function getMimeIconUrl(string $mime): string|null;
+}