Skip to content

[stable24] Use mimetype from cache for workflow checks #35843

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blizzz merged 3 commits into from
Feb 7, 2023
Merged

[stable24] Use mimetype from cache for workflow checks #35843

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
783dae9
use mimetype from cache for workflow if available
icewind1991 Feb 23, 2021
a2e7f31
remove file exists check from `cacheAndReturnMimeType`
icewind1991 Feb 23, 2021
f0b2b24
add some tests for mimetype check
icewind1991 Feb 23, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Next Next commit
use mimetype from cache for workflow if available 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot-nextcloud
icewind1991 authored and backportbot-nextcloud[bot] committed Dec 20, 2022
commit 783dae94cf9d0b7bf2165a59e48ecb57345aeebf
12 changes: 8 additions & 4 deletions apps/workflowengine/lib/Check/FileMimeType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,7 @@
*/
namespace OCA\WorkflowEngine\Check;

use OC\Files\Storage\Local;
use OCA\WorkflowEngine\Entity\File;
use OCP\Files\IMimeTypeDetector;
use OCP\Files\Storage\IStorage;
Expand Down Expand Up @@ -122,12 +123,15 @@ protected function getActualValue() {
if ($this->mimeType[$this->storage->getId()][$this->path] !== null) {
return $this->mimeType[$this->storage->getId()][$this->path];
}

if ($this->storage->is_dir($this->path)) {
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, 'httpd/unix-directory');
$cacheEntry = $this->storage->getCache()->get($this->path);
if ($cacheEntry && $cacheEntry->getMimeType() !== 'application/octet-stream') {
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $cacheEntry->getMimeType());
}

if ($this->storage->file_exists($this->path) && $this->storage->filesize($this->path)) {
if ($this->storage->file_exists($this->path) &&
$this->storage->filesize($this->path) &&
$this->storage->instanceOfStorage(Local::class)
) {
$path = $this->storage->getLocalFile($this->path);
$mimeType = $this->mimeTypeDetector->detectContent($path);
return $this->cacheAndReturnMimeType($this->storage->getId(), $this->path, $mimeType);
Expand Down