From 2d61ee3c13cda96c0cd4401b78bd27a586c374a9 Mon Sep 17 00:00:00 2001 From: Joas Schilling Date: Fri, 2 Sep 2016 13:38:27 +0200 Subject: Make mimetype also work for READ and DELETE operations --- apps/workflowengine/js/filemimetypeplugin.js | 2 +- apps/workflowengine/lib/Check/FileMimeType.php | 39 ++++++++++++++++++++++++++ 2 files changed, 40 insertions(+), 1 deletion(-) diff --git a/apps/workflowengine/js/filemimetypeplugin.js b/apps/workflowengine/js/filemimetypeplugin.js index 33cbbd7fd7e..9fc9e3452f4 100644 --- a/apps/workflowengine/js/filemimetypeplugin.js +++ b/apps/workflowengine/js/filemimetypeplugin.js @@ -27,7 +27,7 @@ getCheck: function() { return { 'class': 'OCA\\WorkflowEngine\\Check\\FileMimeType', - 'name': t('workflowengine', 'File mime type (upload)'), + 'name': t('workflowengine', 'File mime type'), 'operators': [ {'operator': 'is', 'name': t('workflowengine', 'is')}, {'operator': '!is', 'name': t('workflowengine', 'is not')}, diff --git a/apps/workflowengine/lib/Check/FileMimeType.php b/apps/workflowengine/lib/Check/FileMimeType.php index 43c856a7c98..4a985840e60 100644 --- a/apps/workflowengine/lib/Check/FileMimeType.php +++ b/apps/workflowengine/lib/Check/FileMimeType.php @@ -106,9 +106,48 @@ class FileMimeType extends AbstractStringCheck { } } + $this->mimeType[$this->storage->getId()][$this->path] = $this->storage->getMimeType($this->path); + if ($this->mimeType[$this->storage->getId()][$this->path] === 'application/octet-stream') { + $this->mimeType[$this->storage->getId()][$this->path] = $this->detectMimetypeFromPath(); + } + return $this->mimeType[$this->storage->getId()][$this->path]; } + /** + * @return string + */ + protected function detectMimetypeFromPath() { + $mimeType = $this->mimeTypeDetector->detectPath($this->path); + if ($mimeType !== 'application/octet-stream' && $mimeType !== false) { + return $mimeType; + } + + if ($this->storage->instanceOfStorage('\OC\Files\Storage\Local') + || $this->storage->instanceOfStorage('\OC\Files\Storage\Home') + || $this->storage->instanceOfStorage('\OC\Files\ObjectStore\HomeObjectStoreStorage')) { + $localFile = $this->storage->getLocalFile($this->path); + if ($localFile !== false) { + $mimeType = $this->mimeTypeDetector->detect($localFile); + if ($mimeType !== false) { + return $mimeType; + } + } + + return 'application/octet-stream'; + } else { + $handle = $this->storage->fopen($this->path, 'r'); + $data = fread($handle, 8024); + fclose($handle); + $mimeType = $this->mimeTypeDetector->detectString($data); + if ($mimeType !== false) { + return $mimeType; + } + + return 'application/octet-stream'; + } + } + /** * @return bool */ -- cgit v1.2.3