mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make mimetype also work for READ and DELETE operations

This commit is contained in:
Joas Schilling 2016-09-02 13:38:27 +02:00
parent d3a1fbd9eb
commit 5996983e28
No known key found for this signature in database
GPG Key ID: E166FD8976B3BAC8
2 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
apps/workflowengine/js/filemimetypeplugin.js
View File

@ -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')},

39
apps/workflowengine/lib/Check/FileMimeType.php
View File

@ -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
*/