From 51e6565aab8e522e60fc2b6815c6f81697d136f9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Fri, 11 Oct 2013 00:25:34 +0200 Subject: [PATCH 1/4] only text/plain is now used to generate text previews blacklist implementation remove because no longer needed --- lib/private/preview/txt.php | 21 ++++++++++----------- 1 file changed, 10 insertions(+), 11 deletions(-) diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php index 77e728eb364..4c6048c6bac 100644 --- a/lib/private/preview/txt.php +++ b/lib/private/preview/txt.php @@ -9,20 +9,19 @@ namespace OC\Preview; class TXT extends Provider { - private static $blacklist = array( - 'text/calendar', - 'text/vcard', - ); - public function getMimeType() { - return '/text\/.*/'; + return '/text\/plain/'; } + /** + * @param string $path + * @param int $maxX + * @param int $maxY + * @param boolean $scalingup + * @param \OC\Files\View $fileview + * @return bool|\OC_Image + */ public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) { - $mimetype = $fileview->getMimeType($path); - if(in_array($mimetype, self::$blacklist)) { - return false; - } $content = $fileview->fopen($path, 'r'); $content = stream_get_contents($content); @@ -80,4 +79,4 @@ class JavaScript extends TXT { } -\OC\Preview::registerProvider('OC\Preview\JavaScript'); \ No newline at end of file +\OC\Preview::registerProvider('OC\Preview\JavaScript'); From e28f7f8a33cb19fb483b5eaa8cae372baf5ee44a Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Fri, 11 Oct 2013 11:43:26 +0200 Subject: [PATCH 2/4] remove php and js previews --- lib/private/preview/txt.php | 20 -------------------- 1 file changed, 20 deletions(-) diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php index 4c6048c6bac..e2d16d2ba11 100644 --- a/lib/private/preview/txt.php +++ b/lib/private/preview/txt.php @@ -60,23 +60,3 @@ class TXT extends Provider { } \OC\Preview::registerProvider('OC\Preview\TXT'); - -class PHP extends TXT { - - public function getMimeType() { - return '/application\/x-php/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\PHP'); - -class JavaScript extends TXT { - - public function getMimeType() { - return '/application\/javascript/'; - } - -} - -\OC\Preview::registerProvider('OC\Preview\JavaScript'); From 71601a7c6f708dddd3d1ae030f86ae982a2e3865 Mon Sep 17 00:00:00 2001 From: Georg Ehrke Date: Mon, 14 Oct 2013 14:10:47 +0200 Subject: [PATCH 3/4] implement previews for markdown --- lib/private/preview/txt.php | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php index e2d16d2ba11..b3820ead8d6 100644 --- a/lib/private/preview/txt.php +++ b/lib/private/preview/txt.php @@ -60,3 +60,13 @@ class TXT extends Provider { } \OC\Preview::registerProvider('OC\Preview\TXT'); + +class MarkDown extends TXT { + + public function getMimeType() { + return '/text\/x-markdown/'; + } + +} + +\OC\Preview::registerProvider('OC\Preview\MarkDown'); From aca66270c7e86fc125a8bcce5affc584d7d82a60 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20M=C3=BCller?= Date: Wed, 16 Oct 2013 15:31:43 +0200 Subject: [PATCH 4/4] accept text/markdown as well --- lib/private/preview/txt.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/lib/private/preview/txt.php b/lib/private/preview/txt.php index b3820ead8d6..c9aa20968d8 100644 --- a/lib/private/preview/txt.php +++ b/lib/private/preview/txt.php @@ -64,7 +64,7 @@ class TXT extends Provider { class MarkDown extends TXT { public function getMimeType() { - return '/text\/x-markdown/'; + return '/text\/(x-)?markdown/'; } }