Merge pull request #25268 from nextcloud/enh/previews/sgi-tga

Add SGI and TGA preview support

8 files changed, 79 insertions, 3 deletions

diff --git a/.mailmap b/.mailmap
index e0203ba1ebc..e4d268a28f0 100644
--- a/.mailmap
+++ b/.mailmap
@@ -358,7 +358,8 @@ Simon Birnbach <simon@simon-birnbach.de>
 Simon Könnecke <simonkoennecke@gmail.com>
 Simon Whittaker <simon@swbh.net>
 Sjors van der Pluijm <sjors@desjors.nl> Sjors van der Pluijm <sjors@youngguns.nl>
-John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com> John Molakvoæ <skjnldsv@users.noreply.github.com>
+John Molakvoæ <skjnldsv@protonmail.com> John Molakvoæ <skjnldsv@users.noreply.github.com>
+John Molakvoæ <skjnldsv@protonmail.com> John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 st3so <st3so@server.fake>
 Stefan <mu.stefan@googlemail.com>
 Stefan Göckeritz <admin@s-goecker.de>
diff --git a/lib/composer/composer/autoload_classmap.php b/lib/composer/composer/autoload_classmap.php
index 6d93d8c1d51..673d5581042 100644
--- a/lib/composer/composer/autoload_classmap.php
+++ b/lib/composer/composer/autoload_classmap.php
@@ -1247,9 +1247,11 @@ return array(
     'OC\\Preview\\Provider' => $baseDir . '/lib/private/Preview/Provider.php',
     'OC\\Preview\\ProviderV1Adapter' => $baseDir . '/lib/private/Preview/ProviderV1Adapter.php',
     'OC\\Preview\\ProviderV2' => $baseDir . '/lib/private/Preview/ProviderV2.php',
+    'OC\\Preview\\SGI' => $baseDir . '/lib/private/Preview/SGI.php',
     'OC\\Preview\\SVG' => $baseDir . '/lib/private/Preview/SVG.php',
     'OC\\Preview\\StarOffice' => $baseDir . '/lib/private/Preview/StarOffice.php',
     'OC\\Preview\\Storage\\Root' => $baseDir . '/lib/private/Preview/Storage/Root.php',
+    'OC\\Preview\\TGA' => $baseDir . '/lib/private/Preview/TGA.php',
     'OC\\Preview\\TIFF' => $baseDir . '/lib/private/Preview/TIFF.php',
     'OC\\Preview\\TXT' => $baseDir . '/lib/private/Preview/TXT.php',
     'OC\\Preview\\Watcher' => $baseDir . '/lib/private/Preview/Watcher.php',
diff --git a/lib/composer/composer/autoload_static.php b/lib/composer/composer/autoload_static.php
index 2b6aa27ea46..1ee50ae6b71 100644
--- a/lib/composer/composer/autoload_static.php
+++ b/lib/composer/composer/autoload_static.php
@@ -1276,9 +1276,11 @@ class ComposerStaticInit53792487c5a8370acc0b06b1a864ff4c
         'OC\\Preview\\Provider' => __DIR__ . '/../../..' . '/lib/private/Preview/Provider.php',
         'OC\\Preview\\ProviderV1Adapter' => __DIR__ . '/../../..' . '/lib/private/Preview/ProviderV1Adapter.php',
         'OC\\Preview\\ProviderV2' => __DIR__ . '/../../..' . '/lib/private/Preview/ProviderV2.php',
+        'OC\\Preview\\SGI' => __DIR__ . '/../../..' . '/lib/private/Preview/SGI.php',
         'OC\\Preview\\SVG' => __DIR__ . '/../../..' . '/lib/private/Preview/SVG.php',
         'OC\\Preview\\StarOffice' => __DIR__ . '/../../..' . '/lib/private/Preview/StarOffice.php',
         'OC\\Preview\\Storage\\Root' => __DIR__ . '/../../..' . '/lib/private/Preview/Storage/Root.php',
+        'OC\\Preview\\TGA' => __DIR__ . '/../../..' . '/lib/private/Preview/TGA.php',
         'OC\\Preview\\TIFF' => __DIR__ . '/../../..' . '/lib/private/Preview/TIFF.php',
         'OC\\Preview\\TXT' => __DIR__ . '/../../..' . '/lib/private/Preview/TXT.php',
         'OC\\Preview\\Watcher' => __DIR__ . '/../../..' . '/lib/private/Preview/Watcher.php',
diff --git a/lib/private/Preview/SGI.php b/lib/private/Preview/SGI.php
new file mode 100644
index 00000000000..2e198362670
--- /dev/null
+++ b/lib/private/Preview/SGI.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @copyright 2021 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Preview;
+
+//.sgi
+class SGI extends Bitmap {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType(): string {
+		return '/image\/sgi/';
+	}
+}
diff --git a/lib/private/Preview/TGA.php b/lib/private/Preview/TGA.php
new file mode 100644
index 00000000000..d29cb3e2c10
--- /dev/null
+++ b/lib/private/Preview/TGA.php
@@ -0,0 +1,33 @@
+<?php
+/**
+ * @copyright 2021 John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
+ *
+ * @license GNU AGPL version 3 or any later version
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU Affero General Public License as
+ * published by the Free Software Foundation, either version 3 of the
+ * License, or (at your option) any later version.
+ *
+ * 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
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ *
+ */
+namespace OC\Preview;
+
+//.tga
+class TGA extends Bitmap {
+	/**
+	 * {@inheritDoc}
+	 */
+	public function getMimeType(): string {
+		return '/image\/t(ar)?ga/';
+	}
+}
diff --git a/lib/private/PreviewManager.php b/lib/private/PreviewManager.php
index 1d65da8ca59..d6dc700e4a2 100644
--- a/lib/private/PreviewManager.php
+++ b/lib/private/PreviewManager.php
@@ -4,7 +4,7 @@
  *
  * @author Christoph Wurst <christoph@winzerhof-wurst.at>
  * @author Joas Schilling <coding@schilljs.com>
- * @author John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
+ * @author John Molakvoæ <skjnldsv@protonmail.com>
  * @author Julius Härtl <jus@bitgrid.net>
  * @author Morris Jobke <hey@morrisjobke.de>
  * @author Olivier Paroz <github@oparoz.com>
@@ -379,6 +379,8 @@ class PreviewManager implements IPreview {
 				'EPS' => ['mimetype' => '/application\/postscript/', 'class' => Preview\Postscript::class],
 				'TTF' => ['mimetype' => '/application\/(?:font-sfnt|x-font$)/', 'class' => Preview\Font::class],
 				'HEIC' => ['mimetype' => '/image\/hei(f|c)/', 'class' => Preview\HEIC::class],
+				'TGA' => ['mimetype' => '/image\/t(ar)?ga/', 'class' => Preview\TGA::class],
+				'SGI' => ['mimetype' => '/image\/sgi/', 'class' => Preview\SGI::class],
 			];
 
 			foreach ($imagickProviders as $queryFormat => $provider) {
diff --git a/resources/config/mimetypealiases.dist.json b/resources/config/mimetypealiases.dist.json
index 332daea197b..9d0c070d1fa 100644
--- a/resources/config/mimetypealiases.dist.json
+++ b/resources/config/mimetypealiases.dist.json
@@ -104,6 +104,7 @@
 	"application/internet-shortcut": "link",
 	"application/km": "mindmap",
 	"application/x-freemind": "mindmap",
-	"application/vnd.xmind.workbook": "mindmap"
+	"application/vnd.xmind.workbook": "mindmap",
+	"image/targa": "image/tga"
 }
 
diff --git a/resources/config/mimetypemapping.dist.json b/resources/config/mimetypemapping.dist.json
index 33e4ac016f9..b38046aef32 100644
--- a/resources/config/mimetypemapping.dist.json
+++ b/resources/config/mimetypemapping.dist.json
@@ -165,6 +165,7 @@
 	"rw2": ["image/x-dcraw"],
 	"schema": ["text/plain"],
 	"sgf": ["application/sgf"],
+	"sgi": ["image/sgi"],
 	"sh-lib": ["text/x-shellscript"],
 	"sh": ["text/x-shellscript"],
 	"srf": ["image/x-dcraw"],
@@ -177,6 +178,7 @@
 	"tbz2": ["application/x-bzip2"],
 	"tcx": ["application/vnd.garmin.tcx+xml"],
 	"tex": ["application/x-tex"],
+	"tga": ["image/tga"],
 	"tgz": ["application/x-compressed"],
 	"tiff": ["image/tiff"],
 	"tif": ["image/tiff"],