Skip to content

[stable21] do cachejail search filtering in sql #26133

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
MorrisJobke merged 5 commits into from
Mar 16, 2021
Merged

[stable21] do cachejail search filtering in sql #26133

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
046638a
do cachejail search filtering in sql
icewind1991 Jan 14, 2021
eb56b1d
fix cachjail searching for root
icewind1991 Jan 19, 2021
ec0985b
fix search in nested jails
icewind1991 Jan 25, 2021
c727879
adjust tests
icewind1991 Jan 26, 2021
e5ffb96
only use share cacheentry when available
icewind1991 Jan 26, 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
only use share cacheentry when available 
Signed-off-by: Robin Appelman <[email protected]>
  • Loading branch information
@icewind1991 @backportbot
icewind1991 authored and backportbot[bot] committed Mar 15, 2021
commit e5ffb96c36f89113fcca8e0f5bdfdb98040186b6
10 changes: 8 additions & 2 deletions lib/private/Share20/Share.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -30,6 +30,7 @@

namespace OC\Share20;

use OCP\Files\File;
use OCP\Files\Cache\ICacheEntry;
use OCP\Files\FileInfo;
use OCP\Files\IRootFolder;
Expand Down Expand Up @@ -233,8 +234,13 @@ public function setNodeType($type) {
*/
public function getNodeType() {
if ($this->nodeType === null) {
$info = $this->getNodeCacheEntry();
$this->nodeType = $info->getMimeType() === FileInfo::MIMETYPE_FOLDER ? 'folder' : 'file';
if ($this->getNodeCacheEntry()) {
$info = $this->getNodeCacheEntry();
$this->nodeType = $info->getMimeType() === FileInfo::MIMETYPE_FOLDER ? 'folder' : 'file';
} else {
$node = $this->getNode();
$this->nodeType = $node instanceof File ? 'file' : 'folder';
}
}

return $this->nodeType;
Expand Down