Skip to content

[stable25] Use mimetype from cache for workflow checks #35842

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 9, 2023
Merged

[stable25] Use mimetype from cache for workflow checks #35842

Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
e48d503
use mimetype from cache for workflow if available
icewind1991 Feb 23, 2021
8b39345
remove file exists check from `cacheAndReturnMimeType`
icewind1991 Feb 23, 2021
4c60cdd
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
Prev Previous commit
Next Next commit
remove file exists check from cacheAndReturnMimeType 
the method is only called if the file exists already

a check against storing the fallback mimetype is added as a safety instead

Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @blizzz
icewind1991 authored and blizzz committed Feb 7, 2023
commit 8b393454b09cf0a209130c09b6ea04ac1d835e76
4 changes: 2 additions & 2 deletions apps/workflowengine/lib/Check/FileMimeType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -77,7 +77,7 @@ public function setFileInfo(IStorage $storage, string $path, bool $isDir = false
}

/**
* The mimetype is only cached if the file exists. Otherwise files access
* The mimetype is only cached if the file has a valid mimetype. Otherwise files access
* control will cache "application/octet-stream" for all the target node on:
* rename, move, copy and all other methods which create a new item
*
Expand All @@ -92,7 +92,7 @@ public function setFileInfo(IStorage $storage, string $path, bool $isDir = false
* @return string
*/
protected function cacheAndReturnMimeType(string $storageId, ?string $path, string $mimeType): string {
if ($path !== null && $this->storage->file_exists($path)) {
if ($path !== null && $mimeType !== 'application/octet-stream') {
$this->mimeType[$storageId][$path] = $mimeType;
}

Expand Down